From e0fb95a7efa13c7d92ef2df306607de5eb671b38 Mon Sep 17 00:00:00 2001
From: Jakub Brzegowski <symfiz@gmail.com>
Date: Fri, 1 Sep 2023 17:18:01 +0200
Subject: [PATCH] IBX-6314: Apply microcopy guidelines and adjust translation
 keys and domains (#59)

---
 features/browser/formats.feature                     |  2 +-
 .../Resources/translations/user_settings.en.xliff    | 12 ++++++------
 src/lib/UserSetting/Group/EditContentGroup.php       |  2 +-
 src/lib/UserSetting/Setting/Language.php             |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/features/browser/formats.feature b/features/browser/formats.feature
index 6ee4a90..921004f 100644
--- a/features/browser/formats.feature
+++ b/features/browser/formats.feature
@@ -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"
diff --git a/src/bundle/Resources/translations/user_settings.en.xliff b/src/bundle/Resources/translations/user_settings.en.xliff
index af4bcd4..74f2ac3 100644
--- a/src/bundle/Resources/translations/user_settings.en.xliff
+++ b/src/bundle/Resources/translations/user_settings.en.xliff
@@ -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">
@@ -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">
@@ -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>
diff --git a/src/lib/UserSetting/Group/EditContentGroup.php b/src/lib/UserSetting/Group/EditContentGroup.php
index 11d9d96..77ea3b7 100644
--- a/src/lib/UserSetting/Group/EditContentGroup.php
+++ b/src/lib/UserSetting/Group/EditContentGroup.php
@@ -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'
diff --git a/src/lib/UserSetting/Setting/Language.php b/src/lib/UserSetting/Setting/Language.php
index f8bde97..deba324 100644
--- a/src/lib/UserSetting/Setting/Language.php
+++ b/src/lib/UserSetting/Setting/Language.php
@@ -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'