Moved default language, default timezone and base currency settings to new settings system

src/Command/Currencies/UpdateExchangeRatesCommand.php

@@ -22,6 +22,7 @@ declare(strict_types=1);
 
 namespace App\Command\Currencies;
 
+use App\Settings\SystemSettings\LocalizationSettings;
 use Symfony\Component\Console\Attribute\AsCommand;
 use App\Entity\PriceInformations\Currency;
 use App\Services\Tools\ExchangeRateUpdater;
@@ -39,7 +40,7 @@ use function strlen;
 #[AsCommand('partdb:currencies:update-exchange-rates|partdb:update-exchange-rates|app:update-exchange-rates', 'Updates the currency exchange rates.')]
 class UpdateExchangeRatesCommand extends Command
 {
-    public function __construct(protected string $base_current, protected EntityManagerInterface $em, protected ExchangeRateUpdater $exchangeRateUpdater)
+    public function __construct(protected EntityManagerInterface $em, protected ExchangeRateUpdater $exchangeRateUpdater, private readonly LocalizationSettings $localizationSettings)
     {
         parent::__construct();
     }
@@ -54,13 +55,13 @@ class UpdateExchangeRatesCommand extends Command
         $io = new SymfonyStyle($input, $output);
 
         //Check for valid base current
-        if (3 !== strlen($this->base_current)) {
+        if (3 !== strlen($this->localizationSettings->baseCurrency)) {
             $io->error('Chosen Base current is not valid. Check your settings!');
 
             return Command::FAILURE;
         }
 
-        $io->note('Update currency exchange rates with base currency: '.$this->base_current);
+        $io->note('Update currency exchange rates with base currency: '.$this->localizationSettings->baseCurrency);
 
         //Check what currencies we need to update:
         $iso_code = $input->getArgument('iso_code');

src/Controller/RedirectController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace App\Controller;
 
 use App\Entity\UserSystem\User;
+use App\Settings\SystemSettings\LocalizationSettings;
 use function function_exists;
 use function in_array;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -35,7 +36,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
  */
 class RedirectController extends AbstractController
 {
-    public function __construct(protected string $default_locale, protected TranslatorInterface $translator, protected bool $enforce_index_php)
+    public function __construct(private readonly LocalizationSettings $localizationSettings, protected TranslatorInterface $translator, protected bool $enforce_index_php)
     {
     }
 
@@ -46,7 +47,7 @@ class RedirectController extends AbstractController
     public function addLocalePart(Request $request): RedirectResponse
     {
         //By default, we use the global default locale
-        $locale = $this->default_locale;
+        $locale = $this->localizationSettings->locale;
 
         //Check if a user has set a preferred language setting:
         $user = $this->getUser();

src/Entity/UserSystem/User.php

@@ -197,7 +197,7 @@ class User extends AttachmentContainingDBElement implements UserInterface, HasPe
     /**
      * @var string|null The language/locale the user prefers
      */
-    #[Assert\Language]
+    #[Assert\Locale]
     #[Groups(['full', 'import', 'user:read'])]
     #[ORM\Column(name: 'config_language', type: Types::STRING, nullable: true)]
     protected ?string $language = '';

src/EventSubscriber/UserSystem/SetUserTimezoneSubscriber.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace App\EventSubscriber\UserSystem;
 
 use App\Entity\UserSystem\User;
+use App\Settings\SystemSettings\LocalizationSettings;
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\ControllerEvent;
@@ -33,7 +34,7 @@ use Symfony\Component\HttpKernel\KernelEvents;
  */
 final class SetUserTimezoneSubscriber implements EventSubscriberInterface
 {
-    public function __construct(private readonly string $default_timezone, private readonly Security $security)
+    public function __construct(private readonly LocalizationSettings $localizationSettings, private readonly Security $security)
     {
     }
 
@@ -48,8 +49,8 @@ final class SetUserTimezoneSubscriber implements EventSubscriberInterface
         }
 
         //Fill with default value if needed
-        if (null === $timezone && $this->default_timezone !== '') {
-            $timezone = $this->default_timezone;
+        if (null === $timezone && $this->localizationSettings !== '') {
+            $timezone = $this->localizationSettings->timezone;
         }
 
         //If timezone was configured anywhere set it, otherwise just use the one from php.ini

src/Form/AdminPages/CurrencyAdminForm.php

@@ -22,6 +22,7 @@ declare(strict_types=1);
 
 namespace App\Form\AdminPages;
 
+use App\Settings\SystemSettings\LocalizationSettings;
 use Symfony\Bundle\SecurityBundle\Security;
 use App\Entity\Base\AbstractNamedDBElement;
 use App\Form\Type\BigDecimalMoneyType;
@@ -32,7 +33,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class CurrencyAdminForm extends BaseEntityAdminForm
 {
-    public function __construct(Security $security, EventCommentNeededHelper $eventCommentNeededHelper, private readonly string $base_currency)
+    public function __construct(Security $security, EventCommentNeededHelper $eventCommentNeededHelper, private readonly LocalizationSettings $localizationSettings)
     {
         parent::__construct($security, $eventCommentNeededHelper);
     }
@@ -51,7 +52,7 @@ class CurrencyAdminForm extends BaseEntityAdminForm
         $builder->add('exchange_rate', BigDecimalMoneyType::class, [
             'required' => false,
             'label' => 'currency.edit.exchange_rate',
-            'currency' => $this->base_currency,
+            'currency' => $this->localizationSettings->baseCurrency,
             'scale' => 6,
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity),
         ]);

src/Form/AdminPages/SupplierForm.php

@@ -22,6 +22,7 @@ declare(strict_types=1);
 
 namespace App\Form\AdminPages;
 
+use App\Settings\SystemSettings\LocalizationSettings;
 use Symfony\Bundle\SecurityBundle\Security;
 use App\Entity\Base\AbstractNamedDBElement;
 use App\Entity\PriceInformations\Currency;
@@ -32,7 +33,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class SupplierForm extends CompanyForm
 {
-    public function __construct(Security $security, EventCommentNeededHelper $eventCommentNeededHelper, protected string $base_currency)
+    public function __construct(Security $security, EventCommentNeededHelper $eventCommentNeededHelper, private readonly LocalizationSettings $localizationSettings)
     {
         parent::__construct($security, $eventCommentNeededHelper);
     }
@@ -53,7 +54,7 @@ class SupplierForm extends CompanyForm
 
         $builder->add('shipping_costs', BigDecimalMoneyType::class, [
             'required' => false,
-            'currency' => $this->base_currency,
+            'currency' => $this->localizationSettings->baseCurrency,
             'scale' => 3,
             'label' => 'supplier.shipping_costs.label',
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity),

src/Form/Type/CurrencyEntityType.php

@@ -25,6 +25,7 @@ namespace App\Form\Type;
 use App\Entity\PriceInformations\Currency;
 use App\Form\Type\Helper\StructuralEntityChoiceHelper;
 use App\Services\Trees\NodesListBuilder;
+use App\Settings\SystemSettings\LocalizationSettings;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Intl\Currencies;
 use Symfony\Component\OptionsResolver\Options;
@@ -36,7 +37,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
  */
 class CurrencyEntityType extends StructuralEntityType
 {
-    public function __construct(EntityManagerInterface $em, NodesListBuilder $builder, TranslatorInterface $translator, StructuralEntityChoiceHelper $choiceHelper, protected ?string $base_currency)
+    public function __construct(EntityManagerInterface $em, NodesListBuilder $builder, TranslatorInterface $translator, StructuralEntityChoiceHelper $choiceHelper, private readonly LocalizationSettings $localizationSettings)
     {
         parent::__construct($em, $builder, $translator, $choiceHelper);
     }
@@ -57,7 +58,7 @@ class CurrencyEntityType extends StructuralEntityType
 
         $resolver->setDefault('empty_message', function (Options $options) {
             //By default, we use the global base currency:
-            $iso_code = $this->base_currency;
+            $iso_code = $this->localizationSettings->baseCurrency;
 
             if ($options['base_currency']) { //Allow to override it
                 $iso_code = $options['base_currency'];

src/Form/Type/LocaleSelectType.php

@@ -0,0 +1,53 @@
+<?php
+/*
+ * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
+ *
+ *  Copyright (C) 2019 - 2024 Jan Böhmer (https://github.com/jbtronics)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published
+ *  by the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+
+namespace App\Form\Type;
+
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\LocaleType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * A locale select field that uses the preferred languages from the configuration.
+
+ */
+class LocaleSelectType extends AbstractType
+{
+
+    public function __construct(#[Autowire(param: 'partdb.locale_menu')] private readonly array $preferred_languages)
+    {
+
+    }
+    public function getParent(): string
+    {
+        return LocaleType::class;
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'preferred_choices' => $this->preferred_languages,
+        ]);
+    }
+}

src/Form/UserAdminForm.php

@@ -22,6 +22,7 @@ declare(strict_types=1);
 
 namespace App\Form;
 
+use App\Form\Type\LocaleSelectType;
 use Symfony\Bundle\SecurityBundle\Security;
 use App\Entity\Base\AbstractNamedDBElement;
 use App\Entity\UserSystem\Group;
@@ -35,7 +36,6 @@ use App\Form\Type\ThemeChoiceType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
-use Symfony\Component\Form\Extension\Core\Type\LanguageType;
 use Symfony\Component\Form\Extension\Core\Type\PasswordType;
 use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
 use Symfony\Component\Form\Extension\Core\Type\ResetType;
@@ -138,11 +138,10 @@ class UserAdminForm extends AbstractType
             ])
 
             //Config section
-            ->add('language', LanguageType::class, [
+            ->add('language', LocaleSelectType::class, [
                 'required' => false,
                 'placeholder' => 'user_settings.language.placeholder',
                 'label' => 'user.language_select',
-                'preferred_choices' => ['en', 'de'],
                 'disabled' => !$this->security->isGranted('change_user_settings', $entity),
             ])
             ->add('timezone', TimezoneType::class, [

src/Form/UserSettingsType.php

@@ -22,6 +22,7 @@ declare(strict_types=1);
 
 namespace App\Form;
 
+use App\Form\Type\LocaleSelectType;
 use Symfony\Bundle\SecurityBundle\Security;
 use App\Entity\UserSystem\User;
 use App\Form\Type\CurrencyEntityType;
@@ -33,7 +34,6 @@ use Symfony\Component\Form\Event\PreSetDataEvent;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
 use Symfony\Component\Form\Extension\Core\Type\FileType;
-use Symfony\Component\Form\Extension\Core\Type\LanguageType;
 use Symfony\Component\Form\Extension\Core\Type\ResetType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
@@ -47,7 +47,7 @@ class UserSettingsType extends AbstractType
 {
     public function __construct(protected Security $security,
         protected bool $demo_mode,
-        #[Autowire(param: 'partdb.locale_menu')] private readonly array $preferred_languages)
+        )
     {
     }
 
@@ -107,12 +107,11 @@ class UserSettingsType extends AbstractType
                 'mode' => 'markdown-full',
                 'disabled' => !$this->security->isGranted('edit_infos', $options['data']) || $this->demo_mode,
             ])
-            ->add('language', LanguageType::class, [
+            ->add('language', LocaleSelectType::class, [
                 'disabled' => $this->demo_mode,
                 'required' => false,
                 'placeholder' => 'user_settings.language.placeholder',
                 'label' => 'user.language_select',
-                'preferred_choices' => $this->preferred_languages,
             ])
             ->add('timezone', TimezoneType::class, [
                 'disabled' => $this->demo_mode,

src/Services/Formatters/MoneyFormatter.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace App\Services\Formatters;
 
 use App\Entity\PriceInformations\Currency;
+use App\Settings\SystemSettings\LocalizationSettings;
 use Locale;
 use NumberFormatter;
 
@@ -30,7 +31,7 @@ class MoneyFormatter
 {
     protected string $locale;
 
-    public function __construct(protected string $base_currency)
+    public function __construct(private readonly LocalizationSettings $localizationSettings)
     {
         $this->locale = Locale::getDefault();
     }
@@ -45,7 +46,7 @@ class MoneyFormatter
      */
     public function format(string|float $value, ?Currency $currency = null, int $decimals = 5, bool $show_all_digits = false): string
     {
-        $iso_code = $this->base_currency;
+        $iso_code = $this->localizationSettings->baseCurrency;
         if ($currency instanceof Currency && ($currency->getIsoCode() !== null && $currency->getIsoCode() !== '')) {
             $iso_code = $currency->getIsoCode();
         }

src/Services/ImportExportSystem/PartKeeprImporter/PKPartImporter.php

@@ -35,6 +35,7 @@ use App\Entity\Parts\Supplier;
 use App\Entity\PriceInformations\Currency;
 use App\Entity\PriceInformations\Orderdetail;
 use App\Entity\PriceInformations\Pricedetail;
+use App\Settings\SystemSettings\LocalizationSettings;
 use Brick\Math\BigDecimal;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Intl\Currencies;
@@ -47,7 +48,7 @@ class PKPartImporter
 {
     use PKImportHelperTrait;
 
-    public function __construct(EntityManagerInterface $em, PropertyAccessorInterface $propertyAccessor, private readonly string $base_currency)
+    public function __construct(EntityManagerInterface $em, PropertyAccessorInterface $propertyAccessor, private readonly LocalizationSettings $localizationSettings)
     {
         $this->em = $em;
         $this->propertyAccessor = $propertyAccessor;
@@ -210,7 +211,7 @@ class PKPartImporter
         $currency_iso_code = strtoupper($currency_iso_code);
 
         //We do not have a currency for the base currency to be consistent with prices without currencies
-        if ($currency_iso_code === $this->base_currency) {
+        if ($currency_iso_code === $this->localizationSettings->baseCurrency) {
             return null;
         }
 

src/Services/InfoProviderSystem/DTOtoEntityConverter.php

@@ -41,6 +41,7 @@ use App\Services\InfoProviderSystem\DTOs\ParameterDTO;
 use App\Services\InfoProviderSystem\DTOs\PartDetailDTO;
 use App\Services\InfoProviderSystem\DTOs\PriceDTO;
 use App\Services\InfoProviderSystem\DTOs\PurchaseInfoDTO;
+use App\Settings\SystemSettings\LocalizationSettings;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
@@ -52,8 +53,11 @@ final class DTOtoEntityConverter
     private const TYPE_DATASHEETS_NAME = 'Datasheet';
     private const TYPE_IMAGE_NAME = 'Image';
 
-    public function __construct(private readonly EntityManagerInterface $em, private readonly string $base_currency)
+    private readonly string $base_currency;
+
+    public function __construct(private readonly EntityManagerInterface $em, LocalizationSettings $localizationSettings)
     {
+        $this->base_currency = $localizationSettings->baseCurrency;
     }
 
     /**

src/Services/Parts/PricedetailHelper.php

@@ -25,6 +25,7 @@ namespace App\Services\Parts;
 use App\Entity\Parts\Part;
 use App\Entity\PriceInformations\Currency;
 use App\Entity\PriceInformations\Pricedetail;
+use App\Settings\SystemSettings\LocalizationSettings;
 use Brick\Math\BigDecimal;
 use Brick\Math\RoundingMode;
 use Doctrine\ORM\PersistentCollection;
@@ -39,7 +40,7 @@ class PricedetailHelper
 {
     protected string $locale;
 
-    public function __construct(protected string $base_currency)
+    public function __construct()
     {
         $this->locale = Locale::getDefault();
     }

src/Services/Tools/ExchangeRateUpdater.php

@@ -23,13 +23,14 @@ declare(strict_types=1);
 namespace App\Services\Tools;
 
 use App\Entity\PriceInformations\Currency;
+use App\Settings\SystemSettings\LocalizationSettings;
 use Brick\Math\BigDecimal;
 use Brick\Math\RoundingMode;
 use Swap\Swap;
 
 class ExchangeRateUpdater
 {
-    public function __construct(private readonly string $base_currency, private readonly Swap $swap)
+    public function __construct(private LocalizationSettings $localizationSettings, private readonly Swap $swap)
     {
     }
 
@@ -39,7 +40,7 @@ class ExchangeRateUpdater
     public function update(Currency $currency): Currency
     {
         //Currency pairs are always in the format "BASE/QUOTE"
-        $rate = $this->swap->latest($this->base_currency.'/'.$currency->getIsoCode());
+        $rate = $this->swap->latest($this->localizationSettings->baseCurrency.'/'.$currency->getIsoCode());
         //The rate says how many quote units are worth one base unit
         //So we need to invert it to get the exchange rate
 

src/Settings/SystemSettings.php

@@ -26,6 +26,7 @@ namespace App\Settings;
 use App\Settings\SystemSettings\AttachmentsSettings;
 use App\Settings\SystemSettings\CustomizationSettings;
 use App\Settings\SystemSettings\HistorySettings;
+use App\Settings\SystemSettings\LocalizationSettings;
 use App\Settings\SystemSettings\PrivacySettings;
 use Jbtronics\SettingsBundle\Settings\EmbeddedSettings;
 use Jbtronics\SettingsBundle\Settings\Settings;
@@ -33,6 +34,9 @@ use Jbtronics\SettingsBundle\Settings\Settings;
 #[Settings]
 class SystemSettings
 {
+    #[EmbeddedSettings()]
+    public ?LocalizationSettings $localization = null;
+
     #[EmbeddedSettings()]
     public ?CustomizationSettings $customization = null;
 

src/Settings/SystemSettings/HistorySettings.php

@@ -30,11 +30,14 @@ use Jbtronics\SettingsBundle\ParameterTypes\ArrayType;
 use Jbtronics\SettingsBundle\ParameterTypes\EnumType;
 use Jbtronics\SettingsBundle\Settings\Settings;
 use Jbtronics\SettingsBundle\Settings\SettingsParameter;
+use Jbtronics\SettingsBundle\Settings\SettingsTrait;
 use Symfony\Component\Translation\TranslatableMessage as TM;
 
 #[Settings(label: new TM("settings.system.history"))]
 class HistorySettings
 {
+    use SettingsTrait;
+
     #[SettingsParameter(
         label: new TM("settings.system.history.saveChangedFields"),
         envVar: "bool:HISTORY_SAVE_CHANGED_FIELDS", envVarMode: EnvVarMode::OVERWRITE)]

src/Settings/SystemSettings/LocalizationSettings.php

@@ -0,0 +1,61 @@
+<?php
+/*
+ * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
+ *
+ *  Copyright (C) 2019 - 2024 Jan Böhmer (https://github.com/jbtronics)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published
+ *  by the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+
+namespace App\Settings\SystemSettings;
+
+use App\Form\Type\LocaleSelectType;
+use Jbtronics\SettingsBundle\Metadata\EnvVarMode;
+use Jbtronics\SettingsBundle\Settings\Settings;
+use Jbtronics\SettingsBundle\Settings\SettingsParameter;
+use Jbtronics\SettingsBundle\Settings\SettingsTrait;
+use Symfony\Component\Form\Extension\Core\Type\CurrencyType;
+use Symfony\Component\Form\Extension\Core\Type\TimezoneType;
+use Symfony\Component\Translation\TranslatableMessage as TM;
+use Symfony\Component\Validator\Constraints as Assert;
+
+#[Settings(label: new TM("settings.system.localization"))]
+class LocalizationSettings
+{
+    use SettingsTrait;
+
+    #[Assert\Locale()]
+    #[Assert\NotBlank()]
+    #[SettingsParameter(label: new TM("settings.system.localization.locale"), formType: LocaleSelectType::class,
+    envVar: "string:DEFAULT_LANG", envVarMode: EnvVarMode::OVERWRITE)]
+    public string $locale = 'en';
+
+    #[Assert\Timezone()]
+    #[Assert\NotBlank()]
+    #[SettingsParameter(label: new TM("settings.system.localization.timezone"), formType: TimezoneType::class,
+        envVar: "string:DEFAULT_TIMEZONE", envVarMode: EnvVarMode::OVERWRITE)]
+    public string $timezone = 'Europe/Berlin';
+
+    #[Assert\Currency()]
+    #[Assert\NotBlank()]
+    #[SettingsParameter(label: new TM("settings.system.localization.base_currency"),
+        description: new TM("settings.system.localization.base_currency_description"),
+        formType: CurrencyType::class, formOptions: ['preferred_choices' => ['EUR', 'USD', 'GBP', "JPY", "CNY"], 'help_html' => true],
+        envVar: "string:BASE_CURRENCY", envVarMode: EnvVarMode::OVERWRITE
+    )]
+    public string $baseCurrency = 'EUR';
+}

src/Settings/SystemSettings/PrivacySettings.php

@@ -29,7 +29,7 @@ use Jbtronics\SettingsBundle\Settings\SettingsParameter;
 use Jbtronics\SettingsBundle\Settings\SettingsTrait;
 use Symfony\Component\Translation\TranslatableMessage as TM;
 
-#[Settings]
+#[Settings(label: new TM("settings.system.privacy"))]
 class PrivacySettings
 {
     use SettingsTrait;

src/State/PartDBInfoProvider.php

@@ -10,6 +10,7 @@ use App\ApiResource\PartDBInfo;
 use App\Services\Misc\GitVersionInfo;
 use App\Services\System\BannerHelper;
 use App\Settings\SystemSettings\CustomizationSettings;
+use App\Settings\SystemSettings\LocalizationSettings;
 use Shivas\VersioningBundle\Service\VersionManagerInterface;
 
 class PartDBInfoProvider implements ProviderInterface
@@ -17,11 +18,9 @@ class PartDBInfoProvider implements ProviderInterface
 
     public function __construct(private readonly VersionManagerInterface $versionManager,
         private readonly GitVersionInfo $gitVersionInfo,
-        private readonly string $base_currency,
         private readonly BannerHelper $bannerHelper,
         private readonly string $default_uri,
-        private readonly string $global_timezone,
-        private readonly string $global_locale,
+        private readonly LocalizationSettings $localizationSettings,
         private readonly CustomizationSettings $customizationSettings,
     )
     {
@@ -37,9 +36,9 @@ class PartDBInfoProvider implements ProviderInterface
             title: $this->customizationSettings->instanceName,
             banner: $this->bannerHelper->getBanner(),
             default_uri: $this->default_uri,
-            global_timezone: $this->global_timezone,
-            base_currency: $this->base_currency,
-            global_locale: $this->global_locale,
+            global_timezone: $this->localizationSettings->timezone,
+            base_currency: $this->localizationSettings->baseCurrency,
+            global_locale: $this->localizationSettings->locale,
         );
     }
 }