// just a check for travis

PrestaShop · Nov 20, 2019 · 7e19da9 · 7e19da9
1 parent a8b9006
commit 7e19da9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/classes/Context.php b/classes/Context.php
@@ -422,9 +422,7 @@ public function getTranslatorFromLocale($locale)
             (new Filesystem())->remove($cache_file);
         }
 
-        // only way to reset the catalogue
-        $translator->addLoader('Array', new ArrayLoader());
-        $translator->addResource('Array', [], $locale);
+        $translator->resetLocale($locale);
 
         $adminContext = defined('_PS_ADMIN_DIR_');
         $withDB = !$this->language instanceof PrestashopBundle\Install\Language;

diff --git a/src/PrestaShopBundle/Translation/PrestaShopTranslatorInterface.php b/src/PrestaShopBundle/Translation/PrestaShopTranslatorInterface.php
@@ -39,4 +39,9 @@ interface PrestaShopTranslatorInterface extends TranslatorInterface
      * @return bool
      */
     public function isCatalogLoaded($locale);
+
+    /**
+     * @param $locale
+     */
+    public function resetLocale($locale);
 }
diff --git a/src/PrestaShopBundle/Translation/PrestaShopTranslatorTrait.php b/src/PrestaShopBundle/Translation/PrestaShopTranslatorTrait.php
@@ -140,6 +140,15 @@ public function isCatalogLoaded($locale)
         return !empty($this->catalogues[$locale]);
     }
 
+    /**
+     * @param $locale
+     */
+    public function resetLocale($locale)
+    {
+        unset($this->catalogues[$locale]);
+        unset($this->resources[$locale]);
+    }
+
     /**
      * @param string $string
      *