Merge branch '2.x' into 3.x

sonata-project · Oct 6, 2022 · a853e96 · a853e96
2 parents 881a6e1 + 0d58197
commit a853e96
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.0.2](https://github.com/sonata-project/SonataIntlBundle/compare/3.0.1...3.0.2) - 2022-10-05
+### Fixed
+- [[#565](https://github.com/sonata-project/SonataIntlBundle/pull/565)] Use the sonata_intl.locale or kernel.default_locale when no locale are provided. ([@VincentLanglet](https://github.com/VincentLanglet))
+
 ## [3.0.1](https://github.com/sonata-project/SonataIntlBundle/compare/3.0.0...3.0.1) - 2022-09-27
 ### Fixed
 - [[#560](https://github.com/sonata-project/SonataIntlBundle/pull/560)] All the templates using `sonata_number_format_*` methods ([@VincentLanglet](https://github.com/VincentLanglet))
@@ -19,6 +23,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - [[#539](https://github.com/sonata-project/SonataIntlBundle/pull/539)] Final keyword to all classes ([@VincentLanglet](https://github.com/VincentLanglet))
 - [[#539](https://github.com/sonata-project/SonataIntlBundle/pull/539)] Typehint to all methods ([@VincentLanglet](https://github.com/VincentLanglet))
 
+## [2.14.1](https://github.com/sonata-project/SonataIntlBundle/compare/2.14.0...2.14.1) - 2022-10-05
+### Fixed
+- [[#565](https://github.com/sonata-project/SonataIntlBundle/pull/565)] Use the sonata_intl.locale or kernel.default_locale when no locale are provided. ([@VincentLanglet](https://github.com/VincentLanglet))
+
 ## [2.14.0](https://github.com/sonata-project/SonataIntlBundle/compare/2.13.1...2.14.0) - 2022-08-16
 ### Added
 - [[#547](https://github.com/sonata-project/SonataIntlBundle/pull/547)] Added support for `symfony/translation-contracts` ^3 ([@AirBair](https://github.com/AirBair))

diff --git a/src/DependencyInjection/SonataIntlExtension.php b/src/DependencyInjection/SonataIntlExtension.php
@@ -40,6 +40,7 @@ public function load(array $configs, ContainerBuilder $container): void
         $loader->load('intl.php');
 
         $this->configureTimezone($container, $config);
+        $this->configureLocale($container, $config);
     }
 
     /**
@@ -86,6 +87,21 @@ private function configureTimezone(ContainerBuilder $container, array $config):
     }
 
     /**
+     * @param mixed[] $config
+     */
+    private function configureLocale(ContainerBuilder $container, array $config): void
+    {
+        $locale = $config['locale'] ?? '%kernel.default_locale%';
+
+        $container->getDefinition('sonata.intl.helper.datetime')->replaceArgument(2, $locale);
+        $container->getDefinition('sonata.intl.helper.locale')->replaceArgument(1, $locale);
+        $container->getDefinition('sonata.intl.helper.number')->replaceArgument(4, $locale);
+        $container->getDefinition('sonata.intl.timezone_detector.locale_aware')->replaceArgument(1, $locale);
+    }
+
+    /**
+     * Validate timezones.
+     *
      * @param array<string> $timezones
      *
      * @throws \RuntimeException If one of the locales is invalid

diff --git a/src/Helper/BaseHelper.php b/src/Helper/BaseHelper.php
@@ -33,9 +33,13 @@ abstract class BaseHelper implements LocaleAwareInterface
 
     private ?string $locale = null;
 
-    public function __construct(string $charset)
+    public function __construct(string $charset, ?string $defaultLocale = null)
     {
         $this->setCharset($charset);
+
+        if (null !== $defaultLocale) {
+            $this->setLocale($defaultLocale);
+        }
     }
 
     public function setCharset(string $charset): void

diff --git a/src/Helper/DateTimeFormatter.php b/src/Helper/DateTimeFormatter.php
@@ -31,9 +31,10 @@ final class DateTimeFormatter extends BaseHelper implements DateTimeFormatterInt
 
     public function __construct(
         private TimezoneDetectorInterface $timezoneDetector,
-        string $charset
+        string $charset,
+        ?string $defaultLocale = null
     ) {
-        parent::__construct($charset);
+        parent::__construct($charset, $defaultLocale);
     }
 
     public function formatDate(

diff --git a/src/Helper/NumberFormatter.php b/src/Helper/NumberFormatter.php
@@ -31,9 +31,10 @@ public function __construct(
         string $charset,
         private array $attributes = [],
         private array $textAttributes = [],
-        private array $symbols = []
+        private array $symbols = [],
+        ?string $defaultLocale = null
     ) {
-        parent::__construct($charset);
+        parent::__construct($charset, $defaultLocale);
     }
 
     public function formatPercent(string|float|int $number, array $attributes = [], array $textAttributes = [], array $symbols = [], ?string $locale = null): string

diff --git a/src/Resources/config/intl.php b/src/Resources/config/intl.php
@@ -34,13 +34,18 @@
             ->tag('kernel.locale_aware')
             ->args([
                 param('kernel.charset'),
+                abstract_arg('default locale'),
             ])
 
         ->set('sonata.intl.helper.number', NumberFormatter::class)
             ->public()
             ->tag('kernel.locale_aware')
             ->args([
                 param('kernel.charset'),
+                [],
+                [],
+                [],
+                abstract_arg('default locale'),
             ])
 
         ->set('sonata.intl.helper.datetime', DateTimeFormatter::class)
@@ -49,6 +54,7 @@
             ->args([
                 service('sonata.intl.timezone_detector'),
                 param('kernel.charset'),
+                abstract_arg('default locale'),
             ])
 
         ->set('sonata.intl.twig.extension.locale', LocaleExtension::class)
@@ -113,5 +119,6 @@
             ->tag('kernel.locale_aware')
             ->args([
                 abstract_arg('timezone map'),
+                abstract_arg('default locale'),
             ]);
 };
diff --git a/src/Timezone/LocaleAwareBasedTimezoneDetector.php b/src/Timezone/LocaleAwareBasedTimezoneDetector.php
@@ -27,8 +27,11 @@ final class LocaleAwareBasedTimezoneDetector implements TimezoneDetectorInterfac
     /**
      * @param array<string, string> $timezoneMap
      */
-    public function __construct(private array $timezoneMap = [])
+    public function __construct(private array $timezoneMap = [], ?string $defaultLocale = null)
     {
+        if (null !== $defaultLocale) {
+            $this->setLocale($defaultLocale);
+        }
     }
 
     public function getTimezone(): ?string