From 3b2f6ea8db46a0ac338379c8e3655da1a53509bc Mon Sep 17 00:00:00 2001 From: tischsoic Date: Mon, 7 Aug 2023 15:14:47 +0200 Subject: [PATCH 1/4] IBX-6314: Anonymous Users -> Anonymous users --- features/browser/formats.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From 1085204f2cad228b108f7387f1ce7f6f085dbf02 Mon Sep 17 00:00:00 2001 From: tischsoic Date: Tue, 8 Aug 2023 10:48:54 +0200 Subject: [PATCH 2/4] under %location_name% in %language% --- src/lib/UserSetting/Group/EditContentGroup.php | 2 +- src/lib/UserSetting/Setting/Language.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/UserSetting/Group/EditContentGroup.php b/src/lib/UserSetting/Group/EditContentGroup.php index 11d9d96..73ca56e 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 content") */ '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' From c971abbe7988289f84fbe8e584566290b6c1a698 Mon Sep 17 00:00:00 2001 From: tischsoic Date: Wed, 23 Aug 2023 11:38:10 +0200 Subject: [PATCH 3/4] generated translations --- .../Resources/translations/user_settings.en.xliff | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/bundle/Resources/translations/user_settings.en.xliff b/src/bundle/Resources/translations/user_settings.en.xliff index af4bcd4..24f0345 100644 --- a/src/bundle/Resources/translations/user_settings.en.xliff +++ b/src/bundle/Resources/translations/user_settings.en.xliff @@ -82,8 +82,8 @@ key: settings.group.edit_content.description - Edit Content - Edit Content + Edit content + Edit content key: settings.group.edit_content.name @@ -107,8 +107,8 @@ key: settings.group.location.name - Back Office language - Back Office language + Language + Language key: settings.language.value.description @@ -147,8 +147,8 @@ key: settings.timezone.value.title - User setting '%identifier%' updated. - User setting '%identifier%' updated. + User settings '%identifier%' updated. + User settings '%identifier%' updated. key: user_setting.update.success From 69d7f6bbe1a864195e18801cdbcf8574b1eb15d3 Mon Sep 17 00:00:00 2001 From: tischsoic Date: Fri, 1 Sep 2023 13:27:34 +0200 Subject: [PATCH 4/4] Fix Edit content -> Edit --- src/bundle/Resources/translations/user_settings.en.xliff | 4 ++-- src/lib/UserSetting/Group/EditContentGroup.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bundle/Resources/translations/user_settings.en.xliff b/src/bundle/Resources/translations/user_settings.en.xliff index 24f0345..74f2ac3 100644 --- a/src/bundle/Resources/translations/user_settings.en.xliff +++ b/src/bundle/Resources/translations/user_settings.en.xliff @@ -82,8 +82,8 @@ key: settings.group.edit_content.description - Edit content - Edit content + Edit + Edit key: settings.group.edit_content.name diff --git a/src/lib/UserSetting/Group/EditContentGroup.php b/src/lib/UserSetting/Group/EditContentGroup.php index 73ca56e..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'