Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IBX-6314: Apply microcopy guidelines and adjust translation keys and domains #44

Merged
merged 3 commits into from
Aug 31, 2023
Merged

IBX-6314: Apply microcopy guidelines and adjust translation keys and domains #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3fc8ae
IBX-6314: Apply microcopy guidelines and adjust translation keys and …
mikadamczyk Aug 10, 2023
2633d07
TEMP Behat
mikadamczyk Aug 31, 2023
c6a39de
Revert "TEMP Behat"
mikadamczyk Aug 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 0 additions & 93 deletions src/bundle/Resources/translations/dashboard.en.xliff
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/bundle/Resources/translations/menu.en.xliff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</header>
<body>
<trans-unit id="2cc622305036d330c00683520df433ef82f60c9a" resname="main__admin__systeminfo">
<source>System Information</source>
<target state="new">System Information</target>
<source>System information</source>
<target state="new">System information</target>
<note>key: main__admin__systeminfo</note>
</trans-unit>
</body>
Expand Down
54 changes: 32 additions & 22 deletions src/bundle/Resources/translations/systeminfo.en.xliff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,18 @@
<note>key: hardware</note>
</trans-unit>
<trans-unit id="ed1f723e05fbc74c1c90cfc6f64c2bcda6f4bb9d" resname="ibexa.eol">
<source>End of Life</source>
<target state="new">End of Life</target>
<source>End of life</source>
<target state="new">End of life</target>
<note>key: ibexa.eol</note>
</trans-unit>
<trans-unit id="4a9e6f9b28c3203784cb5f01ebe73e67661cc823" resname="ibexa.eom">
<source>End of Maintenance</source>
<target state="new">End of Maintenance</target>
<source>End of maintenance</source>
<target state="new">End of maintenance</target>
<note>key: ibexa.eom</note>
</trans-unit>
<trans-unit id="804e14084add4426182add3b4a0a710506ef742b" resname="ibexa.is_trial">
<source>Is Trial</source>
<target state="new">Is Trial</target>
<source>Is trial</source>
<target state="new">Is trial</target>
<note>key: ibexa.is_trial</note>
</trans-unit>
<trans-unit id="44a7ad63689c19af8aa173293e0da9e2055e4df9" resname="ibexa.is_trial.no">
Expand All @@ -67,8 +67,8 @@
<note>key: ibexa.is_trial.yes</note>
</trans-unit>
<trans-unit id="b7ffaa791bbf39db2ea700efec5362a0bc4e2021" resname="ibexa.name">
<source>Name</source>
<target state="new">Name</target>
<source>Edition</source>
<target state="new">Edition</target>
<note>key: ibexa.name</note>
</trans-unit>
<trans-unit id="d87becd0d1497fe04536d2e9291290a8b07e9dfb" resname="ibexa.product">
Expand Down Expand Up @@ -147,15 +147,25 @@
<note>key: repository</note>
</trans-unit>
<trans-unit id="ca27c822aa4f52351a6a89150fc5ac970d052fca" resname="repository.content_types_count">
<source>Content Types count</source>
<target state="new">Content Types count</target>
<source>Content type</source>
<target state="new">Content type</target>
<note>key: repository.content_types_count</note>
</trans-unit>
<trans-unit id="f17704b4dda4d61ecc379a0960655f35c6abef2d" resname="repository.drafts_count">
<source>Drafts count</source>
<target state="new">Drafts count</target>
<source>Draft</source>
<target state="new">Draft</target>
<note>key: repository.drafts_count</note>
</trans-unit>
<trans-unit id="5cf8f6236aedc711f36f4ecc00f2366351ec9630" resname="repository.header.label.element">
<source>Element</source>
<target state="new">Element</target>
<note>key: repository.header.label.element</note>
</trans-unit>
<trans-unit id="10f3b8bca9e42617f9413433d39bffb1f1406c27" resname="repository.header.label.number">
<source>Number</source>
<target state="new">Number</target>
<note>key: repository.header.label.number</note>
</trans-unit>
<trans-unit id="b08856f94643075c9a7a13c29010d09165a28015" resname="repository.host">
<source>Host</source>
<target state="new">Host</target>
Expand All @@ -167,8 +177,8 @@
<note>key: repository.name</note>
</trans-unit>
<trans-unit id="5de05c757e2ce051da58581c67074f5fa96fe424" resname="repository.published_content_objects_count">
<source>Published content objects count</source>
<target state="new">Published content objects count</target>
<source>Published content object</source>
<target state="new">Published content object</target>
<note>key: repository.published_content_objects_count</note>
</trans-unit>
<trans-unit id="b5b5d12b45fa443c42cf45488d124305c39df1d5" resname="repository.type">
Expand All @@ -182,13 +192,13 @@
<note>key: repository.username</note>
</trans-unit>
<trans-unit id="2f9d49c355e4660fbb8cc89c39d048b53edc7e3c" resname="repository.users_count">
<source>Users count</source>
<target state="new">Users count</target>
<source>User</source>
<target state="new">User</target>
<note>key: repository.users_count</note>
</trans-unit>
<trans-unit id="6fdeb59a15d4eea938b956273b9944a5c483dd57" resname="repository.versions_count">
<source>Versions count</source>
<target state="new">Versions count</target>
<source>Version</source>
<target state="new">Version</target>
<note>key: repository.versions_count</note>
</trans-unit>
<trans-unit id="3e7aaa79601ad9b577f333a67d082c3752b7e357" resname="services">
Expand Down Expand Up @@ -277,8 +287,8 @@
<note>key: symfony_kernel.version</note>
</trans-unit>
<trans-unit id="21ef9f0a078dbc4e4c45be12f1cfaf8a3864dfa7" resname="systeminfo">
<source>System Information</source>
<target state="new">System Information</target>
<source>System information</source>
<target state="new">System information</target>
<note>key: systeminfo</note>
</trans-unit>
<trans-unit id="a2a92e9d0e41ea4a14c99ab0f702d5df3ea017c3" resname="tab.name.composer">
Expand All @@ -292,8 +302,8 @@
<note>key: tab.name.hardware</note>
</trans-unit>
<trans-unit id="7dd1b2ca71037e00112dfe0297383f47c6904c77" resname="tab.name.ibexa">
<source>My Ibexa</source>
<target state="new">My Ibexa</target>
<source>Product</source>
<target state="new">Product</target>
<note>key: tab.name.ibexa</note>
</trans-unit>
<trans-unit id="b71f0d567a424182b8c83a6b90a262b29819241b" resname="tab.name.php">
Expand Down
1 change: 0 additions & 1 deletion src/bundle/Resources/views/themes/admin/system_info/composer.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
} only %}

<section class="ibexa-fieldgroup">
<h2 class="ibexa-fieldgroup__name">{{ 'packages'|trans|desc('Packages') }}</h2>
<div class="ibexa-fieldgroup__content">
{% set body_rows = [] %}
{% for package in info.packages %}
Expand Down
4 changes: 2 additions & 2 deletions src/bundle/Resources/views/themes/admin/system_info/info.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
{% block breadcrumbs %}
{% include '@ibexadesign/ui/breadcrumbs.html.twig' with { items: [
{ value: 'breadcrumb.admin'|trans(domain='messages')|desc('Admin') },
{ value: 'systeminfo'|trans|desc('System Information') }
{ value: 'systeminfo'|trans|desc('System information') }
]} %}
{% endblock %}

{% block header %}
{% include '@ibexadesign/ui/page_title.html.twig' with {
title: 'systeminfo'|trans|desc('System Information'),
title: 'systeminfo'|trans|desc('System information'),
} %}
{% endblock %}

Expand Down
10 changes: 5 additions & 5 deletions src/bundle/Resources/views/themes/admin/system_info/my_ibexa.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{% trans_default_domain "systeminfo" %}

<!-- Tab name: {{ 'tab.name.ibexa'|trans|desc('My Ibexa') }} -->
<!-- Tab name: {{ 'tab.name.ibexa'|trans|desc('Product') }} -->

{% set my_ibexa_items = [
{
label: 'ibexa.name'|trans|desc('Name'),
label: 'ibexa.name'|trans|desc('Edition'),
content: info.name,
},
{
label: 'ibexa.version'|trans|desc('Version'),
content: info.release,
},
{
label: 'ibexa.is_trial'|trans|desc('Is Trial'),
label: 'ibexa.is_trial'|trans|desc('Is trial'),
content: info.isTrial ? 'ibexa.is_trial.yes'|trans|desc('Yes') : 'ibexa.is_trial.no'|trans|desc('No'),
},
{
Expand All @@ -24,11 +24,11 @@
{% if info.isEnterprise %}
{% set my_ibexa_items = my_ibexa_items|merge([
{
label: 'ibexa.eom'|trans|desc('End of Maintenance'),
label: 'ibexa.eom'|trans|desc('End of maintenance'),
content: info.endOfMaintenanceDate is empty ? '-' : info.endOfMaintenanceDate|date('F Y', false),
},
{
label: 'ibexa.eol'|trans|desc('End of Life'),
label: 'ibexa.eol'|trans|desc('End of life'),
content: info.endOfLifeDate is empty ? '-' : info.endOfLifeDate|date('F Y', false),
},
]) %}
Expand Down
14 changes: 9 additions & 5 deletions src/bundle/Resources/views/themes/admin/system_info/repository.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,30 @@
<div class="ibexa-fieldgroup__content">
<table class="table ibexa-table--list">
<tbody>
<tr class="ibexa-table__row">
<th class="ibexa-table__cell">{{ 'repository.header.label.element'|trans|desc('Element') }}</th>
<th class="ibexa-table__cell">{{ 'repository.header.label.number'|trans|desc('Number') }}</th>
</tr>
<tr class="ibexa-table__row">
<td class="ibexa-table__cell">
{{ 'repository.published_content_objects_count'|trans|desc('Published content objects count') }}
{{ 'repository.published_content_objects_count'|trans|desc('Published content object') }}
</td>
<td class="ibexa-table__cell">{{ info.repositoryMetrics.publishedCount }}</td>
</tr>
<tr class="ibexa-table__row">
<td class="ibexa-table__cell">{{ 'repository.users_count'|trans|desc('Users count') }}</td>
<td class="ibexa-table__cell">{{ 'repository.users_count'|trans|desc('User') }}</td>
<td class="ibexa-table__cell">{{ info.repositoryMetrics.usersCount }}</td>
</tr>
<tr class="ibexa-table__row">
<td class="ibexa-table__cell">{{ 'repository.drafts_count'|trans|desc('Drafts count') }}</td>
<td class="ibexa-table__cell">{{ 'repository.drafts_count'|trans|desc('Draft') }}</td>
<td class="ibexa-table__cell">{{ info.repositoryMetrics.draftsCount }}</td>
</tr>
<tr class="ibexa-table__row">
<td class="ibexa-table__cell">{{ 'repository.versions_count'|trans|desc('Versions count') }}</td>
<td class="ibexa-table__cell">{{ 'repository.versions_count'|trans|desc('Version') }}</td>
<td class="ibexa-table__cell">{{ info.repositoryMetrics.versionsCount }}</td>
</tr>
<tr class="ibexa-table__row">
<td class="ibexa-table__cell">{{ 'repository.content_types_count'|trans|desc('Content Types count') }}</td>
<td class="ibexa-table__cell">{{ 'repository.content_types_count'|trans|desc('Content type') }}</td>
<td class="ibexa-table__cell">{{ info.repositoryMetrics.contentTypesCount }}</td>
</tr>
</tbody>
Expand Down
Loading