svn commit: r1692536 - /vcl/trunk/web/.ht-inc/requests.php

[jf...@apache.org]

Author: jfthomps
Date: Fri Jul 24 15:14:42 2015
New Revision: 1692536

URL: http://svn.apache.org/r1692536
Log:
VCL-888 - problem with translations containing single quotes

requests.php: reverted change where some calls to _() were wrapped with a call to escq() as well

Modified:
    vcl/trunk/web/.ht-inc/requests.php

Modified: vcl/trunk/web/.ht-inc/requests.php
URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/requests.php?rev=1692536&r1=1692535&r2=1692536&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/requests.php (original)
+++ vcl/trunk/web/.ht-inc/requests.php Fri Jul 24 15:14:42 2015
@@ -1839,7 +1839,7 @@ function AJupdateWaitTime() {
 	}
 	if($end < $start) {
 		print "dojo.byId('deployerr').innerHTML = '";
-		print escq(_("The end time must be later than the start time.")) . "';";
+		print _("The end time must be later than the start time.") . "';";
 		print "dojo.removeClass('deployerr', 'hidden');";
 		return;
 	}
@@ -1851,7 +1851,7 @@ function AJupdateWaitTime() {
 	if($type == 'server' && $fixedIP != '') {
 		if(! validateIPv4addr($fixedIP)) {
 			print "dojo.byId('deployerr').innerHTML = '";
-			print escq(_("Invalid IP address specified.")) . "';";
+			print _("Invalid IP address specified.") . "';";
 			print "dojo.removeClass('deployerr', 'hidden');";
 			return;
 		}
@@ -1860,7 +1860,7 @@ function AJupdateWaitTime() {
 		$intersect = array_intersect($mappedmns, $mnnets);
 		if(empty($intersect)) {
 			print "dojo.byId('deployerr').innerHTML = '";
-			print escq(_("There are no management nodes that can deploy the selected image with the specified IP address.")) . "';";
+			print _("There are no management nodes that can deploy the selected image with the specified IP address.") . "';";
 			print "dojo.removeClass('deployerr', 'hidden');";
 			return;
 		}
@@ -1900,12 +1900,12 @@ function AJupdateWaitTime() {
 	$max = getMaxOverlap($user['id']);
 	if(checkOverlap($start, $end, $max)) {
 		print "dojo.byId('deployerr').innerHTML = '";
-		print escq(_("The selected time overlaps with another reservation you have."));
+		print _("The selected time overlaps with another reservation you have.");
 		print "<br>";
 		if($max == 0)
-			print escq(_("You cannot have any overlapping reservations."));
+			print _("You cannot have any overlapping reservations.");
 		else
-			printf(escq(_("You can have up to %d overlapping reservations.")), $max);
+			printf(_("You can have up to %d overlapping reservations."), $max);
 		print "'; dojo.removeClass('deployerr', 'hidden');";
 		return;
 	}
@@ -1944,29 +1944,29 @@ function AJupdateWaitTime() {
 		print "dojo.byId('waittime').innerHTML = '";
 	}
 	if($rc == -2)
-		print escq(_("Selection not currently available due to scheduled system downtime for maintenance"));
+		print _("Selection not currently available due to scheduled system downtime for maintenance");
 	elseif($rc == -3)
-		print escq(_("IP address not available for selected time"));
+		print _("IP address not available for selected time");
 	elseif($rc == -4)
-		print escq(_("IP address not available"));
+		print _("IP address not available");
 	elseif($rc < 1)
 		if(array_key_exists('subimages', $images[$imageid]) &&
 		   count($images[$imageid]['subimages']))
-			print escq(_("Selection not currently available. Times cannot be suggested for cluster reservations."));
+			print _("Selection not currently available. Times cannot be suggested for cluster reservations.");
 		else
-			print escq(_("Selection not currently available"));
+			print _("Selection not currently available");
 	elseif(array_key_exists(0, $requestInfo['loaded']) &&
 	       $requestInfo['loaded'][0]) {
-		print escq(_("Estimated load time:"));
+		print _("Estimated load time:");
 		if($start < $now) {
 			print " &lt; ";
-			print escq(_("1 minute"));
+			print _("1 minute");
 		}
 		else
-			print ' ' . escq(_("Ready at start of reservation"));
+			print ' ' . _("Ready at start of reservation");
 	}
 	else {
-		print escq(_("Estimated load time:"));
+		print _("Estimated load time:");
 		$loadtime = getImageLoadEstimate($imageid);
 		if($start < $now) {
 			$loadtime = (int)($loadtime / 60);
@@ -1975,7 +1975,7 @@ function AJupdateWaitTime() {
 				print $images[$imageid]['reloadtime'];
 			else
 				printf("%2.0f", $loadtime + 1);
-			print " " . escq(_("minutes"));
+			print " " . _("minutes");
 		}
 		elseif($loadtime != 0 && ($start - $now < $loadtime))
 			print ' ' . _("Ready at") . date(" g:i a", ($now + $loadtime));
@@ -1986,7 +1986,7 @@ function AJupdateWaitTime() {
 	if($requestInfo['ipwarning']) {
 		print "dojo.removeClass('deployerr', 'hidden');";
 		print "dojo.byId('deployerr').innerHTML = '";
-		$h = escq(_("WARNING: Current conflict with specified IP address. If the conflict is not resolved by the start of your reservation, the reservation will fail."));
+		$h = _("WARNING: Current conflict with specified IP address. If the conflict is not resolved by the start of your reservation, the reservation will fail.");
 		print preg_replace("/(.{1,68}([ ]|$))/", '\1<br>', $h);
 		print "<br>';";
 	}
@@ -2012,7 +2012,7 @@ function printImageDescription($imageid)
 		$desc = preg_replace("/'/", '&#39;', $desc);
 		$desc = preg_replace("/(.{1,60}([ \n]|$))/", '\1<br>', $desc);
 		print "dojo.byId('imgdesc').innerHTML = '<b>";
-		print escq(_("Image Description")) . "</b>:<br>";
+		print _("Image Description") . "</b>:<br>";
 		print "$desc<br>'; ";
 	}
 }
@@ -2258,7 +2258,7 @@ function AJnewRequest() {
 	$max = getMaxOverlap($user['id']);
 	if(checkOverlap($startts, $endts, $max)) {
 		print "dojo.byId('deployerr').innerHTML = '";
-		print escq(_("The selected time overlaps with another reservation you have."));
+		print _("The selected time overlaps with another reservation you have.");
 		print "<br>";
 		if($max == 0)
 			print _("You cannot have any overlapping reservations.");