gettext-changes.

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/phpsurveyor@1803 b72ed6b6-b9f8-46b5-92b4-906544132732

admin/dataentry.php

@@ -80,7 +80,7 @@
 
 if ($action == "edit" || $action == "" || $action == "editsaved")
 	{
-	loadPublicLangFile($surveyid);
+	GetLanguageFromSurveyID($surveyid);
 	}	
 
 if ($action == "insert")
@@ -93,7 +93,7 @@
 	if (isset($_POST['save']) && $_POST['save'] == "on")
 		{
 	    //Save this, don't submit to final response table
-		loadPublicLangFile($surveyid);
+		GetLanguageFromSurveyID($surveyid);
 		$saver['identifier']=returnglobal('save_identifier');
 		$saver['password']=returnglobal('save_password');
 		$saver['passwordconfirm']=returnglobal('save_confirmpassword');
@@ -1336,7 +1336,7 @@ function saveshow(value)
 		.$surveyoptions
 		."</table>";
 
-	loadPublicLangFile($surveyid);
+	GetLanguageFromSurveyID($surveyid);
 	$thissurvey=getSurveyInfo($surveyid);
 	$surveytable = "{$dbprefix}survey_$surveyid";
 

admin/export.php

@@ -332,6 +332,7 @@
 $query = "SELECT language FROM {$dbprefix}surveys WHERE sid=$surveyid";
 $result = db_execute_assoc($query);
 while ($row=$result->FetchRow()) {$surveylanguage = $row['language'];}
+
 bindtextdomain($surveylanguage, dirname(__FILE__).'/locale');
 textdomain($surveylanguage);
 

admin/html.php

@@ -103,7 +103,7 @@
   	foreach (getlanguagedata() as $langkey=>$languagekind)
 	{
     	$cssummary .= "\t\t\t\t<option value='$langkey'";
-		if ($langkey == $currentlang) {$cssummary .= " selected";}
+		if ($langkey == $_SESSION['adminlang']) {$cssummary .= " selected";}
 		$cssummary .= ">".$languagekind['description']."</option>\n";
 	}
 	$cssummary .= "\t\t\t</select>\n"
@@ -466,7 +466,7 @@
 						. "\t\t<td>$setfont {$s1row['template']}</font></td></tr>\n"
 						. "\t<tr $showstyle id='surveydetails8'><td align='right' valign='top'>$setfont<strong>"
 						. _("Language:")."</strong></font></td>\n";
-		if (!$s1row['language']) {$language=$currentlang;} else {$language=$s1row['language'];}
+		if (!$s1row['language']) {$language=$currentadminlang;} else {$language=$s1row['language'];}
 		if ($s1row['urldescrip']==""){$s1row['urldescrip']=$s1row['url'];}
 		$surveysummary .= "\t\t<td>$setfont$language</font></td></tr>\n"
 						. "\t<tr $showstyle id='surveydetails9'><td align='right' valign='top'>$setfont<strong>"
@@ -1801,7 +1801,7 @@
     		$editsurvey .= "\t\t\t<option value='".$langkey2."'";
 			if ($esrow['language'] && $esrow['language'] == htmlspecialchars($langname['description'])) {$editsurvey .= " selected";}
              // if language has been renamed then default to DefaultLanguage
-			if (!$esrow['language'] && $currentlang && $currentlang == $langname) {$editsurvey .= " selected";}
+			if (!$esrow['language'] && $currentadminlang && $currentadminlang == $langname) {$editsurvey .= " selected";}
 			$editsurvey .= ">".$langname['description']."</option>\n";
 	    }
 		$editsurvey .= "\t\t</select></td>\n"
@@ -2004,7 +2004,7 @@
 	    foreach ($languages as  $langkey2=>$langname)
             {
 	   	    $newsurvey .= "\t\t\t<option value='".$langkey2."'";
-    //		if ($currentlang && $currentlang == $langname) {$newsurvey .= " selected";}
+    //		if ($currentadminlang && $currentadminlang == $langname) {$newsurvey .= " selected";}
 	       	$newsurvey .= ">".$langname['description']."</option>\n";
             }
 		}

admin/navigator.php

@@ -1188,7 +1188,7 @@ function showPreview($surveyid, $gid, $qid=null) {
 	if ($qid !== null) {
 	    $thisquestion=getQuestionInfo($qid);
 	}
-	loadPublicLangFile($surveyid);
+	GetLanguageFromSurveyID($surveyid);
 	$ia=array($qid, 
 			  "DUMMY", 
 			  $thisquestion['title'], 
@@ -1271,7 +1271,7 @@ function showPreview($surveyid, $gid, $qid=null) {
 
 function checkSettings($dbprefix) {
 	//GET NUMBER OF SURVEYS
-	global $currentlang, $databasename, $currentlang, $scriptname, $homeurl, $imagefiles, $connect;
+	global $currentadminlang, $databasename, $currentadminlang, $scriptname, $homeurl, $imagefiles, $connect;
 
 	$query = "SELECT sid FROM {$dbprefix}surveys";
 	$result = $connect->Execute($query);
@@ -1318,7 +1318,7 @@ function checkSettings($dbprefix) {
 				 </tr>
 				 <tr>
 				  <td align='right'><strong>"._("Default Language").":</strong></td>
-				  <td>$currentlang</td>
+				  <td>$currentadminlang</td>
 				 </tr>
 				 <tr>
 				  <td align='right'><strong>"._("Current Language").":</strong></td>
@@ -1327,7 +1327,7 @@ function checkSettings($dbprefix) {
 				   <select name='lang' onChange='form.submit()'>\n";
 	foreach (getadminlanguages() as $language)
 		{
-		echo "\t\t\t\t<option value='$language'".autoComparitor($currentlang, $language, " selected").">$language</option>\n";
+		echo "\t\t\t\t<option value='$language'".autoComparitor($currentadminlang, $language, " selected").">$language</option>\n";
 		}
 	echo  "			</select>
 				<input type='hidden' name='action' value='changelang'></td>

admin/printablesurvey.php

@@ -50,7 +50,7 @@
 if (!is_dir($thistpl)) {$thistpl=$tpldir."/default";}
 $langdir="$publicdir/lang";
 $langfilename="$langdir/$surveylanguage.lang.php";
-if (!is_file($langfilename)) {$langfilename="$langdir/$currentlang.lang.php";}
+if (!is_file($langfilename)) {$langfilename="$langdir/$currentadminlang.lang.php";}
 require($langfilename);	
 
 sendcacheheaders();

admin/results.php

@@ -327,7 +327,7 @@ function giveMeRawDataFromFieldNames($surveyid, $gid, $qid, $fieldlimiters=array
 	}
 //	echo "[$questiontype]<br />";
 	if ($output == "full") {
-		loadPublicLangFile($surveyid);
+		GetLanguageFromSurveyID($surveyid);
 		//echo "<pre>"; print_r($answers); echo "</pre>";
 		switch($questiontype) {
 			case "L":

admin/sessioncontrol.php

@@ -40,11 +40,16 @@
 session_name("PHPSurveyorAdmin");
 session_start();
 
+
+
 //LANGUAGE ISSUES
 if (returnglobal('action') == "changelang") 
 	{
-	$_SESSION['lang']=returnglobal('lang');
+    $_SESSION['adminlang']=SetInterfaceLanguage(returnglobal('lang'));
 	}
-//CHANGE LANGUAGE IF SESSION LANG DOESN'T MATCH DEFAULT LANG
-if (isset($_SESSION['lang'])) {$currentlang=$_SESSION['lang'];}
-?>
+	elseif (!isset($_SESSION['adminlang']) || $_SESSION['adminlang']=='' )
+	{
+        $_SESSION['adminlang']=SetInterfaceLanguage($defaultlang);
+    }
+
+?>

admin/statistics.php

@@ -112,7 +112,7 @@ function show(element) {
 while ($row=$result->FetchRow()) {$surveylanguage = $row['language']; $datestamp=$row['datestamp'];}
 $langdir="$publicdir/lang";
 $langfilename="$langdir/$surveylanguage.lang.php";
-if (!is_file($langfilename)) {$langfilename="$langdir/$currentlang.lang.php";}
+if (!is_file($langfilename)) {$langfilename="$langdir/$currentadminlang.lang.php";}
 require($langfilename); 
 
 // 1: Get list of questions from survey

admin/templates.php

@@ -657,7 +657,7 @@ function doreplacement($file) { //Produce sample page from template file
 	fwrite($fnew, $line);
 }
 fclose($fnew);
-$langdir_template="$homeurl/lang/$currentlang";
+$langdir_template="$homeurl/lang/$currentadminlang";
 echo "<br />\n"
 	."<iframe src='$tempurl/template_temp_$time.html' width='95%' height='400' name='sample' style='background-color: white'>Embedded Frame</iframe>\n"
 	."<br />&nbsp;<br />"

admin/vvexport.php

@@ -83,7 +83,7 @@
     $fieldmap=createFieldMap($surveyid, "full");
     $surveytable = "{$dbprefix}survey_$surveyid";
 
-    loadPublicLangFile($surveyid);
+    GetLanguageFromSurveyID($surveyid);
 
     $fieldnames = array_values($connect->MetaColumnNames($surveytable, true));
 

common.php

@@ -131,7 +131,7 @@
 //SET LANGUAGE DIRECTORY
 if ($sourcefrom == "admin")
     {
-    $langdir="$publicurl/locale/$currentlang/help";
+    $langdir="$publicurl/locale/".$_SESSION['adminlang']."/help";
     if (!is_dir($langdir))
         {
         $langdir="$publicurl/locale/en/help"; //default to english if there is no matching language dir
@@ -988,9 +988,9 @@ function sendcacheheaders()
     {
     global $embedded;
     if ( $embedded ) return;
-    global $currentlang, $thissurvey;
+    global $currentadminlang, $thissurvey;
     if (isset($thissurvey['language'])) {$language=$thissurvey['language'];}
-    else {$language=$currentlang;} //$thissurvey['language'] will exist if this is a public survey
+    else {$language=$currentadminlang;} //$thissurvey['language'] will exist if this is a public survey
     header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");    // Date in the past
     header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");  // always modified
     header("Cache-Control: no-store, no-cache, must-revalidate");  // HTTP/1.1
@@ -1204,7 +1204,7 @@ function createFieldMap($surveyid, $style="null") {
     //This function generates an array containing the fieldcode, and matching data in the same
     //order as the activate script
     global $dbprefix, $connect;
-    loadPublicLangFile($surveyid);
+    GetLanguageFromSurveyID($surveyid);
     //Check for any additional fields for this survey and create necessary fields (token and datestamp and ipaddr)
     $pquery = "SELECT private, datestamp, ipaddr, refurl FROM ".db_table_name('surveys')." WHERE sid=$surveyid";
     $presult=db_execute_assoc($pquery);
@@ -1687,16 +1687,24 @@ function getSavedCount($surveyid)
     return $count;
     }
 
-function loadPublicLangFile($surveyid)
+function GetLanguageFromSurveyID($surveyid)
     {
     global $connect;
     //This function loads the local language file applicable to a survey
-        global $dbprefix, $publicdir, $currentlang;
         $query = "SELECT language FROM ".db_table_name('surveys')." WHERE sid=$surveyid";
         $result = db_execute_num($query) or die ("Couldn't get language file");
         while ($row=$result->FetchRow()) {$surveylanguage = $row[0];}
+        return $surveylanguage;
     }
 
+function SetInterfaceLanguage($languagetoset)
+    {
+    bindtextdomain($languagetoset, dirname(__FILE__).'/locale');
+    textdomain($languagetoset);
+    return $languagetoset;
+    }
+
+
 function buildLabelsetCSArray()
     {
     global $dbprefix, $connect;

config.php

@@ -89,7 +89,7 @@
                                           // Only applicable, of course, if you have chosen "R" for $dropdowns and/or $lwcdropdowns
 $repeatheadings     =   "25";             // The number of answers to show before repeating the headings in array (flexible) questions. Set to 0 to turn this feature off
 $minrepeatheadings  =   3;                // The minimum number of remaing answers that are required before repeating the headings in array (flexible) questions.
-$defaultlang        =   "de";        // The default language to use - the available languages are the directory names in the /locale dir - for example de = German
+$defaultlang        =   "de";             // The default language to use - the available languages are the directory names in the /locale dir - for example de = German
 
 $OS                 =   PHP_OS;
 

index.php

@@ -76,14 +76,25 @@
 	doFooter();
 	exit;
 	}
+
+
 //Check to see if a refering URL has been captured.
 getreferringurl();
 
 if (!isset($token)) {$token=trim(returnglobal('token'));}
 //GET BASIC INFORMATION ABOUT THIS SURVEY
 $thissurvey=getSurveyInfo($surveyid);
+
 if (is_array($thissurvey)) {$surveyexists=1;} else {$surveyexists=0;}
 
+// Check if the current survey language is set - if not set it
+// this way it can be changed later (for example by a special question type)
+if (!isset($_SESSION['publiclang']) || ($_SESSION['publiclang']==''))
+  {
+    $_SESSION['publiclang']=SetInterfaceLanguage(GetLanguageFromSurveyID($surveyid));
+  }
+
+
 //SEE IF SURVEY USES TOKENS
 $i = 0; $tokensexist = 0;
 $tablelist = $connect->MetaTables() or die ("Error getting tokens<br />".htmlspecialchars($connect->ErrorMsg()));
@@ -92,14 +103,12 @@
 	if ($tbl == "{$dbprefix}tokens_$surveyid") {$tokensexist = 1;}
 	}
 
+
+
 //SET THE TEMPLATE DIRECTORY
 if (!$thissurvey['templatedir']) {$thistpl=$tpldir."/default";} else {$thistpl=$tpldir."/{$thissurvey['templatedir']}";}
 if (!is_dir($thistpl)) {$thistpl=$tpldir."/default";}
 
-//Set the appropiate language settings for gettext
-
-bindtextdomain($thissurvey['language'], dirname(__FILE__).'/locale');
-textdomain($thissurvey['language']);
 
 
 //MAKE SURE SURVEY HASN'T EXPIRED
@@ -321,6 +330,7 @@
 // --> END NEW FEATURE - SAVE
 
 
+
 sendcacheheaders();
 //CALL APPROPRIATE SCRIPT
 switch ($thissurvey['format'])
@@ -1003,15 +1013,12 @@ function submittokens()
 		else
 			{
 			//Get the default email_confirm from the default admin lang file
-			global $currentlang, $homedir, $homeurl;
-			$langdir="$homeurl/lang/$currentlang";
-			$langdir2="$homedir/lang/$currentlang";
+			global $currentadminlang, $homedir, $homeurl;
+			$langdir="$homeurl/lang/$currentadminlang";
 			if (!is_dir($langdir2)) 
 				{
 				$langdir="$homeurl/lang/english"; //default to english if there is no matching language dir
-				$langdir2="$homedir/lang/english";
 				}
-			require("$langdir2/messages.php");
 			$message = _("Dear {FIRSTNAME},\n\nThis email is to confirm that you have completed the survey titled {SURVEYNAME} and your response has been saved. Thank you for participating.\n\nIf you have any further questions about this email, please contact {ADMINNAME} on {ADMINEMAIL}.\n\nSincerely,\n\n{ADMINNAME}");
 			}
 

locale/de/help/admin.html

@@ -32,7 +32,7 @@
   <tbody>
     <tr>
       <td valign="top"><small><small> <font face="Verdana"><img
- src="../../images/home.gif" border="0" height="20" width="20"> </font>
+ src="../../../images/home.png" border="0" height="20" width="20"> </font>
       </small></small></td>
       <td valign="top"><small><small> <strong><font face="Verdana">Hauptseite:</font></strong><font
  face="Verdana"> Klicken Sie
@@ -42,7 +42,7 @@
     </tr>
     <tr>
       <td valign="top"><small><small> <font face="Verdana"><img
- src="../../images/security.gif" border="0" height="20" width="20"> </font>
+ src="../../../images/security.png" border="0" height="20" width="20"> </font>
       </small></small></td>
       <td valign="top"><small><small> <span
  style="font-family: verdana; font-weight: bold;">Sicherheit:</span><font
@@ -51,7 +51,7 @@
     </tr>
     <tr>
       <td valign="top"><small><small> <font face="Verdana"><img
- src="../../images/badsecurity.gif" border="0" height="20" width="20"> </font>
+ src="../../../images/badsecurity.png" border="0" height="20" width="20"> </font>
       </small></small></td>
       <td valign="top"><small><small>&nbsp;<span
  style="font-family: verdana;"><span style="font-weight: bold;">Keine
@@ -62,7 +62,7 @@
     </tr>
     <tr>
       <td valign="top"><small><small> <font face="Verdana"><img
- src="../../images/checkdb.gif" border="0" height="20" width="20"> </font>
+ src="../../../images/checkdb.png" border="0" height="20" width="20"> </font>
       </small></small></td>
       <td valign="top"><small><small> <font style="font-weight: bold;"
  face="Verdana">Datenbank
@@ -73,7 +73,7 @@
     </tr>
     <tr>
       <td valign="top"><small><small> <font face="Verdana"><img
- src="../../images/labels.gif" border="0" height="20" width="20"> </font>
+ src="../../../images/labels.png" border="0" height="20" width="20"> </font>
       </small></small></td>
       <td valign="top"><small><small> <font style="font-weight: bold;"
  face="Verdana">Beschriftungssets
@@ -85,7 +85,7 @@
     </tr>
     <tr>
       <td valign="top"><small><small> <font face="Verdana"><img
- src="../../images/add.gif" border="0" height="20" width="20"> </font>
+ src="../../../images/add.png" border="0" height="20" width="20"> </font>
       </small></small></td>
       <td valign="top"><small><small> <font style="font-weight: bold;"
  face="Verdana">Umfrage
@@ -103,7 +103,7 @@
 <br>
 <br>
 <u><strong><a name="Adding a New Survey">Umfrage hinzuf&uuml;gen</a></strong></u><br>
-Klicken Sie auf <img src="../../images/add.gif" border="0" height="20"
+Klicken Sie auf <img src="../../../images/add.png" border="0" height="20"
  width="20">
 um eine neue Umfrage zu erzeugen oder zu importieren.</font> </small></small></p>
 <p><small><small> <font face="Verdana">In der nun folgenden Seite