Revision: 12233
http://limesurvey.svn.sourceforge.net/limesurvey/?rev=12233&view=rev
Author: c_schmitz
Date: 2012-01-27 17:03:15 +0000 (Fri, 27 Jan 2012)
Log Message:
-----------
More fixes for language selection - Native language is now shown first in language selection box
Modified Paths:
--------------
source/limesurvey_yii/application/helpers/frontend_helper.php
Modified: source/limesurvey_yii/application/helpers/frontend_helper.php
===================================================================
--- source/limesurvey_yii/application/helpers/frontend_helper.php 2012-01-27 17:02:12 UTC (rev 12232)
+++ source/limesurvey_yii/application/helpers/frontend_helper.php 2012-01-27 17:03:15 UTC (rev 12233)
@@ -205,6 +205,11 @@
return $graph;
}
+ /**
+ * This function creates the language selector for a particular survey
+ *
+ * @param mixed $sSelectedLanguage The language in which all information is shown
+ */
function makeLanguageChangerSurvey($sSelectedLanguage)
{
$surveyid = Yii::app()->getConfig('surveyID');
@@ -226,20 +231,18 @@
}
foreach ($slangs as $sLanguage)
{
- $htmlcode .= "<option value=\"{$sTargetURL}?sid=". $surveyid ."&lang=". $sLanguage ."{$sAddToURL}\" ";
+ $sHTMLCode .= "<option value=\"{$sTargetURL}?sid=". $surveyid ."&lang=". $sLanguage ."{$sAddToURL}\" ";
if ($sLanguage==$sSelectedLanguage)
{
- $htmlcode .=" selected='selected'";
+ $sHTMLCode .=" selected='selected'";
}
- $htmlcode .=">".getLanguageNameFromCode($sLanguage,false)."</option>\n";
+ $sHTMLCode .=">".getLanguageNameFromCode($sLanguage,false)."</option>\n";
}
+ $sHTMLCode .= "</select>\n";
+ return $sHTMLCode;
- $htmlcode .= "</select>\n";
-
- return $htmlcode;
-
}
/**
@@ -256,7 +259,7 @@
if($sLanguageID == $sSelectedLanguage)
{
$sHTMLCode .= " selected='selected' ";
- $sHTMLCode .= ">{$aLanguageProperties['description']}</option>\n";
+ $sHTMLCode .= ">{$aLanguageProperties['nativedescription']}</option>\n";
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|