Dev: html_entity_decode on language to use default encode in select w…

…idget
LimeSurvey · Jan 21, 2015 · f86eca2 · f86eca2
1 parent 5cf7d64
commit f86eca2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/application/views/admin/globalSettings_view.php b/application/views/admin/globalSettings_view.php
@@ -627,7 +627,7 @@
             $aLanguages=array();
             foreach (getLanguageData(true) as  $sLanguage=>$aLanguage)
             {
-                $aLanguages[$sLanguage]=$aLanguage['nativedescription']." - ".$aLanguage['description'];
+                $aLanguages[$sLanguage]="{$aLanguage['description']} (".html_entity_decode($aLanguage['nativedescription'], ENT_NOQUOTES, 'UTF-8').")";
             }
             $aAvailableLang=getLanguageDataRestricted ();
             $this->widget('ext.SettingsWidget.SettingsWidget', array(
@@ -645,9 +645,6 @@
                         ),
                         'options'=>$aLanguages,
                         'current'=>getGlobalSetting('defaultlang'),
-                        'htmlOptions'=>array(
-                            'encode'=>false,
-                        ),
                     ),
                     'restrictToLanguages'=>array(
                         'type'=>'select',
@@ -656,7 +653,6 @@
                         'current'=>array_keys(getLanguageDataRestricted ()),
                         'htmlOptions'=>array(
                             'multiple'=>true,
-                            'encode'=>false,
                         ),
                         'selectOptions'=>array(
                             'width'=>'100%',

diff --git a/application/views/admin/survey/subview/tabGeneralEditSurvey_view.php b/application/views/admin/survey/subview/tabGeneralEditSurvey_view.php
@@ -4,7 +4,7 @@
     unset($aAvailableLang[$esrow['language']]);
     $aLang=array();
     foreach ($aAvailableLang as $lang => $aLanguage) {
-        $aLang[$lang]="{$aLanguage['description']} ({$aLanguage['nativedescription']})";
+        $aLang[$lang]="{$aLanguage['description']} (".html_entity_decode($aLanguage['nativedescription'], ENT_NOQUOTES, 'UTF-8').")";
     }
 
     $this->widget('ext.SettingsWidget.SettingsWidget', array(
@@ -40,7 +40,7 @@
                 'label'=>gT('Additional Languages'),
                 'htmlOptions'=>array(
                     'multiple'=>true,
-                    'encode'=>false,
+
                 ),
                 'options'=>$aLang,
                 'current'=>Survey::model()->findByPk($surveyid)->additionalLanguages,