[FrameworkBundle] Allow dots in translation domains

jschaedl · jschaedl · commit 73432f870a93 · 2019-05-09T22:49:47.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1217,14 +1217,15 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
                 ->followLinks()
                 ->files()
                 ->filter(function (\SplFileInfo $file) {
-                    return 2 === substr_count($file->getBasename(), '.') && preg_match('/\.\w+$/', $file->getBasename());
+                    return 2 <= substr_count($file->getBasename(), '.') && preg_match('/\.\w+$/', $file->getBasename());
                 })
                 ->in($dirs)
                 ->sortByName()
             ;
 
             foreach ($finder as $file) {
-                list(, $locale) = explode('.', $file->getBasename(), 3);
+                $fileNameParts = explode('.', basename($file));
+                $locale = $fileNameParts[\count($fileNameParts) - 2];
                 if (!isset($files[$locale])) {
                     $files[$locale] = [];
                 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
@@ -148,7 +148,11 @@ private function addResourceFiles($filesByLocale)
         foreach ($filesByLocale as $locale => $files) {
             foreach ($files as $key => $file) {
                 // filename is domain.locale.format
-                list($domain, $locale, $format) = explode('.', basename($file), 3);
+                $fileNameParts = explode('.', basename($file));
+                $format = $fileNameParts[\count($fileNameParts) - 1];
+                $locale = $fileNameParts[\count($fileNameParts) - 2];
+                $domainParts = array_splice($fileNameParts, 0, \count($fileNameParts) - 2);
+                $domain = implode('.', $domainParts);
                 $this->addResource($format, $file, $locale, $domain);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,11 @@ private function addResourceFiles($filesByLocale)`
`148`	`148`	`foreach ($filesByLocale as $locale => $files) {`
`149`	`149`	`foreach ($files as $key => $file) {`
`150`	`150`	`// filename is domain.locale.format`
`151`		`- list($domain, $locale, $format) = explode('.', basename($file), 3);`
	`151`	`+ $fileNameParts = explode('.', basename($file));`
	`152`	`+ $format = $fileNameParts[\count($fileNameParts) - 1];`
	`153`	`+ $locale = $fileNameParts[\count($fileNameParts) - 2];`
	`154`	`+ $domainParts = array_splice($fileNameParts, 0, \count($fileNameParts) - 2);`
	`155`	`+ $domain = implode('.', $domainParts);`
`152`	`156`	`$this->addResource($format, $file, $locale, $domain);`
`153`	`157`	`}`
`154`	`158`	`}`