Fix error preventing to translate backoffice wordings when using a theme other than classic

src/PrestaShopBundle/Controller/Api/TranslationController.php

@@ -67,7 +67,7 @@ public function listDomainTranslationAction(Request $request)
 
             $locale = $request->attributes->get('locale');
             $domain = $request->attributes->get('domain');
-            $theme = $request->attributes->get('theme', $this->getSelectedTheme());
+            $theme = $request->attributes->get('theme');
             $module = $request->query->get('module');
             $search = $request->query->get('search');
 
@@ -171,7 +171,7 @@ public function translationEditAction(Request $request)
             $response = [];
             foreach ($translations as $translation) {
                 if (empty($translation['theme'])) {
-                    $translation['theme'] = $this->getSelectedTheme();
+                    $translation['theme'] = null;
                 }
 
                 try {
@@ -314,8 +314,8 @@ protected function guardAgainstInvalidTranslationResetRequest($content)
      */
     private function getNormalTree($lang, $type, $selected, $search = null)
     {
-        $treeBuilder = new TreeBuilder($this->translationService->langToLocale($lang), $this->getSelectedTheme());
-        $catalogue = $this->translationService->getTranslationsCatalogue($lang, $type, $this->getSelectedTheme(), $search);
+        $treeBuilder = new TreeBuilder($this->translationService->langToLocale($lang), $selected);
+        $catalogue = $this->translationService->getTranslationsCatalogue($lang, $type, $selected, $search);
 
         return $this->getCleanTree($treeBuilder, $catalogue, $type, $selected, $search);
     }

src/PrestaShopBundle/Service/TranslationService.php

@@ -30,6 +30,7 @@
 use PrestaShopBundle\Entity\Translation;
 use PrestaShopBundle\Translation\Constraints\PassVsprintf;
 use PrestaShopBundle\Translation\Provider\UseModuleInterface;
+use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\Validator\Validation;
 
 class TranslationService
@@ -111,20 +112,17 @@ public function getTranslationsCatalogue($lang, $type, $selected, $search = null
     {
         $factory = $this->container->get('ps.translations_factory');
 
-        if ($selected !== 'classic' && $this->requiresThemeTranslationsFactory($selected, $type)) {
-            $factory = $this->container->get('ps.theme_translations_factory');
-        }
-
-        $locale = $this->langToLocale($lang);
-
         if ($this->requiresThemeTranslationsFactory($selected, $type)) {
             if ('classic' === $selected) {
                 $type = 'front';
             } else {
                 $type = $selected;
+                $factory = $this->container->get('ps.theme_translations_factory');
             }
         }
 
+        $locale = $this->langToLocale($lang);
+
         return $factory->createTranslationsArray($type, $locale, $selected, $search);
     }
 

src/PrestaShopBundle/Translation/Loader/DatabaseTranslationLoader.php

@@ -28,6 +28,9 @@
 namespace PrestaShopBundle\Translation\Loader;
 
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\QueryBuilder;
+use PrestaShopBundle\Entity\Lang;
+use PrestaShopBundle\Entity\Translation;
 use Symfony\Component\Translation\Loader\LoaderInterface;
 use Symfony\Component\Translation\MessageCatalogue;
 
@@ -52,6 +55,13 @@ public function __construct(EntityManagerInterface $entityManager)
     public function load($resource, $locale, $domain = 'messages', $theme = null)
     {
         static $langs = array();
+        $catalogue = new MessageCatalogue($locale);
+
+        // do not try and load translations for a locale that cannot be saved to DB anyway
+        if ($locale === 'default') {
+            return $catalogue;
+        }
+
         if (!array_key_exists($locale, $langs)) {
             $langs[$locale] = $this->entityManager
                 ->getRepository('PrestaShopBundle:Lang')
@@ -61,33 +71,60 @@ public function load($resource, $locale, $domain = 'messages', $theme = null)
         $translationRepository = $this->entityManager
             ->getRepository('PrestaShopBundle:Translation');
 
-        $queryBuilder = $translationRepository
-            ->createQueryBuilder('t')
-            ->where('t.lang =:lang')
-            ->setParameter('lang', $langs[$locale]);
+        $queryBuilder = $translationRepository->createQueryBuilder('t');
 
-        if (null !== $theme) {
-            $queryBuilder
-                ->andWhere('t.theme = :theme')
-                ->setParameter('theme', $theme);
-        } else {
-            $queryBuilder->andWhere('t.theme IS NULL');
-        }
+        $this->addLangConstraint($queryBuilder, $langs[$locale]);
 
-        if ($domain !== '*') {
-            $queryBuilder->andWhere('REGEXP(t.domain, :domain) = true')
-                ->setParameter('domain', $domain);
-        }
+        $this->addThemeConstraint($queryBuilder, $theme);
 
-        $translations = $queryBuilder->getQuery()
-            ->getResult();
+        $this->addDomainConstraint($queryBuilder, $domain);
 
-        $catalogue = new MessageCatalogue($locale);
+        $translations = $queryBuilder
+            ->getQuery()
+            ->getResult();
 
+        /** @var Translation $translation */
         foreach ($translations as $translation) {
             $catalogue->set($translation->getKey(), $translation->getTranslation(), $translation->getDomain());
         }
 
         return $catalogue;
     }
+
+    /**
+     * @param QueryBuilder $queryBuilder
+     * @param Lang $currentLang
+     */
+    private function addLangConstraint(QueryBuilder $queryBuilder, Lang $currentLang)
+    {
+        $queryBuilder->andWhere('t.lang =:lang')
+            ->setParameter('lang', $currentLang);
+    }
+
+    /**
+     * @param QueryBuilder $queryBuilder
+     * @param string|null $theme
+     */
+    private function addThemeConstraint(QueryBuilder $queryBuilder, $theme)
+    {
+        if (null === $theme) {
+            $queryBuilder->andWhere('t.theme IS NULL');
+        } else {
+            $queryBuilder
+                ->andWhere('t.theme = :theme')
+                ->setParameter('theme', $theme);
+        }
+    }
+
+    /**
+     * @param QueryBuilder $queryBuilder
+     * @param string $domain
+     */
+    private function addDomainConstraint(QueryBuilder $queryBuilder, $domain)
+    {
+        if ($domain !== '*') {
+            $queryBuilder->andWhere('REGEXP(t.domain, :domain) = true')
+                ->setParameter('domain', $domain);
+        }
+    }
 }