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 #866

Merged
merged 21 commits into from
Sep 1, 2023
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
a78fe59
IBX-6314: initial
tischsoic Aug 7, 2023
6074662
FT: Anonymous Users -> Anonymous users
tischsoic Aug 7, 2023
51d0c63
FT: Create new -> Create; Type to refine -> Search by Content Type
tischsoic Aug 7, 2023
1e2faef
FT: User Settings -> User settings
tischsoic Aug 7, 2023
c154361
FT: My ...
tischsoic Aug 7, 2023
f5ff94a
FT: Edit Content -> ...
tischsoic Aug 7, 2023
02fd347
under %location_name% in %language%
tischsoic Aug 8, 2023
a130233
FT: add new -> add
tischsoic Aug 8, 2023
0297380
FT: saved, modified
tischsoic Aug 8, 2023
2fe88e2
FT: fix columns order
tischsoic Aug 8, 2023
f866503
FT: different stuff
tischsoic Aug 8, 2023
8d11c5a
Microcopy fixes
mikadamczyk Aug 9, 2023
02fae29
FT: User Settings -> User settings
tischsoic Aug 7, 2023
5533aa4
FT: My ...
tischsoic Aug 7, 2023
316fc97
IBX-6314: Added missing translation of limitation name
mikadamczyk Aug 10, 2023
78afce9
prettier
tischsoic Aug 30, 2023
6cdd1bf
Send to trash
tischsoic Aug 31, 2023
113d3d0
generated translations
tischsoic Aug 31, 2023
88d8f0a
Send to trash fixes
tischsoic Sep 1, 2023
77712a1
Behat; phpstan
tischsoic Sep 1, 2023
d1cd0a3
remove http-factory-guzzle
tischsoic Sep 1, 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
Prev Previous commit
Next Next commit
Microcopy fixes
  • Loading branch information
@mikadamczyk @tischsoic
mikadamczyk authored and tischsoic committed Sep 1, 2023
commit 8d11c5a6eaf6050bf01f69e770a5f7b84ff5e8d9
3 changes: 2 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@
"willdurand/js-translation-bundle": "^4.0",
"twig/twig": "^3.0",
"twig/intl-extra": "^3.0",
"twig/string-extra": "^3.0"
"twig/string-extra": "^3.0",
"http-interop/http-factory-guzzle": "^1.2"
},
"require-dev": {
"ibexa/ci-scripts": "^0.2@dev",
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/js/scripts/admin.trash.list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
const form = event.target.closest('form[name="trash_item_restore"]');
const config = JSON.parse(event.currentTarget.dataset.udwConfig);
const title = Translator.trans(
/*@Desc("Select a Location to restore the Content item(s)")*/ 'restore_under_new_location.title',
/*@Desc("Select a new location to restore the content items")*/ 'restore_under_new_location.title',
{},
'universal_discovery_widget',
);
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/js/scripts/helpers/form.validation.helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
if (label) {
const fieldName = label.innerText;

errorMessage = Translator.trans(/*@Desc("%fieldName% Field is required")*/ 'error.required.field', { fieldName }, 'forms');
errorMessage = Translator.trans(/*@Desc("%fieldName% cannot be empty")*/ 'error.required.field', { fieldName }, 'forms');
} else {
errorMessage = Translator.trans(/*@Desc("This value should not be blank")*/ 'error.required.field_not_blank', {}, 'forms');
}
Expand Down
10 changes: 5 additions & 5 deletions src/bundle/Resources/translations/content_type.en.xliff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
<note>key: content_type.content_field_definitions</note>
</trans-unit>
<trans-unit id="e7a6e28719e705ca85e715114370d15deee0cd59" resname="content_type.copy.error">
<source>Error occoured while copying the '%name%' Content Type.</source>
<target state="new">Error occoured while copying the '%name%' Content Type.</target>
<source>Content Type '%name%' cannot be copied.</source>
<target state="new">Content Type '%name%' cannot be copied.</target>
<note>key: content_type.copy.error</note>
</trans-unit>
<trans-unit id="31674753c7d944af06b98387a96ce93f36f6adb4" resname="content_type.copy.success">
<source>Content Type '%name%' successfully copied.</source>
<target state="new">Content Type '%name%' successfully copied.</target>
<source>Content Type '%name%' copied.</source>
<target state="new">Content Type '%name%' copied.</target>
<note>key: content_type.copy.success</note>
</trans-unit>
<trans-unit id="529a1012c7fe5ca6fafdb5d070ac8ececfe94af6" resname="content_type.create">
Expand Down Expand Up @@ -868,7 +868,7 @@
</trans-unit>
<trans-unit id="84eed8c69d2ed1727569c36cda88c9781d37dd92" resname="field_definition.is_thumbnail">
<source>Can be a thumbnail</source>
<target>Can be a thumbnail</target>
<target state="new">Can be a thumbnail</target>
<note>key: field_definition.is_thumbnail</note>
</trans-unit>
<trans-unit id="83aba8c0c4c654d481c4520feb76e789fbc64c22" resname="field_definition.is_translatable">
Expand Down
13 changes: 9 additions & 4 deletions src/bundle/Resources/translations/content_url.en.xliff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
<note>key: tab.urls.add.redirect.helper.unchecked</note>
</trans-unit>
<trans-unit id="c1277a6823f4d281355e706e54cd723b5ed4adf7" resname="tab.urls.add.root_location_id.helper_secondary">
<source>If you leave this empty, the alias will be placed at main root Location.</source>
<target state="new">If you leave this empty, the alias will be placed at main root Location.</target>
<source>If no SiteAccess selected, the alias will be placed at main root Location.</source>
<target state="new">If no SiteAccess selected, the alias will be placed at main root Location.</target>
<note>key: tab.urls.add.root_location_id.helper_secondary</note>
</trans-unit>
<trans-unit id="f933f01aef7b171904b5c0b1ed4327413828f96f" resname="tab.urls.add.site_access">
Expand Down Expand Up @@ -92,8 +92,8 @@
<note>key: tab.urls.language</note>
</trans-unit>
<trans-unit id="0d3138c0198569f427ab4568fffa5d9d894db72a" resname="tab.urls.modal.message">
<source>Do you want to delete the selected custom URL alias(es)?</source>
<target state="new">Do you want to delete the selected custom URL alias(es)?</target>
<source>Delete the selected custom URL aliases permanently?</source>
<target state="new">Delete the selected custom URL aliases permanently?</target>
<note>key: tab.urls.modal.message</note>
</trans-unit>
<trans-unit id="56d218db883ed4cc59dbbca53364dc2e725013e4" resname="tab.urls.no_custom_urls">
Expand Down Expand Up @@ -131,6 +131,11 @@
<target state="new">URL</target>
<note>key: tab.urls.url</note>
</trans-unit>
<trans-unit id="e69faa33548046dd30da3472456d913f2586a3c5" resname="tab.variants.empty.action">
<source>Add new custom URL aliases manually</source>
<target state="new">Add new custom URL aliases manually</target>
<note>key: tab.variants.empty.action</note>
</trans-unit>
</body>
</file>
</xliff>
4 changes: 2 additions & 2 deletions src/bundle/Resources/translations/dropdown.en.xliff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<note>key: dropdown.clear</note>
</trans-unit>
<trans-unit id="a3390555f717ffd9b3560f17198e5a437899967f" resname="dropdown.placeholder">
<source>All</source>
<target state="new">All</target>
<source>Choose an option</source>
<target state="new">Choose an option</target>
<note>key: dropdown.placeholder</note>
</trans-unit>
<trans-unit id="bcf45496a8dbad6959111ca6eae0ab456d4ad1c7" resname="dropdown.placeholder.all">
Expand Down
151 changes: 0 additions & 151 deletions src/bundle/Resources/translations/ezplatform_content_forms_policies.en.xliff
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions src/bundle/Resources/translations/ezplatform_url_management.en.xliff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
</header>
<body>
<trans-unit id="171ad35c73c746821f56d7e160c0f98461dc339a" resname="url_management.breadcrumb.list">
<source>URL Management</source>
<target state="new">URL Management</target>
<source>URL management</source>
<target state="new">URL management</target>
<note>key: url_management.breadcrumb.list</note>
</trans-unit>
<trans-unit id="6ab1e93c76514fa2c2c2cbeefb382925870f7062" resname="url_management.view.list.title">
<source>URL Management</source>
<target state="new">URL Management</target>
<source>URL management</source>
<target state="new">URL management</target>
<note>key: url_management.view.list.title</note>
</trans-unit>
</body>
Expand Down
4 changes: 2 additions & 2 deletions src/bundle/Resources/translations/ezplatform_url_wildcard.en.xliff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<note>key: url_wildcard.breadcrumb.edit</note>
</trans-unit>
<trans-unit id="2451ff2ec3f769b1d2492cba373ddcf07c27d5e1" resname="url_wildcard.breadcrumb.list">
<source>URL Management</source>
<target state="new">URL Management</target>
<source>URL management</source>
<target state="new">URL management</target>
<note>key: url_wildcard.breadcrumb.list</note>
</trans-unit>
<trans-unit id="8fe44f043fa71a16c618cde88dd0e1098e5479bb" resname="url_wildcard.disabled">
Expand Down
10 changes: 5 additions & 5 deletions src/bundle/Resources/translations/forms.en.xliff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
<note>key: content_types_delete_form.delete</note>
</trans-unit>
<trans-unit id="268c741bdf4f818f950cd022b562c079744cfdca" resname="error.required.field">
<source>%fieldName% Field is required</source>
<target state="new">%fieldName% Field is required</target>
<source>%fieldName% cannot be empty</source>
<target state="new">%fieldName% cannot be empty</target>
<note>key: error.required.field</note>
</trans-unit>
<trans-unit id="6090b5d2c17e00053a576ede5c82afba67f0cc49" resname="error.required.field_not_blank">
Expand Down Expand Up @@ -163,7 +163,7 @@
</trans-unit>
<trans-unit id="d29c07272fff793138cbb6f7dbb41b08a16ff815" resname="role.policy.all_modules">
<source>All modules</source>
<target>All modules</target>
<target state="new">All modules</target>
<note>key: role.policy.all_modules</note>
</trans-unit>
<trans-unit id="d3c70d265ab037db5ade02a8b738b5981353c7ac" resname="role.policy.type">
Expand Down Expand Up @@ -317,8 +317,8 @@
<note>key: translation.language.label</note>
</trans-unit>
<trans-unit id="30b0c3c3e5e096a078005be2cc34bca6227ae381" resname="trash_empty_form.empty">
<source>Delete permanently</source>
<target state="new">Delete permanently</target>
<source>Delete</source>
<target state="new">Delete</target>
<note>key: trash_empty_form.empty</note>
</trans-unit>
<trans-unit id="4d530164d6f917754a1625bae48c2a323197ac7a" resname="user.invitation.submit">
Expand Down
16 changes: 0 additions & 16 deletions src/bundle/Resources/translations/ibexa_content_forms_policies.en.xliff
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/bundle/Resources/translations/language.en.xliff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@
<note>key: language.list</note>
</trans-unit>
<trans-unit id="2a52961302ce7dfa4a21c5e0bcc239f5a9a36cfe" resname="language.modal.message">
<source>Do you want to delete the language(s)?</source>
<target state="new">Do you want to delete the language(s)?</target>
<source>Delete the languages?</source>
<target state="new">Delete the languages?</target>
<note>key: language.modal.message</note>
</trans-unit>
<trans-unit id="c0ccfb7e7bc6d434ca93e998637fe775ba4a2de0" resname="language.name">
Expand Down
8 changes: 4 additions & 4 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 @@ -212,8 +212,8 @@
<note>key: main__admin__sections</note>
</trans-unit>
<trans-unit id="82375ef2c63989a07c692f526407d75316414dff" resname="main__admin__url_management">
<source>URL Management</source>
<target state="new">URL Management</target>
<source>URL management</source>
<target state="new">URL management</target>
<note>key: main__admin__url_management</note>
</trans-unit>
<trans-unit id="975e43875a74d509e3e0cedd926de1223d09cdf4" resname="main__admin__users">
Expand Down Expand Up @@ -332,8 +332,8 @@
<note>key: role_copy__sidebar_right__cancel</note>
</trans-unit>
<trans-unit id="36e448abb1ab7844befaf5a70ac65edf976bae85" resname="role_copy__sidebar_right__save">
<source>Save</source>
<target state="new">Save</target>
<source>Copy</source>
<target state="new">Copy</target>
<note>key: role_copy__sidebar_right__save</note>
</trans-unit>
<trans-unit id="ec3a03215b15b79b7db72bac312b5e59734ac99c" resname="role_create__sidebar_right__cancel">
Expand Down
Loading