Fixed issue #6329: Language titles in language switcher are displayed…

… in the currently used language instead of the native name
LimeSurvey · Jul 18, 2012 · de48de6 · de48de6
1 parent c52ca41
commit de48de6
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/application/helpers/frontend_helper.php b/application/helpers/frontend_helper.php
@@ -209,6 +209,9 @@ function makeLanguageChangerSurvey($sSelectedLanguage)
 
         $slangs = Survey::model()->findByPk($surveyid)->getAdditionalLanguages();
         $slangs[]= GetBaseLanguageFromSurveyID($surveyid);
+        $aAllLanguages=getLanguageData();
+        $slangs=array_keys(array_intersect_key($aAllLanguages,array_flip($slangs))); // Sort languages by their locale name
+
         if (count($slangs)>1) // return a dropdow only of there are more than one lanagage
         {
             $previewgrp = false;
@@ -229,7 +232,8 @@ function makeLanguageChangerSurvey($sSelectedLanguage)
                 {
                     $sHTMLCode .=" selected='selected'";
                 }
-                $sHTMLCode .=">".getLanguageNameFromCode($sLanguage,false,$sLanguage)." - ".getLanguageNameFromCode($sLanguage,false,$sSelectedLanguage)."</option>\n";
+                $htmlcode .= ">".$aAllLanguages[$sLanguage]['nativedescription']."</option>\n";
+
             }
             $sHTMLCode .= "</select>\n";
             return $sHTMLCode;