test if request is an active scope in tra nslator

2013-11-04 14:47:18 +01:00
parent 3e681a7419
commit 6d1576faf8
1 changed files with 5 additions and 1 deletions
--- a/core/lib/Thelia/Core/Translation/Translator.php
+++ b/core/lib/Thelia/Core/Translation/Translator.php
@@ -40,7 +40,11 @@ class Translator extends BaseTranslator

    public function getLocale()
    {
-        return $this->container->get('request')->getSession()->getLang()->getLocale();
+        if($this->container->isScopeActive('request') && $this->container->has('request')) {
+            return $this->container->get('request')->getSession()->getLang()->getLocale();
+        }
+
+        return $this->locale;
    }

    /**