Fixed issue: survey language not initiated in session

LimeSurvey · Jun 14, 2016 · 573d104 · 573d104
1 parent 2b72e71
commit 573d104
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/application/core/LSYii_Application.php b/application/core/LSYii_Application.php
@@ -80,6 +80,10 @@ public function initLanguage()
         {
             $this->setLanguage($this->request->getParam('lang'));
         }
+        elseif (isset(App()->session['_lang']))                                 // See: http://www.yiiframework.com/wiki/26/setting-and-maintaining-the-language-in-application-i18n/
+        {
+            $this->setLanguage(App()->session['_lang']);
+        }
 
     }
     /**
@@ -182,6 +186,7 @@ public function setLanguage( $sLanguage )
     {
         $sLanguage=preg_replace('/[^a-z0-9-]/i', '', $sLanguage);
         $this->messages->catalog = $sLanguage;
+        App()->session['_lang'] = $sLanguage;                                   // See: http://www.yiiframework.com/wiki/26/setting-and-maintaining-the-language-in-application-i18n/
         parent::setLanguage($sLanguage);
     }