fix(moment): handle moment locale when request locale has equal local…

…e part and country part.
sonata-project · Apr 17, 2023 · e08d522 · e08d522
1 parent d71ee63
commit e08d522
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/Twig/CanonicalizeRuntime.php b/src/Twig/CanonicalizeRuntime.php
@@ -52,6 +52,13 @@ public function getCanonicalizedLocaleForMoment(): ?string
             }
         }
 
+        // Handle locales that has equal langage part and country part.
+        if (($localeParts = explode('-', strtolower($locale))) && \count($localeParts) > 1) {
+            if ($localeParts[0] === $localeParts[1]) {
+                $locale = $localeParts[0];
+            }
+        }
+
         return $locale;
     }
 

diff --git a/tests/Twig/CanonicalizeRuntimeTest.php b/tests/Twig/CanonicalizeRuntimeTest.php
@@ -103,6 +103,7 @@ public function momentLocalesProvider(): array
             ['id', 'id'],
             ['is', 'is'],
             ['it', 'it'],
+            ['it', 'it-IT'],
             ['ja', 'ja'],
             ['jv', 'jv'],
             ['ka', 'ka'],