Fixed issue #08573: Surveylist does not show translated survey titles

LimeSurvey · Jan 28, 2014 · 9c76331 · 9c76331
1 parent 4f5ebd6
commit 9c76331
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/application/controllers/SurveysController.php b/application/controllers/SurveysController.php
@@ -7,9 +7,14 @@ class SurveysController extends LSYii_Controller
     {
         public $layout = 'bare';
         public $defaultAction = 'publicList';
-        public function actionPublicList()
+        public function actionPublicList($lang = null)
         {
             $this->sessioncontrol();
+            if (isset($lang))
+            {
+                App()->setLang(new Limesurvey_lang($lang));
+            }
+
             $this->render('publicSurveyList', array(
                 'publicSurveys' => Survey::model()->active()->open()->public()->with('languagesettings')->findAll(),
                 'futureSurveys' => Survey::model()->active()->registration()->public()->with('languagesettings')->findAll(),

diff --git a/application/helpers/frontend_helper.php b/application/helpers/frontend_helper.php
@@ -302,7 +302,7 @@ function makeLanguageChanger($sSelectedLanguage)
             $aListLang[$sLangCode]=html_entity_decode($aLanguage['nativedescription'], ENT_COMPAT,'UTF-8').' - '.$aLanguage['description'];
         $sSelected=$sSelectedLanguage;
 
-        $sHTMLCode= CHtml::beginForm(Yii::app()->getController()->createUrl('survey/index'),'get');
+        $sHTMLCode= CHtml::beginForm(App()->createUrl('surveys/publiclist'),'get');
         //$sHTMLCode="<pre>".var_export($test,true)."</pre>";
         $sHTMLCode.= CHtml::dropDownList('lang', $sSelected,$aListLang,array('class'=>$sClass));
         //$sHTMLCode.= CHtml::htmlButton($clang->gT("Change the language"),array('type'=>'submit','id'=>"changelangbtn",'value'=>'changelang','name'=>'changelang','class'=>'jshide'));

diff --git a/application/models/Survey.php b/application/models/Survey.php
@@ -32,7 +32,6 @@ class Survey extends LSActiveRecord
      */
     public function getLocalizedTitle()
     {
-        return $this->languagesettings[$this->language]->surveyls_title;
         if (isset($this->languagesettings[App()->lang->langcode]))
         {
             return $this->languagesettings[App()->lang->langcode]->surveyls_title;

diff --git a/application/views/surveys/publicSurveyList.php b/application/views/surveys/publicSurveyList.php
@@ -38,11 +38,12 @@
     $data['templateurl'] = getTemplateURL(Yii::app()->getConfig("defaulttemplate"))."/";
     $data['templatename'] = Yii::app()->getConfig("defaulttemplate");
     $data['sitename'] = Yii::app()->getConfig("sitename");
-    $data['languagechanger'] = ""; //$languagechanger;
+    $data['languagechanger'] = makeLanguageChanger(App()->lang->langcode);
 
     //A nice exit
     sendCacheHeaders();
     doHeader();
+
     echo templatereplace(file_get_contents(getTemplatePath(Yii::app()->getConfig("defaulttemplate"))."/startpage.pstpl"),array(),$data,'survey['.__LINE__.']');
     echo templatereplace(file_get_contents(getTemplatePath(Yii::app()->getConfig("defaulttemplate"))."/surveylist.pstpl"),array(),$data,'survey['.__LINE__.']');
     echo templatereplace(file_get_contents(getTemplatePath(Yii::app()->getConfig("defaulttemplate"))."/endpage.pstpl"),array(),$data,'survey['.__LINE__.']');