Author: jfthomps
Date: Mon Jul 18 18:33:49 2016
New Revision: 1753300
URL: http://svn.apache.org/viewvc?rev=1753300&view=rev
Log:
VCL-968 - Localization updates for 2.5
blockallocations.php:
-modified blockAllocationForm: fixed typo where 'User' should have been 'Users'
- also updated this in all of the vcl.po files
-modified viewBlockStatus: wrapped notice about block allocation not existing
with translation function
requests.php:
-modified newReservationHTML: wrapped "Please select a valid environment" with
translation function
-modified newReservationConfigHTML: wrapped an error message with translation
function; this part of the code is currently not used
vcl.po.template:
-regenerated using 'xgettext -o ../locale/po_files/vcl.po.template --no-wrap
-ki *.php authmethods/*.php' from within .ht-inc directory
vcl.po files:
-regenerated each file using 'msgmerge --no-wrap -N vcl.po ../vcl.po.template >
vcl-new.po'
Modified:
vcl/trunk/web/.ht-inc/blockallocations.php
vcl/trunk/web/.ht-inc/requests.php
vcl/trunk/web/locale/po_files/es_MX/vcl.po
vcl/trunk/web/locale/po_files/fr_CA/vcl.po
vcl/trunk/web/locale/po_files/ja_JP/vcl.po
vcl/trunk/web/locale/po_files/pt_PT/vcl.po
vcl/trunk/web/locale/po_files/vcl.po.template
vcl/trunk/web/locale/po_files/zh_CN/vcl.po
Modified: vcl/trunk/web/.ht-inc/blockallocations.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/blockallocations.php?rev=1753300&r1=1753299&r2=1753300&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/blockallocations.php (original)
+++ vcl/trunk/web/.ht-inc/blockallocations.php Mon Jul 18 18:33:49 2016
@@ -521,7 +521,7 @@ function blockAllocationForm() {
print "<div dojoType=\"dijit.Tooltip\" connectId=\"grouphelp\">\n";
print "<div style=\"width: 440px;\">\n";
- print i("User in this user group will be able to make reservations for
the computers set aside for this block allocation. If you do not see an
applicable user group listed, please select \"<font color=\"blue\">(group not
listed)</font>\" and describe the group you need in the <strong>Additional
Comments</strong> section at the bottom of the page. If this is for a class,
make sure to list the course and section number.");
+ print i("Users in this user group will be able to make reservations for
the computers set aside for this block allocation. If you do not see an
applicable user group listed, please select \"<font color=\"blue\">(group not
listed)</font>\" and describe the group you need in the <strong>Additional
Comments</strong> section at the bottom of the page. If this is for a class,
make sure to list the course and section number.");
print "</div></div>\n";
print "<div dojoType=\"dijit.Tooltip\" connectId=\"repeattypehelp\">\n";
@@ -2857,7 +2857,7 @@ function viewBlockStatus() {
print "<H2>" . i("Block Allocation") . "</H2>\n";
$data = getBlockAllocationStatus($blockid);
if(is_null($data)) {
- print "The selected Block Allocation no longer exists.";
+ print i("The selected Block Allocation no longer exists.");
return;
}
$startunix = datetimeToUnix($data['start']);
Modified: vcl/trunk/web/.ht-inc/requests.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/requests.php?rev=1753300&r1=1753299&r2=1753300&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/requests.php (original)
+++ vcl/trunk/web/.ht-inc/requests.php Mon Jul 18 18:33:49 2016
@@ -1527,8 +1527,8 @@ function newReservationHTML() {
else
$h .= "query=\"{basic: 1, checkout: 1}\" ";
$h .= "highlightMatch=\"all\" autoComplete=\"false\" ";
- $h .= "invalidMessage=\"Please select a valid environment\" ";
- $h .= "onChange=\"selectEnvironment();\" tabIndex=1></select>\n";
+ $h .= "invalidMessage=\"" . i("Please select a valid environment");
+ $h .= "\" onChange=\"selectEnvironment();\" tabIndex=1></select>\n";
$h .= "</span><br><br>\n";
$imagenotes = getImageNotes($imageid);
$desc = '';
@@ -2607,9 +2607,9 @@ function newReservationConfigHTML() {
$h .= "<span id=\"configvalstring\" class=\"hidden\"><input
type=\"text\" ";
$h .= "id=\"configvaluestring\" style=\"width: 160px\" ";
$h .= "dojoType=\"dijit.form.ValidationTextBox\" ";
- $h .= "invalidMessage=\"Value can only contain letters, numbers, "; #
TODO determine constraints, if any
- $h .= "spaces, dashes(-), parenthesis, <br>slashes(/), and periods(.)
and can be from 3 to 255 characters long\" ";
- $h .= "regExp=\"^([-a-zA-Z0-9\. \(\)/]){3,255}$\"
onChange=\"saveSelectedConfigVar();\">";
+ $h .= "invalidMessage=\"";
+ $h .= i("Value can only contain letters, numbers, spaces, dashes(-),
parenthesis, <br>slashes(/), and periods(.) and can be from 3 to 255 characters
long"); # TODO determine constraints, if any
+ $h .= "\" regExp=\"^([-a-zA-Z0-9\. \(\)/]){3,255}$\"
onChange=\"saveSelectedConfigVar();\">";
$h .= "</span>\n";
# text
$h .= "<span id=\"configvaltext\" class=\"hidden\">";
