gettext-changes/bugfixes

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

admin/deactivate.php

@@ -54,7 +54,7 @@
 	echo "\t\t\t<p>"._("When you de-activate a survey all the data entered in the original table will be moved elsewhere, and when you activate the survey again, the table will be empty. You will not be able to access this data using PHPSurveyor any more.")."</p>\n";
 	echo "\t\t\t<p>"._("De-activated survey data can only be accessed by system administrators using a MySQL data access tool like phpmyadmin. If your survey uses tokens, this table will also be renamed and will only be accessible by system administrators.")."</p>\n";
 	echo "\t\t\t<p>"._("Your responses table will be renamed to:")." {$dbprefix}old_{$_GET['sid']}_{$date}</p>\n";
-	echo "\t\t\t<p>"._("You should export your responses before de-activating. Click \")."</p>\n";
+	echo "\t\t\t<p>"._("You should export your responses before de-activating. Click \"Cancel\" to return to the main admin screen without de-activating this survey.")."</p>\n";
 	echo "\t\t</td>\n";
 	echo "\t</tr>\n";
 	echo "\t<tr>\n";

admin/navigator.php

@@ -943,7 +943,7 @@ function assessmentDetails($surveyid) {
 					<form action='$scriptname' method='post'>
 					<td  valign='top' align='center'>
 					 <input type='button' class='buttons' value='"._("Edit")."' onClick='window.open(\"{$homeurl}/$scriptname?action=showassessments&amp;sid=$surveyid&amp;id=".$field['id']."\", \"_top\")'>
-					 <input type='submit' class='buttons' value='"._("Delete")."' onClick='return confirm(\""._("Are you sure you want t."\")'>
+					 <input type='submit' class='buttons' value='"._("Delete")."' onClick='return confirm(\""._("Are you sure you want to delete this entry?")."\")'>
 					 <input type='hidden' name='action' value='showassessments'>
 					 <input type='hidden' name='sid' value='$surveyid'>
 					 <input type='hidden' name='id' value='".$field['id']."'>

admin/saved.php

@@ -116,7 +116,7 @@ function showSavedList($surveyid)
 				<td><a href='mailto:".$row['email']."'>".$row['email']."</td>
 				<td align='center'>
 				[<a href='saved.php?sid=$surveyid&amp;action=delete&amp;scid=".$row['scid']."'"
-				." onClick='return confirm(\""._("Are you sure you want t."\")'"
+				." onClick='return confirm(\""._("Are you sure you want to delete this entry?")."\")'"
 				.">"._("Delete")."</a>]
 				[<a href='dataentry.php?sid=$surveyid&amp;action=editsaved&amp;identifier=".rawurlencode ($row['identifier'])."&amp;scid=".$row['scid']."&amp;accesscode=".$row['access_code']."'>"._("Edit")."</a>]
 				</td>

common.php

@@ -132,11 +132,14 @@
 if ($sourcefrom == "admin")
     {
     $langdir="$publicurl/locale/".$_SESSION['adminlang']."/help";
-    if (!is_dir($langdir))
+    $langdirlocal="$rootdir/locale/".$_SESSION['adminlang']."/help";
+
+    if (!is_dir($langdirlocal))  // is_dir only works on local dirs
         {
         $langdir="$publicurl/locale/en/help"; //default to english if there is no matching language dir
         }
     }
+
 //SET LOCAL TIME
 $localtimedate=(strftime("%Y-%m-%d %H:%M", mktime(date("H")+$timeadjust)));