Merge remote-tracking branch 'origin/4.5'

ibexa · Feb 8, 2024 · 4081182 · 4081182
2 parents 6939cc6 + 792411a
commit 4081182
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/bundle/Resources/translations/ibexa_user_settings.en.xliff b/src/bundle/Resources/translations/ibexa_user_settings.en.xliff
@@ -57,13 +57,13 @@
         <note>key: settings.character_counter.value.title</note>
       </trans-unit>
       <trans-unit id="bb01c22de6038102d6fa6646f4ecebaf0c54e720" resname="settings.full_datetime_format.value.description">
-        <source>Date and time format</source>
-        <target state="new">Date and time format</target>
+        <source>Full date and time format</source>
+        <target state="new">Full date and time format</target>
         <note>key: settings.full_datetime_format.value.description</note>
       </trans-unit>
       <trans-unit id="9b6504d133b0a02fd337aa91d724723c927e4e96" resname="settings.full_datetime_format.value.title">
-        <source>Long date and time format</source>
-        <target state="new">Long date and time format</target>
+        <source>Full date and time format</source>
+        <target state="new">Full date and time format</target>
         <note>key: settings.full_datetime_format.value.title</note>
       </trans-unit>
       <trans-unit id="f69442f4afc8feed51643e408862c6a83f715560" resname="settings.group.browsing.description">
@@ -117,8 +117,8 @@
         <note>key: settings.language.value.title</note>
       </trans-unit>
       <trans-unit id="f99a9bb9741db45f57f2436c535d89609ebc6b0d" resname="settings.short_datetime_format.value.description">
-        <source>Date and time format</source>
-        <target state="new">Date and time format</target>
+        <source>Short date and time format</source>
+        <target state="new">Short date and time format</target>
         <note>key: settings.short_datetime_format.value.description</note>
       </trans-unit>
       <trans-unit id="f87e581648ae7baaa1e96941f1c8b45c11f73553" resname="settings.short_datetime_format.value.title">

diff --git a/src/lib/UserSetting/Setting/FullDateTimeFormat.php b/src/lib/UserSetting/Setting/FullDateTimeFormat.php
@@ -82,7 +82,7 @@ public function mapFieldForm(
     protected function getTranslatedName(): string
     {
         return $this->translator->trans(
-            /** @Desc("Long date and time format") */
+            /** @Desc("Full date and time format") */
             'settings.full_datetime_format.value.title',
             [],
             'ibexa_user_settings'
@@ -95,7 +95,7 @@ protected function getTranslatedName(): string
     protected function getTranslatedDescription(): string
     {
         return $this->translator->trans(
-            /** @Desc("Date and time format") */
+            /** @Desc("Full date and time format") */
             'settings.full_datetime_format.value.description',
             [],
             'ibexa_user_settings'

diff --git a/src/lib/UserSetting/Setting/ShortDateTimeFormat.php b/src/lib/UserSetting/Setting/ShortDateTimeFormat.php
@@ -94,7 +94,7 @@ protected function getTranslatedName(): string
     protected function getTranslatedDescription(): string
     {
         return $this->translator->trans(
-            /** @Desc("Date and time format") */
+            /** @Desc("Short date and time format") */
             'settings.short_datetime_format.value.description',
             [],
             'ibexa_user_settings'