some more fixes

schmittjoh · schmittjoh · commit 5b87997da3eb · 2011-09-19T16:37:34.000+02:00
diff --git a/Translation/TranslationLoader.php b/Translation/TranslationLoader.php
@@ -50,9 +50,10 @@ public function loadMessages($directory, MessageCatalogue $catalogue)
         foreach($this->loaders as $format => $loader) {
             // load any existing translation files
             $finder = new Finder();
-            $files = $finder->files()->name('*.'.$catalogue->getLocale().'.'.$format)->in($directory);
+            $extension = $catalogue->getLocale().'.'.$format;
+            $files = $finder->files()->name('*.'.$extension)->in($directory);
             foreach ($files as $file) {
-                $domain = substr($file->getFileName(), 0, strrpos($file->getFileName(), $catalogue->getLocale().$format) - 1);
+                $domain = substr($file->getFileName(), 0, -1 * strlen($extension) - 1);
                 $catalogue->addCatalogue($loader->load($file->getPathname(), $catalogue->getLocale(), $domain));
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,10 @@ public function loadMessages($directory, MessageCatalogue $catalogue)`
`50`	`50`	`foreach($this->loaders as $format => $loader) {`
`51`	`51`	`// load any existing translation files`
`52`	`52`	`$finder = new Finder();`
`53`		`- $files = $finder->files()->name('*.'.$catalogue->getLocale().'.'.$format)->in($directory);`
	`53`	`+ $extension = $catalogue->getLocale().'.'.$format;`
	`54`	`+ $files = $finder->files()->name('*.'.$extension)->in($directory);`
`54`	`55`	`foreach ($files as $file) {`
`55`		`- $domain = substr($file->getFileName(), 0, strrpos($file->getFileName(), $catalogue->getLocale().$format) - 1);`
	`56`	`+ $domain = substr($file->getFileName(), 0, -1 * strlen($extension) - 1);`
`56`	`57`	`$catalogue->addCatalogue($loader->load($file->getPathname(), $catalogue->getLocale(), $domain));`
`57`	`58`	`}`
`58`	`59`	`}`