Only support correctly formatted language folders

contao · Jul 5, 2021 · c2ca955 · c2ca955
1 parent de7b8d7
commit c2ca955
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/core-bundle/src/DependencyInjection/Configuration.php b/core-bundle/src/DependencyInjection/Configuration.php
@@ -12,6 +12,7 @@
 
 namespace Contao\CoreBundle\DependencyInjection;
 
+use Contao\CoreBundle\Util\LocaleUtil;
 use Contao\Image\ResizeConfiguration;
 use Imagine\Image\ImageInterface;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
@@ -514,10 +515,16 @@ private function getLocales(): array
         $languages = [$this->defaultLocale];
 
         /** @var array<SplFileInfo> $finder */
-        $finder = Finder::create()->directories()->depth(0)->name('/^[a-z]{2}(_[A-Z]{2})?$/')->in($dirs);
+        $finder = Finder::create()->directories()->depth(0)->name('/^[a-z]{2,}/')->in($dirs);
 
         foreach ($finder as $file) {
-            $languages[] = $file->getFilename();
+            $locale = $file->getFilename();
+
+            if (LocaleUtil::canonicalize($locale) !== $locale) {
+                continue;
+            }
+
+            $languages[] = $locale;
         }
 
         return array_values(array_unique($languages));