- Fixed Bug #870: Error message when returning from HELP screen

- Fixed bug #875: Some minor translation issues

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

admin/browse.php

@@ -165,7 +165,7 @@
 
 	if ($private == "N") //add token to top ofl ist is survey is not private
 	{
-		$fnames[] = array("token", "token", "Token ID");
+		$fnames[] = array("token", "token", $clang->gT("Token ID"));
 	}
 	$fnames[] = array("submitdate", "submitdate", $clang->gT("Date Submitted"));
 	if ($datestamp == "Y") //add datetime to list if survey is datestamped
@@ -352,7 +352,7 @@
 
 	if ($private == "N") //Add token to list
 	{
-		$fnames[] = array("token", "Token", "Token ID", "0");
+		$fnames[] = array("token", $clang->gT("Token"), $clang->gT("Token ID"), "0");
 	}
 	$fnames[] = array("submitdate", "submitdate", $clang->gT("Date Submitted"), "0");
 	if ($datestamp == "Y") //Add datestamp

admin/dataentry.php

@@ -425,15 +425,15 @@
 
 		if ($private == "N") //show token info if survey not private
 		{
-			$fnames[] = array ("token", "Token ID", "Token", "token", "TID", "", "");
+			$fnames[] = array ("token", $clang->gT("Token ID"), $clang->gT("Token"), "token", "TID", "", "");
 		}
 		if ($datestamp == "Y")
 		{
-			$fnames[] = array ("datestamp", "Date Stamp", "Datestamp", "datestamp", "datestamp", "", "");
+			$fnames[] = array ("datestamp", $clang->gT("Date Stamp"), $clang->gT("Date Stamp"), "datestamp", "datestamp", "", "");
 		}
 		if ($ipaddr == "Y")
 		{
-			$fnames[] = array ("ipaddr", "IP Address", "IP Address", "ipaddr", "ipaddr", "", "");
+			$fnames[] = array ("ipaddr", $clang->gT("IP Address"), $clang->gT("IP Address"), "ipaddr", "ipaddr", "", "");
 		}
 		$fcount=0;
 		foreach ($fnrows as $fnrow)

admin/userrighthandling.php

@@ -322,11 +322,11 @@
 	. "\t\t\t\t<tr bgcolor='#555555'><td colspan='6' height='4'>"
 	. "<font size='1' face='verdana' color='white'><strong>".$clang->gT("User Control")."</strong></font></td></tr>\n"
 	. "\t<tr>\n"
-	. "\t\t<th>".$clang->gT("Username")."</th>\n"
-	. "\t\t<th>".$clang->gT("Email")."</th>\n"
-	. "\t\t<th>".$clang->gT("Full name")."</th>\n"
-	. "\t\t<th>".$clang->gT("Password")."</th>\n"
-	. "\t\t<th>".$clang->gT("Created by")."</th>\n"
+	. "\t\t<th width='20%'>".$clang->gT("Username")."</th>\n"
+	. "\t\t<th width='20%'>".$clang->gT("Email")."</th>\n"
+	. "\t\t<th width='20%'>".$clang->gT("Full name")."</th>\n"
+	. "\t\t<th width='15%' >".$clang->gT("Password")."</th>\n"
+	. "\t\t<th width='15%'>".$clang->gT("Created by")."</th>\n"
 	. "\t\t<th></th>\n"
 	. "\t</tr>\n";
 
@@ -459,20 +459,20 @@
 			."</form>";
 		}
 		$usersummary .= "\t\t</td>\n"
-		. "\t</tr>\n";
+		. "\t</tr></table>\n";
 		$row++;
 	}
 
 	if($_SESSION['USER_RIGHT_CREATE_USER'])
 	{
 		$usersummary .= "\t\t<form action='$scriptname' method='post'>\n"
-		. "\t\t<tr>\n"
-		. "\t\t<td align='center'><input type='text' name='new_user' /></td>\n"
-		. "\t\t<td align='center'><input type='text' name='new_email' /></td>\n"
-		. "\t\t<td align='center'><input type='text' name='new_full_name' /></td>\n"
-		. "\t\t<td align='center'><input type='submit' value='".$clang->gT("Add User")."' />"
+		. "\t\t<table rules='rows' width='100%'><tr>\n"
+		. "\t\t<td align='center' width='20%'><input type='text' name='new_user' /></td>\n"
+		. "\t\t<td align='center' width='20%'><input type='text' name='new_email' /></td>\n"
+		. "\t\t<td align='center' width='20%' ><input type='text' name='new_full_name' /></td><td width='15%'>&nbsp;</td><td width='15%'>&nbsp;</td>\n"
+		. "\t\t<td align='center' width='15%'><input type='submit' value='".$clang->gT("Add User")."' />"
 		. "<input type='hidden' name='action' value='adduser' /></td>\n"
-		. "\t</tr>\n";
+		. "\t</tr></table></form>\n";
 	}
 
 }

common.php

@@ -1274,11 +1274,11 @@ function returnquestiontitlefromfieldcode($fieldcode)
 	// Performance Improvement	: 37%
 	// Optimized By				: swales
 
-	if (!isset($fieldcode)) {return "Preset";}
-	if ($fieldcode == "token") {return "Token";}
-	if ($fieldcode == "datestamp") {return "Date Stamp";}
-	if ($fieldcode == "ipaddr") {return "IP Address";}
-	if ($fieldcode == "refurl") {return "Referring URL";}
+	if (!isset($fieldcode)) {return $clang->gT("Preset");}
+	if ($fieldcode == "token") {return $clang->gT("Token");}
+	if ($fieldcode == "datestamp") {return $clang->gT("Date Stamp");}
+	if ($fieldcode == "ipaddr") {return $clang->gT("IP Address");}
+	if ($fieldcode == "refurl") {return $clang->gT("Referring URL");}
 	global $dbprefix, $surveyid, $connect;
 
 	//Find matching information;