Start of multi language answers....

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/phpsurveyor@2131 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Oct 31, 2006 · 405e95e · 405e95e
1 parent d442d99
commit 405e95e
Showing 1 changed file with 28 additions and 32 deletions.
diff --git a/admin/html.php b/admin/html.php
@@ -1109,38 +1109,33 @@
 	$sortorderids=''; 
 	$codeids='';
 
-	// Create each language tab
 	foreach ($anslangs as $anslang)
-	$cdquery = "SELECT * FROM ".db_table_name('answers')." WHERE qid=$qid AND language='".$anslang."' ORDER BY sortorder, answer";
-	$cdresult = db_execute_assoc($cdquery);
-	$anscount = $cdresult->RecordCount();
-	$position=0;
-	$vasummary .= '<div class="tab-page"> <h2 class="tab">'.getLanguageNameFromCode($anslang,false);
-	if ($anslang==GetBaseLanguageFromSurveyID($surveyid)) {$vasummary .= '('._('Base Language').')';}
-	$vasummary .= '</h2>';
-
-	while ($row = $cdresult->FetchRow())
 	{
-		$query = "SELECT * FROM ".db_table_name('answers')." WHERE qid='{$qid}' AND language='{$anslang}' ORDER BY sortorder, code";
+		$position=0;
+    	$query = "SELECT * FROM ".db_table_name('answers')." WHERE qid='{$qid}' AND language='{$anslang}' ORDER BY sortorder, code";
 		$result = db_execute_assoc($query) or die($connect->ErrorMsg());
 		$anscount = $result->RecordCount();
-		$vasummary .= "\t<table width='100%' style='border: solid; border-width: 0px; border-color: #555555' cellspacing='0'>\n"
-		."<thead align='center'>"
-		."<tr bgcolor='#BBBBBB'>\n"
-		."\t<td width='25%' align=right><strong><font size='1' face='verdana' >\n"
-		._("Code")
-		."\t</font></strong></td>\n"
-		."\t<td width='35%'><strong><font size='1' face='verdana'>\n"
-		._("Title")
-		."\t</font></strong></td>\n"
-		."\t<td width='25%'><strong><font size='1' face='verdana'>\n"
-		._("Action")
-		."\t</font></strong></td>\n"
-		."\t<td width='15%' align=center><strong><font size='1' face='verdana'>\n"
-		._("Order")
-		."\t</font></strong></td>\n"
-		."</tr></thead>"
-		."<tbody align='center'>";
+        $vasummary .= "<div class='tab-page'>"
+                ."<h2 class='tab'>".getLanguageNameFromCode($anslang);
+        if ($anslang==GetBaseLanguageFromSurveyID($surveyid)) {$vasummary .= '('._('Base Language').')';}
+
+        $vasummary .= "</h2>\t<table width='100%' style='border: solid; border-width: 0px; border-color: #555555' cellspacing='0'>\n"
+                ."<thead align='center'>"
+        		."<tr bgcolor='#BBBBBB'>\n"
+        		."\t<td width='25%' align=right><strong><font size='1' face='verdana' >\n"
+        		._("Code")
+        		."\t</font></strong></td>\n"
+        		."\t<td width='35%'><strong><font size='1' face='verdana'>\n"
+        		._("Title")
+        		."\t</font></strong></td>\n"
+        		."\t<td width='25%'><strong><font size='1' face='verdana'>\n"
+        		._("Action")
+        		."\t</font></strong></td>\n"
+        		."\t<td width='15%' align=center><strong><font size='1' face='verdana'>\n"
+        		._("Order")
+        		."\t</font></strong></td>\n"
+        		."</tr></thead>"
+                ."<tbody align='center'>";
 		while ($row=$result->FetchRow())
 		{
 			$row['code'] = htmlspecialchars($row['code']);
@@ -1150,7 +1145,7 @@
 			if ($first) {$codeids=$codeids.' '.$row['sortorder'];}
 			$vasummary .= "<tr><td width='25%' align=right>\n";
 
-			if ($activated == "Y")
+			if ($activated > 1)
 			{
 				$vasummary .= "\t{$row['code']}"
 				."<input type='hidden' name='code_{$row['sortorder']}' value=\"{$row['code']}\" maxlength='5' size='5'"
@@ -1171,7 +1166,7 @@
 			."\t<input type='text' name='title_{$row['language']}_{$row['sortorder']}' maxlength='100' size='80' value=\"{$row['answer']}\" />\n"
 			."\t</td>\n"
 			."\t<td width='25%'>\n";
-			if ($activated == "N")
+			if ($activated == 0)
 			{
 				$vasummary .= "\t<input type='submit' name='method' value='"._("Del")."' onclick=\"this.form.sortorder.value='{$row['sortorder']}'\" />\n";
 			}
@@ -1186,7 +1181,7 @@
 				// Fill the sortorder hiddenfield so we now what field is moved down
 				$vasummary .= "\t<input type='submit' name='method' value='"._("Dn")."' onclick=\"this.form.sortorder.value='{$row['sortorder']}'\" />\n";
 			}
-			$vasummary .= "\t</td></tr></div>\n";
+			$vasummary .= "\t</td></tr>\n";
 			$position++;
 		}
 		if ($anscount == 0)
@@ -1195,7 +1190,7 @@
 			."</center></td></tr>\n";
 		}
 		$position=sprintf("%05d", $position);
-		if ($activated == "M")
+		if ($activated == 0)
 		{
 			$vasummary .= "<tr><td><br /></td></tr><tr><td width='25%' align=right>"
 			."<strong>"._('New Answer').":</strong> <input type='text' maxlength='10' name='insertcode' size='10' id='addnewanswercode' />\n"
@@ -1230,6 +1225,7 @@
 		$vasummary .= "</div>";
 	}
 
+
 	/*
 
 	$cdrow['answer']=htmlspecialchars($cdrow['answer']);  // So HTML-Code can be used in answers