Skip to content

Commit 8be2b3c

Browse files
tischsoicmikadamczyk
tischsoic
and
mikadamczyk
authored
IBX-6314: Apply microcopy guidelines and adjust translation keys and domains (#866)
Co-authored-by: mikolaj <[email protected]>
1 parent 246ad53 commit 8be2b3c

File tree

128 files changed

+623
-422
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+623
-422
lines changed

‎features/personas/ChangePassword.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Feature: Verify that an User allowed to change password can change his password
55
Given I open Login page in admin SiteAccess
66
And I log in as "UserPassword" with password "Passw0rd-42"
77
When I go to user settings
8-
And I switch to "My Account Settings" tab in User Settings
8+
And I switch to "My account settings" tab in User settings
99
And I click on the change password button
1010
And I change password from "Passw0rd-42" to "Passw0rd-43"
1111
And I click on the edit action bar button "Update"

‎features/personas/SubtreeEditor.feature‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ Feature: Verify that an Editor with Subtree limitations can perform all his task
6161
| buttonName |
6262
| Create content |
6363
| Edit |
64-
And the "Send to Trash" button is not visible
64+
And the "Send to trash" button is not visible
6565

6666
Scenario: I cannot edit, create or send to trash Content outside my permissions
6767
Given I navigate to content "FolderGrandParent" of type "DedicatedFolder" in "root"
6868
Then the buttons are disabled
6969
| buttonName |
7070
| Create content |
7171
| Edit |
72-
And the "Send to Trash" button is not visible
72+
And the "Send to trash" button is not visible

‎features/standard/Roles.feature‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Feature: Roles management
8484
When I start assigning to "Test Role edited" from Roles page
8585
And I assign users to role
8686
| path |
87-
| Users/Anonymous Users/Anonymous User |
87+
| Users/Anonymous users/Anonymous User |
8888
| Users/Administrator users/Administrator User |
8989
And I assign groups to role
9090
| path |
@@ -185,7 +185,7 @@ Feature: Roles management
185185
| option |
186186
| Article |
187187
| Folder |
188-
And I select subtree limitation "Users/Anonymous Users" for policy through UDW
188+
And I select subtree limitation "Users/Anonymous users" for policy through UDW
189189
And I select limitation for "State"
190190
| option |
191191
| Lock:Locked |
@@ -194,7 +194,7 @@ Feature: Roles management
194194
And there are policies on the "Test Role edited" policies list
195195
| policy | limitation |
196196
| Content/Read | Content Type: Article, Folder |
197-
| Content/Read | Subtree: /Users/Anonymous Users |
197+
| Content/Read | Subtree: /Users/Anonymous users |
198198
| Content/Read | State: Lock:Locked |
199199
And there are assignments on the "Test Role edited" assignments list
200200
| User/Group | Limitation |

‎src/bundle/Resources/public/js/scripts/admin.trash.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
if (numberOfSubitems) {
2222
const message = Translator.trans(
23-
/*@Desc("Sending '%content_name%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash.")*/ 'trash_container.modal.message_main',
23+
/*@Desc("Sending '%content%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash.")*/ 'trash_container.modal.message_main',
2424
{
25-
content_name: contentName,
25+
content: contentName,
2626
children_count: numberOfSubitems,
2727
},
2828
'content',

‎src/bundle/Resources/public/js/scripts/admin.trash.list.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
const form = event.target.closest('form[name="trash_item_restore"]');
4646
const config = JSON.parse(event.currentTarget.dataset.udwConfig);
4747
const title = Translator.trans(
48-
/*@Desc("Select a Location to restore the Content item(s)")*/ 'restore_under_new_location.title',
48+
/*@Desc("Select a new location to restore the content items")*/ 'restore_under_new_location.title',
4949
{},
5050
'universal_discovery_widget',
5151
);

‎src/bundle/Resources/public/js/scripts/helpers/form.validation.helper.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
if (label) {
2121
const fieldName = label.innerText;
2222

23-
errorMessage = Translator.trans(/*@Desc("%fieldName% Field is required")*/ 'error.required.field', { fieldName }, 'forms');
23+
errorMessage = Translator.trans(/*@Desc("%fieldName% cannot be empty")*/ 'error.required.field', { fieldName }, 'forms');
2424
} else {
2525
errorMessage = Translator.trans(/*@Desc("This value should not be blank")*/ 'error.required.field_not_blank', {}, 'forms');
2626
}

‎src/bundle/Resources/translations/bookmark.en.xliff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
<note>key: bookmark.headline</note>
1818
</trans-unit>
1919
<trans-unit id="5001931b6bf98acefb5138b1cdba97d97fed4844" resname="bookmark.list.content.edit">
20-
<source>Edit content</source>
21-
<target state="new">Edit content</target>
20+
<source>Edit</source>
21+
<target state="new">Edit</target>
2222
<note>key: bookmark.list.content.edit</note>
2323
</trans-unit>
2424
<trans-unit id="cf687b0218c513d53ad3f52b2547c23500242c48" resname="bookmark.list.content_type">

‎src/bundle/Resources/translations/content.en.xliff‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
<note>key: content_edit.autosave.status_saved.message.full</note>
5858
</trans-unit>
5959
<trans-unit id="750bead6705b295c7b7d66c27b2768c1b9329ed5" resname="editing_details">
60-
<source>under %location_name%</source>
61-
<target state="new">under %location_name%</target>
60+
<source>Location: %location%</source>
61+
<target state="new">Location: %location%</target>
6262
<note>key: editing_details</note>
6363
</trans-unit>
6464
<trans-unit id="f6ae7078e77f584ad00c8003405ca11dc57c4d56" resname="preview_header.back">
@@ -77,8 +77,8 @@
7777
<note>key: trash.modal.message</note>
7878
</trans-unit>
7979
<trans-unit id="1e6a1d97cca01a288e47d2d14479274b90e6c6c1" resname="trash_container.modal.message_main">
80-
<source>Sending '%content_name%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash.</source>
81-
<target state="new">Sending '%content_name%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash.</target>
80+
<source>Sending '%content%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash.</source>
81+
<target state="new">Sending '%content%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash.</target>
8282
<note>key: trash_container.modal.message_main</note>
8383
</trans-unit>
8484
<trans-unit id="4492a79e25635e7612f98971e02b4d0e6a408394" resname="user.delete.success">

‎src/bundle/Resources/translations/content_create.en.xliff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<note>key: creating</note>
1313
</trans-unit>
1414
<trans-unit id="750bead6705b295c7b7d66c27b2768c1b9329ed5" resname="editing_details">
15-
<source>under %location_name% in %language%</source>
16-
<target state="new">under %location_name% in %language%</target>
15+
<source>Location: %location% Translation: %language</source>
16+
<target state="new">Location: %location% Translation: %language</target>
1717
<note>key: editing_details</note>
1818
</trans-unit>
1919
<trans-unit id="32d50c07b2eacd6fa72742ff1c1f5963c26a251d" resname="new_content_item">

‎src/bundle/Resources/translations/content_edit.en.xliff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
<note>key: editing</note>
2828
</trans-unit>
2929
<trans-unit id="750bead6705b295c7b7d66c27b2768c1b9329ed5" resname="editing_details">
30-
<source>under %location_name% in %language%</source>
31-
<target state="new">under %location_name% in %language%</target>
30+
<source>Location: %location% Translation: %language</source>
31+
<target state="new">Location: %location% Translation: %language</target>
3232
<note>key: editing_details</note>
3333
</trans-unit>
3434
<trans-unit id="009667fab56f0bec66634f009a75ffd9425f2987" resname="fieldtype.translation_is_disabled">

0 commit comments

Comments
 (0)