Fixed issue: Relevane equation hints not translated

LimeSurvey · May 23, 2013 · 2501624 · 2501624 · Shnoulle · May 24, 2013
1 parent 0a72143
commit 2501624
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/application/controllers/AdminController.php b/application/controllers/AdminController.php
@@ -121,7 +121,8 @@ protected function _sessioncontrol()
         if (empty(Yii::app()->session['adminlang']))
             Yii::app()->session["adminlang"] = Yii::app()->getConfig("defaultlang");
 
-        $this->lang = new Limesurvey_lang(Yii::app()->session['adminlang']);
+        global $clang; // Needed so EM can localize equation hints until a better solution is found
+        $this->lang = $clang = new Limesurvey_lang(Yii::app()->session['adminlang']);
         Yii::app()->setLang($this->lang);
 
         if (!empty($this->user_id))

diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php
@@ -336,8 +336,6 @@ protected function _renderWrappedTemplate($sAction = '', $aViewUrls = array(), $
     function _questionbar($iSurveyID, $gid, $qid, $action = null)
     {
         $clang = $this->getController()->lang;
-
-
         $baselang = Survey::model()->findByPk($iSurveyID)->language;
 
         //Show Question Details