You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by jf...@apache.org on 2015/08/19 20:35:21 UTC

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

Author: jfthomps
Date: Wed Aug 19 18:35:21 2015
New Revision: 1696645

URL: http://svn.apache.org/r1696645
Log:
VCL-888 - Web UI fails to handle translations containing single quotes

I could only find 1 function that was sending i() back as javascript

requests.php: modified AJupdateWaitTime: changed 2 occurances of i() to _() where it was actually being sent as javascript instead of calling the php function

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=1696645&r1=1696644&r2=1696645&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/requests.php (original)
+++ vcl/trunk/web/.ht-inc/requests.php Wed Aug 19 18:35:21 2015
@@ -1928,9 +1928,9 @@ function AJupdateWaitTime() {
 		else
 			print "dojo.byId('suggestcont').value = '$cont';";
 		print "if(dijit.byId('newResDlgBtn')) {";
-		print "if(dijit.byId('newResDlgBtn').get('label') != i('View Available Times')) ";
+		print "if(dijit.byId('newResDlgBtn').get('label') != _('View Available Times')) ";
 		print "resbtntxt = dijit.byId('newResDlgBtn').get('label'); ";
-		print "dijit.byId('newResDlgBtn').set('label', i('View Available Times'));";
+		print "dijit.byId('newResDlgBtn').set('label', _('View Available Times'));";
 		print "}";
 	}
 	if($rc < 1) {
@@ -3279,7 +3279,7 @@ function AJeditRequest() {
 		$maxcheck = $maxtimes['total'];
 	if(! $openend && ($reslen >= $maxcheck)) {
 		$h  = sprintf(i("You are only allowed to extend your reservation such that it has a total length of %s. "), minToHourMin($maxcheck));
-		$h .=i("This reservation already meets that length. Therefore, you are not allowed to extend your reservation any further.");
+		$h .= i("This reservation already meets that length. Therefore, you are not allowed to extend your reservation any further.");
 		$h = preg_replace("/(.{1,60}([ \n]|$))/", '\1<br>', $h) . "<br>";
 		sendJSON(array('status' => 'nomodify', 'html' => $h));
 		return;