removed duplication in FileLoader and MessagesCatalogue::getAvailable…

…Languages()
nexendrie · Nov 25, 2016 · f419088 · f419088
1 parent 3cc5b07
commit f419088
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Loaders/FileLoader.php b/src/Loaders/FileLoader.php
@@ -214,7 +214,8 @@ function getAvailableLanguages() {
     $files = Finder::findFiles("*.$extension")->from($this->folders);
     /** @var \SplFileInfo $file */
     foreach($files as $file) {
-      $lang = substr($file->getBasename(".$extension"), strpos($file->getBasename(), ".") + 1);
+      $filename = $file->getBasename(".$extension");
+      $lang = substr($filename, strpos($filename, ".") + 1);
       if(!in_array($lang, $languages)) {
         $languages[] = $lang;
       }

diff --git a/src/Loaders/MessagesCatalogue.php b/src/Loaders/MessagesCatalogue.php
@@ -57,7 +57,8 @@ function getAvailableLanguages() {
     $files = Finder::findFiles("catalogue.*.$extension")->from($this->folders);
     /** @var \SplFileInfo $file */
     foreach($files as $file) {
-      $lang = substr($file->getBasename(".$extension"), strpos($file->getBasename(), ".") + 1);
+      $filename = $file->getBasename(".$extension");
+      $lang = substr($filename, strpos($filename, ".") + 1);
       if(!in_array($lang, $languages)) {
         $languages[] = $lang;
       }