Merge branch 'Core-fix_translations' into develop

cross-solution · Jan 30, 2018 · 6bec98b · 6bec98b
2 parents f1d4a7a + e68147d
commit 6bec98b
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -61,7 +61,8 @@
         "imagine/imagine": "*",
         "zendframework/zend-progressbar": "^2.5",
         "zendframework/zend-math": "^3.0",
-        "zendframework/zend-captcha": "^2.7"
+        "zendframework/zend-captcha": "^2.7",
+        "zendframework/zend-i18n-resources": "^2.5"
     },
     "require-dev": {
         "cbleek/pecl-solr-hint": "dev-master",

diff --git a/composer.lock b/composer.lock
diff --git a/module/Core/config/module.config.php b/module/Core/config/module.config.php
@@ -13,6 +13,7 @@
  */
 namespace Core;
 
+use Zend\I18n\Translator\Resources;
 use Zend\ServiceManager\Factory\InvokableFactory;
 
 $doctrineConfig = include __DIR__ . '/doctrine.config.php';
@@ -204,7 +205,6 @@
             'Core/Listener/DeferredListenerAggregate' => [\Core\Listener\DeferredListenerAggregate::class,'factory'],
             'Core/Listener/CreatePaginator' => 'Core\Listener\CreatePaginatorListener::factory',
             'Core/Locale' => 'Core\I18n\LocaleFactory',
-            'mvctranslator' => \Zend\Mvc\I18n\TranslatorFactory::class,
             \Core\Listener\AjaxRouteListener::class => \Core\Factory\Listener\AjaxRouteListenerFactory::class,
             \Core\Listener\DeleteImageSetListener::class => \Core\Factory\Listener\DeleteImageSetListenerFactory::class,
             'Imagine' => \Core\Factory\Service\ImagineFactory::class,
@@ -217,7 +217,8 @@
         'aliases' => array(
             'forms' => 'FormElementManager',
             'repositories' => 'Core/RepositoryService',
-            'translator' => 'mvctranslator',
+            'mvctranslator' => 'MvcTranslator',
+            'translator' => 'MvcTranslator',
         ),
         'shared' => array(
             'Core/Listener/DeferredListenerAggregate' => false,
@@ -235,13 +236,13 @@
             ],
             [
                 'type'     => 'phparray',
-                'base_dir' => __DIR__ . '/../language',
-                'pattern' => 'Zend_Validate.%s.php',
+                'base_dir' => Resources::getBasePath(),
+                'pattern'  => Resources::getPatternForValidator(),
             ],
             [
                 'type'     => 'phparray',
-                'base_dir' => __DIR__ . '/../language',
-                'pattern' => 'Zend_Captcha.%s.php',
+                'base_dir' => Resources::getBasePath(),
+                'pattern' => Resources::getPatternForCaptcha(),
             ]
         ),
     ),

diff --git a/module/Core/src/Core/Listener/LanguageRouteListener.php b/module/Core/src/Core/Listener/LanguageRouteListener.php
@@ -224,6 +224,7 @@ protected function setLocale(MvcEvent $e, $lang)
         Locale::setDefault($locale);
 
         $translator->setLocale($locale);
+        $translator->setFallbackLocale(substr($locale, 0, 2));
         $routeMatch = $e->getRouteMatch();
         if ($routeMatch && $routeMatch->getParam('lang') === null) {
             $routeMatch->setParam('lang', $lang);