From 0a8a7ff0e1a6c97ba32f6409135e741f7c0b1dc4 Mon Sep 17 00:00:00 2001 From: Bartek Wajda Date: Wed, 5 Aug 2026 10:49:45 +0200 Subject: [PATCH] IBX-11774: Changed location into locale in user settings group configuration --- .../Resources/config/services/user_settings.yaml | 12 ++++++------ .../Group/{LocationGroup.php => LocaleGroup.php} | 6 +----- 2 files changed, 7 insertions(+), 11 deletions(-) rename src/lib/UserSetting/Group/{LocationGroup.php => LocaleGroup.php} (80%) diff --git a/src/bundle/Resources/config/services/user_settings.yaml b/src/bundle/Resources/config/services/user_settings.yaml index 49a8f41f..2797fb9f 100644 --- a/src/bundle/Resources/config/services/user_settings.yaml +++ b/src/bundle/Resources/config/services/user_settings.yaml @@ -73,7 +73,7 @@ services: # Ibexa\User\UserSetting\Setting\Timezone: tags: - - { name: ibexa.user.setting.value, identifier: timezone, group: location, priority: 50 } + - { name: ibexa.user.setting.value, identifier: timezone, group: locale, priority: 50 } - { name: ibexa.user.setting.mapper.form, identifier: timezone } Ibexa\User\UserSetting\Setting\SubitemsLimit: @@ -90,7 +90,7 @@ services: arguments: $availableLocaleChoiceLoader: '@Ibexa\User\Form\ChoiceList\Loader\AvailableLocaleChoiceLoader' tags: - - { name: ibexa.user.setting.value, identifier: language, group: location, priority: 10 } + - { name: ibexa.user.setting.value, identifier: language, group: locale, priority: 10 } - { name: ibexa.user.setting.mapper.form, identifier: language } Ibexa\User\UserSetting\DateTimeFormat\FullDateTimeFormatterFactory: ~ @@ -104,7 +104,7 @@ services: arguments: $formatter: '@ibexa.user.settings.full_datetime_format.formatter' tags: - - { name: ibexa.user.setting.value, identifier: full_datetime_format, group: location, priority: 20 } + - { name: ibexa.user.setting.value, identifier: full_datetime_format, group: locale, priority: 20 } - { name: ibexa.user.setting.mapper.form, identifier: full_datetime_format } Ibexa\User\UserSetting\DateTimeFormat\ShortDateTimeFormatterFactory: ~ @@ -118,7 +118,7 @@ services: arguments: $formatter: '@ibexa.user.settings.short_datetime_format.formatter' tags: - - { name: ibexa.user.setting.value, identifier: short_datetime_format, group: location, priority: 30 } + - { name: ibexa.user.setting.value, identifier: short_datetime_format, group: locale, priority: 30 } - { name: ibexa.user.setting.mapper.form, identifier: short_datetime_format } Ibexa\User\UserSetting\DateTimeFormat\FullDateFormatterFactory: ~ @@ -149,9 +149,9 @@ services: factory: ['@Ibexa\User\UserSetting\DateTimeFormat\ShortDateFormatterFactory', 'getFormatter'] class: 'Ibexa\User\UserSetting\DateTimeFormat\Formatter' - Ibexa\User\UserSetting\Group\LocationGroup: + Ibexa\User\UserSetting\Group\LocaleGroup: tags: - - { name: ibexa.user.setting.group, identifier: location, priority: 30 } + - { name: ibexa.user.setting.group, identifier: locale, priority: 30 } Ibexa\User\UserSetting\Group\EditContentGroup: tags: diff --git a/src/lib/UserSetting/Group/LocationGroup.php b/src/lib/UserSetting/Group/LocaleGroup.php similarity index 80% rename from src/lib/UserSetting/Group/LocationGroup.php rename to src/lib/UserSetting/Group/LocaleGroup.php index 3c652840..002615df 100644 --- a/src/lib/UserSetting/Group/LocationGroup.php +++ b/src/lib/UserSetting/Group/LocaleGroup.php @@ -11,11 +11,7 @@ use JMS\TranslationBundle\Annotation\Desc; use Symfony\Contracts\Translation\TranslatorInterface; -/** - * The translation for the given group was changed to 'Locale' from 'Location'. However, for backwards compatibility - * we decided to keep the old configuration with corresponding classes and services as 'location'. - */ -final class LocationGroup extends AbstractGroup +final class LocaleGroup extends AbstractGroup { /** * @param array $values