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.

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

Merged
merged 4 commits into from
Sep 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion features/browser/formats.feature
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

@APIUser:admin
Scenario: User is asked for setting a new password when his password is in an unsupported format
Given I create a user "UnsupportedPasswordUser" with last name "User" in group "Anonymous Users"
Given I create a user "UnsupportedPasswordUser" with last name "User" in group "Anonymous users"
And a user "UnsupportedPasswordUser" has password in unsupported format
When I am viewing the pages on siteaccess "site" as "UnsupportedPasswordUser"
Then the url should match "/site/user/forgot-password/migration"
Expand Down
12 changes: 6 additions & 6 deletions src/bundle/Resources/translations/user_settings.en.xliff
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@
<note>key: settings.group.edit_content.description</note>
</trans-unit>
<trans-unit id="9fb4add1a9e6148b11b25ddbcaf4e77d97b4ab45" resname="settings.group.edit_content.name">
<source>Edit Content</source>
<target state="new">Edit Content</target>
<source>Edit</source>
<target state="new">Edit</target>
<note>key: settings.group.edit_content.name</note>
</trans-unit>
<trans-unit id="377f69d650dee0a54486fea8f8a89b82203b7755" resname="settings.group.generic.description">
Expand All @@ -107,8 +107,8 @@
<note>key: settings.group.location.name</note>
</trans-unit>
<trans-unit id="3a4946ea2a7aaa360112cf1e657617e7ce7c7d9b" resname="settings.language.value.description">
<source>Back Office language</source>
<target state="new">Back Office language</target>
<source>Language</source>
<target state="new">Language</target>
<note>key: settings.language.value.description</note>
</trans-unit>
<trans-unit id="593fb98cf76c44e48e00ce4ee027a6e54b6625fd" resname="settings.language.value.title">
Expand Down Expand Up @@ -147,8 +147,8 @@
<note>key: settings.timezone.value.title</note>
</trans-unit>
<trans-unit id="7f90e23e086f56c5f7b4a82c6e4b8f40732e6e6a" resname="user_setting.update.success">
<source>User setting '%identifier%' updated.</source>
<target state="new">User setting '%identifier%' updated.</target>
<source>User settings '%identifier%' updated.</source>
<target state="new">User settings '%identifier%' updated.</target>
<note>key: user_setting.update.success</note>
</trans-unit>
</body>
Expand Down
2 changes: 1 addition & 1 deletion src/lib/UserSetting/Group/EditContentGroup.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public function __construct(
public function getName(): string
{
return $this->translator->trans(
/** @Desc("Edit Content") */
/** @Desc("Edit") */
'settings.group.edit_content.name',
[],
'user_settings'
Expand Down
2 changes: 1 addition & 1 deletion src/lib/UserSetting/Setting/Language.php
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ private function getTranslatedName(): string
private function getTranslatedDescription(): string
{
return $this->translator->trans(
/** @Desc("Back Office language") */
/** @Desc("Language") */
'settings.language.value.description',
[],
'user_settings'
Expand Down