Support new installers location. Avoid infinite loop in translator. Fix

#363 (#364)
hechoendrupal · Aug 20, 2019 · cf7a95f · cf7a95f
1 parent 5134178
commit cf7a95f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/src/Utils/DrupalFinder.php b/src/Utils/DrupalFinder.php
@@ -78,6 +78,12 @@ protected function defineConstants($vendorDir)
                 "/{$vendorDir}/drupal/console-%s/translations/"
             );
         }
+      if (!defined("DRUPAL_CONSOLE_LANGUAGE_INSTALLERS")) {
+        define(
+          "DRUPAL_CONSOLE_LANGUAGE_INSTALLERS",
+          "/console/language/console-%s/translations/"
+        );
+      }
 
         if (!defined("DRUPAL_CONSOLE_LIBRARY")) {
             define(

diff --git a/src/Utils/TranslatorManager.php b/src/Utils/TranslatorManager.php
@@ -109,16 +109,32 @@ private function buildCoreLanguageDirectory(
                 DRUPAL_CONSOLE_LANGUAGE,
                 $language
             );
+        $installersLanguageDirectory =
+          $directoryRoot .
+          sprintf(
+            DRUPAL_CONSOLE_LANGUAGE_INSTALLERS,
+            $language
+          );
+
+        $languageDirectory = null;
+        foreach ([$coreLanguageDirectory, $installersLanguageDirectory] as $candidate) {
+            if (is_dir($candidate)) {
+              $languageDirectory = $candidate;
+            }
+        }
 
-        if (!is_dir($coreLanguageDirectory)) {
+        if (!isset($languageDirectory)) {
+            if ($language == 'en') {
+              throw new \Exception('No languages found. Make sure you have installed a console language package in a supported directory');
+            }
             return $this->buildCoreLanguageDirectory('en', $directoryRoot);
         }
 
         if (!$this->coreLanguageRoot) {
             $this->coreLanguageRoot = $directoryRoot;
         }
 
-        return [$language, $coreLanguageDirectory];
+        return [$language, $languageDirectory];
     }
 
     /**