Modified: vcl/trunk/web/.ht-inc/computer.php URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/computer.php?rev=1692548&r1=1692547&r2=1692548&view=diff ============================================================================== --- vcl/trunk/web/.ht-inc/computer.php (original) +++ vcl/trunk/web/.ht-inc/computer.php Fri Jul 24 16:28:20 2015 @@ -208,7 +208,7 @@ class Computer extends Resource { # selected items menu $h .= "<div dojoType=\"dijit.form.DropDownButton\">\n"; - $h .= "<span>" . _("Actions for selected computers") . "</span>\n"; + $h .= "<span>" . i("Actions for selected computers") . "</span>\n"; $h .= "<div dojoType=\"dijit.Menu\" id=\"actionmenu\">\n"; # change NAT @@ -217,10 +217,10 @@ class Computer extends Resource { $h .= " <div dojoType=\"dijit.layout.ContentPane\"\n"; $h .= " style=\"background-color: white; padding: 5px; border: 1px solid black;\">\n"; $extra = array('onChange' => "toggleNAT('newnatenabled', 'newnathostid');"); - $h .= labeledFormItem('newnatenabled', _('Connect Using NAT'), 'check', '', '', '1', '', '', $extra); + $h .= labeledFormItem('newnatenabled', i('Connect Using NAT'), 'check', '', '', '1', '', '', $extra); $nathosts = getNAThosts(0, 1); $disabled = array('disabled' => 'true'); - $h .= labeledFormItem('newnathostid', _('NAT Host'), 'select', $nathosts, + $h .= labeledFormItem('newnathostid', i('NAT Host'), 'select', $nathosts, '', '', '', '', $disabled); $cdata = $this->basecdata; $cont = addContinuationsEntry('AJcompNATchange', $cdata); @@ -523,7 +523,7 @@ class Computer extends Resource { $extra = array('onChange' => 'toggleSingleMultiple();'); $modes = array('single' => 'Single Computer', 'multiple' => 'Multiple Computers'); - $h .= labeledFormItem('mode', _('Add') . ' ', 'select', $modes, 1, '', '', '', $extra); + $h .= labeledFormItem('mode', i('Add') . ' ', 'select', $modes, 1, '', '', '', $extra); $h .= "<br>\n"; $h .= "</div>\n"; # singlemultiplediv @@ -561,79 +561,79 @@ class Computer extends Resource { $h .= "<div class=\"highlightnoticenotify hidden\" id=\"cancelvmhostinuseokdiv\"></div>\n"; # hostname - $errmsg = _("Name can only contain letters, numbers, dashes(-), periods(.), and underscores(_). It can be from 1 to 36 characters long."); - $h .= labeledFormItem('name', _('Name') . '*', 'text', '^([a-zA-Z0-9_][-a-zA-Z0-9_\.]{1,35})$', + $errmsg = i("Name can only contain letters, numbers, dashes(-), periods(.), and underscores(_). It can be from 1 to 36 characters long."); + $h .= labeledFormItem('name', i('Name') . '*', 'text', '^([a-zA-Z0-9_][-a-zA-Z0-9_\.]{1,35})$', 1, '', $errmsg); # start/end $h .= "<div id=\"startenddiv\" class=\"hidden\">\n"; $extra = array('smallDelta' => 1, 'largeDelta' => 10); - $h .= labeledFormItem('startnum', _('Start') . '*', 'spinner', '{min:0,max:255,places:0}', 1); - $h .= labeledFormItem('endnum', _('End') . '*', 'spinner', '{min:0,max:255,places:0}', 1); + $h .= labeledFormItem('startnum', i('Start') . '*', 'spinner', '{min:0,max:255,places:0}', 1); + $h .= labeledFormItem('endnum', i('End') . '*', 'spinner', '{min:0,max:255,places:0}', 1); $h .= "</div>\n"; # startenddiv # owner $extra = array('onKeyPress' => 'setOwnerChecking'); - $h .= labeledFormItem('owner', _('Owner') . '*', 'text', '', 1, - "{$user['unityid']}@{$user['affiliation']}", _('Unknown user'), + $h .= labeledFormItem('owner', i('Owner') . '*', 'text', '', 1, + "{$user['unityid']}@{$user['affiliation']}", i('Unknown user'), 'checkOwner', $extra); $cont = addContinuationsEntry('AJvalidateUserid'); $h .= "<input type=\"hidden\" id=\"valuseridcont\" value=\"$cont\">\n"; # type $extra = array('onChange' => 'selectType();'); - $h .= labeledFormItem('type', _('Type'), 'select', $types, 1, '', '', '', $extra); + $h .= labeledFormItem('type', i('Type'), 'select', $types, 1, '', '', '', $extra); # single computer fields $h .= "<div id=\"singleipmacdiv\">\n"; # public IP $ipreg = '(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)'; $ipreg1 = "^$ipreg$"; - $errmsg = _("Invalid Public IP address specified - must be a valid IPV4 address"); - $h .= labeledFormItem('ipaddress', _('Public IP Address') . '*', 'text', $ipreg1, 1, '', $errmsg); + $errmsg = i("Invalid Public IP address specified - must be a valid IPV4 address"); + $h .= labeledFormItem('ipaddress', i('Public IP Address') . '*', 'text', $ipreg1, 1, '', $errmsg); # private IP - $errmsg = _("Invalid Private IP address specified - must be a valid IPV4 address"); - $h .= labeledFormItem('privateipaddress', _('Private IP Address'), 'text', $ipreg1, 0, '', $errmsg); + $errmsg = i("Invalid Private IP address specified - must be a valid IPV4 address"); + $h .= labeledFormItem('privateipaddress', i('Private IP Address'), 'text', $ipreg1, 0, '', $errmsg); # Public MAC $macreg = '^([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}$'; - $errmsg = _("Invalid Public MAC address specified"); - $h .= labeledFormItem('publicmac', _('Public MAC Address'), 'text', $macreg, 0, '', $errmsg); + $errmsg = i("Invalid Public MAC address specified"); + $h .= labeledFormItem('publicmac', i('Public MAC Address'), 'text', $macreg, 0, '', $errmsg); # private MAC - $errmsg = _("Invalid Private MAC address specified"); - $h .= labeledFormItem('privatemac', _('Private MAC Address'), 'text', $macreg, 0, '', $errmsg); + $errmsg = i("Invalid Private MAC address specified"); + $h .= labeledFormItem('privatemac', i('Private MAC Address'), 'text', $macreg, 0, '', $errmsg); $h .= "</div>\n"; # singleipmacdiv # multi computer fields $h .= "<div id=\"multiipmacdiv\" class=\"hidden\">\n"; # start public IP - $errmsg = _("Invalid Start Public IP Address specified - must be a valid IPV4 address"); - $h .= labeledFormItem('startpubipaddress', _('Start Public IP Address') . '*', 'text', $ipreg1, 1, '', $errmsg); + $errmsg = i("Invalid Start Public IP Address specified - must be a valid IPV4 address"); + $h .= labeledFormItem('startpubipaddress', i('Start Public IP Address') . '*', 'text', $ipreg1, 1, '', $errmsg); # end public IP - $errmsg = _("Invalid End Public IP Address specified - must be a valid IPV4 address"); - $h .= labeledFormItem('endpubipaddress', _('End Public IP Address') . '*', 'text', $ipreg1, 1, '', $errmsg); + $errmsg = i("Invalid End Public IP Address specified - must be a valid IPV4 address"); + $h .= labeledFormItem('endpubipaddress', i('End Public IP Address') . '*', 'text', $ipreg1, 1, '', $errmsg); # start private IP - $errmsg = _("Invalid Start Private IP Address specified - must be a valid IPV4 address"); - $h .= labeledFormItem('startprivipaddress', _('Start Private IP Address') . '*', 'text', $ipreg1, 1, '', $errmsg); + $errmsg = i("Invalid Start Private IP Address specified - must be a valid IPV4 address"); + $h .= labeledFormItem('startprivipaddress', i('Start Private IP Address') . '*', 'text', $ipreg1, 1, '', $errmsg); # end private IP - $errmsg = _("Invalid End Private IP Address specified - must be a valid IPV4 address"); - $h .= labeledFormItem('endprivipaddress', _('End Private IP Address') . '*', 'text', $ipreg1, 1, '', $errmsg); + $errmsg = i("Invalid End Private IP Address specified - must be a valid IPV4 address"); + $h .= labeledFormItem('endprivipaddress', i('End Private IP Address') . '*', 'text', $ipreg1, 1, '', $errmsg); # start MAC - $errmsg = _("Invalid Start MAC Address specified"); - $h .= labeledFormItem('startmac', _('Start MAC Address'), 'text', $macreg, 0, '', $errmsg); + $errmsg = i("Invalid Start MAC Address specified"); + $h .= labeledFormItem('startmac', i('Start MAC Address'), 'text', $macreg, 0, '', $errmsg); $h .= "</div>\n"; # multiipsdiv # provisioning engine $extra = array('onChange' => 'selectProvisioning();'); - $h .= labeledFormItem('provisioningid', _('Provisioning Engine'), 'selectonly', $provisioning, 1, '', '', '', $extra); + $h .= labeledFormItem('provisioningid', i('Provisioning Engine'), 'selectonly', $provisioning, 1, '', '', '', $extra); # state $extra = array('onChange' => 'selectState();'); @@ -641,28 +641,28 @@ class Computer extends Resource { 23 => 'hpc', 10 => 'maintenance', 20 => 'vmhostinuse'); - $h .= labeledFormItem('stateid', _('State'), 'selectonly', $states, 1, '', '', '', $extra); + $h .= labeledFormItem('stateid', i('State'), 'selectonly', $states, 1, '', '', '', $extra); # maintenance notes $h .= "<div id=\"notesspan\">\n"; - $h .= labeledFormItem('notes', _('Reason for maintenance'), 'textarea'); + $h .= labeledFormItem('notes', i('Reason for maintenance'), 'textarea'); $h .= "</div>\n"; # VMhost profile $profiles = getVMProfiles(); uasort($profiles, 'sortKeepIndex'); $h .= "<div id=\"vmprofilespan\">\n"; - $h .= labeledFormItem('vmprofileid', _('VM Host Porfile'), 'select', $profiles); + $h .= labeledFormItem('vmprofileid', i('VM Host Porfile'), 'select', $profiles); $h .= "</div>\n"; # platform $platforms = getPlatforms(); - $h .= labeledFormItem('platformid', _('Platform'), 'select', $platforms); + $h .= labeledFormItem('platformid', i('Platform'), 'select', $platforms); # schedule $tmp = getUserResources(array("scheduleAdmin"), array("manageGroup")); $schedules = $tmp["schedule"]; - $h .= labeledFormItem('scheduleid', _('Schedule'), 'selectonly', $schedules); + $h .= labeledFormItem('scheduleid', i('Schedule'), 'selectonly', $schedules); # current image $h .= "<div id=\"curimgspan\">\n"; @@ -672,45 +672,45 @@ class Computer extends Resource { # ram $extra = array('smallDelta' => 1024, 'largeDelta' => 4096); - $h .= labeledFormItem('ram', _('RAM (MB)') . '*', 'spinner', '{min:500,max:16777215,places:0}', 1); + $h .= labeledFormItem('ram', i('RAM (MB)') . '*', 'spinner', '{min:500,max:16777215,places:0}', 1); # cores $extra = array('smallDelta' => 1, 'largeDelta' => 4); - $h .= labeledFormItem('cores', _('No. Cores') . '*', 'spinner', '{min:1,max:255,places:0}', 1); + $h .= labeledFormItem('cores', i('No. Cores') . '*', 'spinner', '{min:1,max:255,places:0}', 1); # proc speed $extra = array('smallDelta' => 100, 'largeDelta' => 1000); - $h .= labeledFormItem('procspeed', _('Processor Speed (MHz)') . '*', 'spinner', '{min:500,max:10000,places:0}', 1); + $h .= labeledFormItem('procspeed', i('Processor Speed (MHz)') . '*', 'spinner', '{min:500,max:10000,places:0}', 1); # network speed $tmpArr = array("10" => "10", "100" => "100", "1000" => "1000", "10000" => "10000", "100000" => "100000"); - $h .= labeledFormItem('network', _('Network'), 'select', $tmpArr); + $h .= labeledFormItem('network', i('Network'), 'select', $tmpArr); # predictive loading module $vals = getPredictiveModules(); - $h .= labeledFormItem('predictivemoduleid', _('Predictive Loading Module'), 'select', $vals); + $h .= labeledFormItem('predictivemoduleid', i('Predictive Loading Module'), 'select', $vals); # NAT $h .= "<div class=\"boxedoptions\">\n"; # use NAT $extra = array('onChange' => "toggleNAT('natenabled', 'nathostid');"); - $h .= labeledFormItem('natenabled', _('Connect Using NAT'), 'check', '', '', '1', '', '', $extra); + $h .= labeledFormItem('natenabled', i('Connect Using NAT'), 'check', '', '', '1', '', '', $extra); # which NAT host $nathosts = getNAThosts(0, 1); - $h .= labeledFormItem('nathostid', _('NAT Host'), 'selectonly', $nathosts); + $h .= labeledFormItem('nathostid', i('NAT Host'), 'selectonly', $nathosts); $h .= "</div>\n"; # NAT # NAT Host $h .= "<div id=\"nathost\" class=\"boxedoptions\">\n"; # use as NAT host $extra = array('onChange' => "toggleNAThost();"); - $h .= labeledFormItem('nathostenabled', _('Use as NAT Host'), 'check', '', '', '1', '', '', $extra); + $h .= labeledFormItem('nathostenabled', i('Use as NAT Host'), 'check', '', '', '1', '', '', $extra); # public IP - $errmsg = _("Invalid NAT Public IP address specified - must be a valid IPV4 address"); - $h .= labeledFormItem('natpublicipaddress', _('NAT Public IP Address'), 'text', $ipreg1, 1, '', $errmsg); + $errmsg = i("Invalid NAT Public IP address specified - must be a valid IPV4 address"); + $h .= labeledFormItem('natpublicipaddress', i('NAT Public IP Address'), 'text', $ipreg1, 1, '', $errmsg); # internal IP - $errmsg = _("Invalid NAT Internal IP address specified - must be a valid IPV4 address"); - $h .= labeledFormItem('natinternalipaddress', _('NAT Internal IP Address'), 'text', $ipreg1, 1, '', $errmsg); + $errmsg = i("Invalid NAT Internal IP address specified - must be a valid IPV4 address"); + $h .= labeledFormItem('natinternalipaddress', i('NAT Internal IP Address'), 'text', $ipreg1, 1, '', $errmsg); $h .= "</div>\n"; # NAT Host # compid @@ -720,8 +720,8 @@ class Computer extends Resource { $h .= "</div>\n"; # location - $errmsg = _("Location can be up to 255 characters long and may contain letters, numbers, spaces, and these characters: - , . _ @ # ( )"); - $h .= labeledFormItem('location', _('Location'), 'text', + $errmsg = i("Location can be up to 255 characters long and may contain letters, numbers, spaces, and these characters: - , . _ @ # ( )"); + $h .= labeledFormItem('location', i('Location'), 'text', '^([-a-zA-Z0-9_\. ,@#\(\)]{0,255})$', 0, '', $errmsg); $h .= "</div>\n"; # computerdlgcontent
Modified: vcl/trunk/web/.ht-inc/image.php URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/image.php?rev=1692548&r1=1692547&r2=1692548&view=diff ============================================================================== --- vcl/trunk/web/.ht-inc/image.php (original) +++ vcl/trunk/web/.ht-inc/image.php Fri Jul 24 16:28:20 2015 @@ -114,37 +114,37 @@ class Image extends Resource { function fieldDisplayName($field) { switch($field) { case 'os': - return _("OS"); + return i("OS"); case 'installtype': - return _("Install Type"); + return i("Install Type"); case 'ostype': - return _("OS Type"); + return i("OS Type"); case 'minram': - return _("Required RAM"); + return i("Required RAM"); case 'minprocnumber': - return _("Required Cores"); + return i("Required Cores"); case 'minprocspeed': - return _("Processor Speed"); + return i("Processor Speed"); case 'minnetwork': - return _("Min. Network Speed"); + return i("Min. Network Speed"); case 'maxconcurrent': - return _("Max Concurrent Usage"); + return i("Max Concurrent Usage"); case 'reloadtime': - return _("Est. Reload Time"); + return i("Est. Reload Time"); case 'lastupdate': - return _("Last Updated"); + return i("Last Updated"); case 'forcheckout': - return _("Available for checkout"); + return i("Available for checkout"); case 'maxinitialtime': - return _("Max Initial Time"); + return i("Max Initial Time"); case 'checkuser': - return _("Check Logged in User"); + return i("Check Logged in User"); case 'rootaccess': - return _("Admin. Access"); + return i("Admin. Access"); case 'sethostname': - return _("Set Hostname"); + return i("Set Hostname"); } - return _(ucfirst($field)); + return i(ucfirst($field)); } ///////////////////////////////////////////////////////////////////////////// @@ -172,7 +172,7 @@ class Image extends Resource { . "LIMIT 1"; $qh = doQuery($query); if($row = mysql_fetch_assoc($qh)) - $msgs[] = sprintf(_("There is at least one <strong>reservation</strong> for this image. The latest end time is %s."), prettyDatetime($row['end'], 1));; + $msgs[] = sprintf(i("There is at least one <strong>reservation</strong> for this image. The latest end time is %s."), prettyDatetime($row['end'], 1));; # check blockComputers $query = "SELECT br.name, " @@ -190,7 +190,7 @@ class Image extends Resource { . "LIMIT 1"; $qh = doQuery($query); if($row = mysql_fetch_assoc($qh)) - $msgs[] = sprintf(_("There is at least one <strong>Block Allocation</strong> with computers currently allocated with this image. Block Allocation %s has the latest end time which is %s."), $row['name'], prettyDatetime($row['end'], 1)); + $msgs[] = sprintf(i("There is at least one <strong>Block Allocation</strong> with computers currently allocated with this image. Block Allocation %s has the latest end time which is %s."), $row['name'], prettyDatetime($row['end'], 1)); # check blockRequest $query = "SELECT br.name, " @@ -206,7 +206,7 @@ class Image extends Resource { . "LIMIT 1"; $qh = doQuery($query); if($row = mysql_fetch_assoc($qh)) - $msgs[] = sprintf(_("There is at least one <strong>Block Allocation</strong> configured to use this image. Block Allocation %s has the latest end time which is %s."), $row['name'], prettyDatetime($row['end'], 1)); + $msgs[] = sprintf(i("There is at least one <strong>Block Allocation</strong> configured to use this image. Block Allocation %s has the latest end time which is %s."), $row['name'], prettyDatetime($row['end'], 1)); # check serverprofile $query = "SELECT name " @@ -217,7 +217,7 @@ class Image extends Resource { while($row = mysql_fetch_assoc($qh)) $profiles[] = $row['name']; if(count($profiles)) - $msgs[] = _("The following <strong>Server Profiles</strong> are configured to use this image:") . "<br><br>\n" . implode("<br>\n", $profiles); + $msgs[] = i("The following <strong>Server Profiles</strong> are configured to use this image:") . "<br><br>\n" . implode("<br>\n", $profiles); # check subimages $query = "SELECT DISTINCT i.prettyname " @@ -232,7 +232,7 @@ class Image extends Resource { while($row = mysql_fetch_assoc($qh)) $images[] = $row['prettyname']; if(count($images)) - $msgs[] = _("The following <strong>images</strong> have the selected image assigned as a <strong>subimage</strong>:") . "<br><br>\n" . implode("<br>\n", $images); + $msgs[] = i("The following <strong>images</strong> have the selected image assigned as a <strong>subimage</strong>:") . "<br><br>\n" . implode("<br>\n", $images); # check vmprofile $query = "SELECT profilename " @@ -242,12 +242,12 @@ class Image extends Resource { while($row = mysql_fetch_assoc($qh)) $profiles[] = $row['profilename']; if(count($profiles)) - $msgs[] = _("The following <strong>VM Host Profiles</strong> have the this image selected:") . "<br><br>\n" . implode("<br>\n", $profiles); + $msgs[] = i("The following <strong>VM Host Profiles</strong> have the this image selected:") . "<br><br>\n" . implode("<br>\n", $profiles); if(empty($msgs)) return ''; - $msg = _("The selected image is currently being used in the following ways and cannot be deleted at this time.") . "<br><br>\n"; + $msg = i("The selected image is currently being used in the following ways and cannot be deleted at this time.") . "<br><br>\n"; $msg .= implode("<br><br>\n", $msgs) . "<br><br>\n"; return $msg; } @@ -300,7 +300,7 @@ class Image extends Resource { $cont = addContinuationsEntry("viewRequests", $cdata); $h .= "<INPUT type=radio name=\"continuation\" value=\"$cont\" id=\""; $h .= "createimage\"><label for=\"createimage\">"; - $h .= _("Create / Update an Image"); + $h .= i("Create / Update an Image"); $h .= "</label><br>\n"; return $h; } @@ -321,9 +321,9 @@ class Image extends Resource { $h .= "<div dojoType=dijit.Dialog\n"; $h .= " id=\"addeditdlg\"\n"; if($add) - $h .= " title=\"" . _("Add {$this->restypename}") . "\"\n"; + $h .= " title=\"" . i("Add {$this->restypename}") . "\"\n"; else - $h .= " title=\"" . _("Edit {$this->restypename}") . "\"\n"; + $h .= " title=\"" . i("Edit {$this->restypename}") . "\"\n"; $h .= " duration=250\n"; $h .= " draggable=true>\n"; $h .= "<div id=\"addeditdlgcontent\">\n"; @@ -333,37 +333,37 @@ class Image extends Resource { if(! $add) $h .= "<div style=\"width: 80%; margin-left: 10%; overflow: auto; height: 80%;\">\n"; # name - $errmsg = _("Name cannot contain dashes (-), single (') or double (") quotes, less than (<), or greater than (>) and can be from 2 to 60 characters long"); - $h .= labeledFormItem('name', _('Name'), 'text', '^([A-Za-z0-9!@#$%^&\*\(\)_=\+\[\]{}\\\|:;,\./\?~` ]){2,60}$', + $errmsg = i("Name cannot contain dashes (-), single (') or double (") quotes, less than (<), or greater than (>) and can be from 2 to 60 characters long"); + $h .= labeledFormItem('name', i('Name'), 'text', '^([A-Za-z0-9!@#$%^&\*\(\)_=\+\[\]{}\\\|:;,\./\?~` ]){2,60}$', 1, '', $errmsg); # owner $extra = array('onKeyPress' => 'setOwnerChecking'); - $h .= labeledFormItem('owner', _('Owner'), 'text', '', 1, '', _('Unknown user'), + $h .= labeledFormItem('owner', i('Owner'), 'text', '', 1, '', i('Unknown user'), 'checkOwner', $extra); - #$h .= labeledFormItem('owner', _('Owner'), 'text', '{$user['unityid']}@{$user['affiliation']}', - # 1, '', _('Unknown user'), 'checkOwner', 'onKeyPress', 'setOwnerChecking'); + #$h .= labeledFormItem('owner', i('Owner'), 'text', '{$user['unityid']}@{$user['affiliation']}', + # 1, '', i('Unknown user'), 'checkOwner', 'onKeyPress', 'setOwnerChecking'); $cont = addContinuationsEntry('AJvalidateUserid'); $h .= "<input type=\"hidden\" id=\"valuseridcont\" value=\"$cont\">\n"; # description $h .= "<fieldset>\n"; - $h .= "<legend>" . _("Image Description") . "</legend>\n"; - $h .= _("Description of image (required - users will see this on the <strong>New Reservations</strong> page):"); + $h .= "<legend>" . i("Image Description") . "</legend>\n"; + $h .= i("Description of image (required - users will see this on the <strong>New Reservations</strong> page):"); $h .= "<br>\n"; $h .= "<textarea dojoType=\"dijit.form.Textarea\" id=\"description\" "; $h .= "style=\"width: 400px; text-align: left;\"></textarea>\n"; $h .= "</fieldset>\n"; # usage notes $h .= "<fieldset>\n"; - $h .= "<legend>" . _("Usage Notes") . "</legend>\n"; - $msg = _("Optional notes to the user explaining how to use the image (users will see this on the <strong>Connect!</strong> page):"); + $h .= "<legend>" . i("Usage Notes") . "</legend>\n"; + $msg = i("Optional notes to the user explaining how to use the image (users will see this on the <strong>Connect!</strong> page):"); $h .= preg_replace("/(.{1,100}([ \n]|$))/", '\1<br>', $msg); $h .= "<textarea dojoType=\"dijit.form.Textarea\" id=\"usage\" "; $h .= "style=\"width: 400px; text-align: left;\"></textarea>\n"; $h .= "</fieldset>\n"; if($add) { $h .= "<fieldset>\n"; - $h .= "<legend>" . _("Revision Comments") . "</legend>\n"; - $msg = _("Notes for yourself and other admins about how the image was setup/installed. These are optional and are not visible to end users."); + $h .= "<legend>" . i("Revision Comments") . "</legend>\n"; + $msg = i("Notes for yourself and other admins about how the image was setup/installed. These are optional and are not visible to end users."); $h .= preg_replace("/(.{1,80}([ \n]|$))/", '\1<br>', $msg); $h .= "<textarea dojoType=\"dijit.form.Textarea\" id=\"imgcomments\" "; $h .= "style=\"width: 400px; text-align: left;\"></textarea>"; @@ -371,20 +371,20 @@ class Image extends Resource { } # advanced options $h .= "<div dojoType=\"dijit.TitlePane\" title=\""; - $h .= _("Advanced Options - leave default values unless you really know what you are doing (click to expand)"); + $h .= i("Advanced Options - leave default values unless you really know what you are doing (click to expand)"); $h .= "\" open=\"false\" style=\"width: 460px\" id=\"advancedoptions\" "; $h .= "onShow=\"delayedEditResize();\" onHide=\"delayedEditResize();\">\n"; # RAM $extra = array('smallDelta' => 256, 'largeDelta' => 1024); - $h .= labeledFormItem('ram', _('Required RAM'), 'spinner', '{min:512, max:8388607}', + $h .= labeledFormItem('ram', i('Required RAM'), 'spinner', '{min:512, max:8388607}', 1, 1024, '', '', $extra); # cores $extra = array('smallDelta' => 1, 'largeDelta' => 2); - $h .= labeledFormItem('cores', _('Required Cores'), 'spinner', '{min:1, max:255}', + $h .= labeledFormItem('cores', i('Required Cores'), 'spinner', '{min:1, max:255}', 1, 1, '', '', $extra); # proc speed $extra = array('smallDelta' => 500, 'largeDelta' => 8000); - $h .= labeledFormItem('cpuspeed', _('Processor Speed'), 'spinner', '{min:500, max:8000}', + $h .= labeledFormItem('cpuspeed', i('Processor Speed'), 'spinner', '{min:500, max:8000}', 1, 1000, '', '', $extra); # network speed $vals = array('10' => '10 Mbps', @@ -392,40 +392,40 @@ class Image extends Resource { '1000' => '1 Gbps', '10000' => '10 Gbps', '100000' => '100 Gbps'); - $h .= labeledFormItem('networkspeed', _('Minimum Network Speed'), 'select', $vals); + $h .= labeledFormItem('networkspeed', i('Minimum Network Speed'), 'select', $vals); # concurrent usage $extra = array('smallDelta' => 1, 'largeDelta' => 10); - $h .= labeledFormItem('concurrent', _('Max Concurrent Usage'), 'spinner','{min:0, max:255}', - 1, 0, '', '', $extra, '', _('(0 = unlimited)')); + $h .= labeledFormItem('concurrent', i('Max Concurrent Usage'), 'spinner','{min:0, max:255}', + 1, 0, '', '', $extra, '', i('(0 = unlimited)')); # reload time if(! $add) { $extra = array('smallDelta' => 1, 'largeDelta' => 5); - $h .= labeledFormItem('reload', _('Estimated Reload Time'), 'spinner', + $h .= labeledFormItem('reload', i('Estimated Reload Time'), 'spinner', '{min:1, max:255}', 1, 5, '', '', $extra); } # for checkout $yesno = array('1' => 'Yes', '0' => 'No'); - $h .= labeledFormItem('checkout', _('Available for checkout'), 'select', $yesno); + $h .= labeledFormItem('checkout', i('Available for checkout'), 'select', $yesno); # check user - $h .= labeledFormItem('checkuser', _('Check for logged in user'), 'select', $yesno); + $h .= labeledFormItem('checkuser', i('Check for logged in user'), 'select', $yesno); # admin access - $h .= labeledFormItem('rootaccess', _('Users have administrative access'), 'select', $yesno); + $h .= labeledFormItem('rootaccess', i('Users have administrative access'), 'select', $yesno); # set hostname $h .= "<div id=\"sethostnamediv\">\n"; - $h .= labeledFormItem('sethostname', _('Set computer hostname'), 'select', $yesno); + $h .= labeledFormItem('sethostname', i('Set computer hostname'), 'select', $yesno); $h .= "</div>\n"; # sysprep if($add) { $h .= "<div id=\"sysprepdiv\">\n"; - $h .= labeledFormItem('sysprep', _('Use sysprep'), 'select', $yesno); + $h .= labeledFormItem('sysprep', i('Use sysprep'), 'select', $yesno); $h .= "</div>\n"; } # connect methods - $h .= "<label for=\"connectmethodlist\">" . _("Connect methods:") . "</label>\n"; + $h .= "<label for=\"connectmethodlist\">" . i("Connect methods:") . "</label>\n"; $h .= "<div class=\"labeledform\"><span id=\"connectmethodlist\"></span><br>\n"; $h .= "<div dojoType=\"dijit.form.DropDownButton\" id=\"connectmethoddlg\">\n"; - $h .= " <span>" . _("Modify Connection Methods") . "</span>\n"; + $h .= " <span>" . i("Modify Connection Methods") . "</span>\n"; // if leave off the href attribute, inital sizing of popup is wrong $h .= " <div dojoType=\"dijit.TooltipDialog\" id=\"connectmethodttd\" href=\"\"></div>\n"; $h .= "</div>\n"; @@ -439,7 +439,7 @@ class Image extends Resource { $h .= "<br>\n"; $h .= "<div align=\"center\">\n"; $h .= "<div dojoType=\"dijit.form.DropDownButton\" id=\"subimagebtn\">"; - $h .= " <span>" . _("Manage Subimages") . "</span>\n"; + $h .= " <span>" . i("Manage Subimages") . "</span>\n"; // if leave off the href attribute, inital sizing of popup is wrong $h .= " <div dojoType=\"dijit.TooltipDialog\" id=\"subimagedlg\" href=\"\"></div>\n"; $h .= "</div>\n"; @@ -461,30 +461,30 @@ class Image extends Resource { $h .= "</div>\n"; # addeditdlgcontent $h .= "<div id=\"editdlgbtns\" align=\"center\">\n"; - $h .= dijitButton('addeditbtn', _("Confirm"), "saveResource();"); + $h .= dijitButton('addeditbtn', i("Confirm"), "saveResource();"); $script = " dijit.byId('addeditdlg').hide();\n"; $script .= " dijit.registry.filter(function(widget, index){return widget.id.match(/^comments/);}).forEach(function(widget) {widget.destroy();});\n"; - $h .= dijitButton('', _("Cancel"), $script); + $h .= dijitButton('', i("Cancel"), $script); $h .= "</div>\n"; # editdlgbtns $h .= "</div>\n"; # addeditdlg $h .= "<div dojoType=dijit.Dialog\n"; $h .= " id=\"autoconfirmdlg\"\n"; - $h .= " title=\"" . _("Confirm Manual Install") . "\"\n"; + $h .= " title=\"" . i("Confirm Manual Install") . "\"\n"; $h .= " duration=250\n"; $h .= " draggable=true>\n"; $h .= "<strong><span id=\"autoconfirmcontent\"></span></strong><br><br>\n"; $h .= "<div style=\"width: 230px;\">\n"; - $h .= _("This method cannot be automatically added to the image by VCL. The image must be created with the software for this method already installed. If this image already has software for this method installed in it, please click <strong>Software is Manually Installed</strong>. Otherwise, click cancel."); + $h .= i("This method cannot be automatically added to the image by VCL. The image must be created with the software for this method already installed. If this image already has software for this method installed in it, please click <strong>Software is Manually Installed</strong>. Otherwise, click cancel."); $h .= "</div><br><br>\n"; $h .= " <div align=\"center\">\n"; $script = " dijit.byId('autoconfirmdlg').hide();\n"; $script .= " addConnectMethod3();\n"; $script .= " dijit.byId('connectmethoddlg').openDropDown();\n"; - $h .= dijitButton('', _("Software is Manually Installed"), $script); + $h .= dijitButton('', i("Software is Manually Installed"), $script); $script = " dijit.byId('autoconfirmdlg').hide();\n"; $script .= " dijit.byId('connectmethoddlg').openDropDown();\n"; - $h .= dijitButton('', _("Cancel"), $script); + $h .= dijitButton('', i("Cancel"), $script); $h .= " </div>\n"; $h .= "</div>\n"; # autoconfirmdlg return $h; @@ -505,9 +505,9 @@ class Image extends Resource { $methods = getConnectMethods($imageid); $revisions = getImageRevisions($imageid); - $h = "<h3>" . _("Modify Connection Methods") . "</h3>"; + $h = "<h3>" . i("Modify Connection Methods") . "</h3>"; if(! $newimage && count($revisions) > 1) { - $h .= _("Selected Revision ID:") . " "; + $h .= i("Selected Revision ID:") . " "; $cdata = $this->basecdata; $cdata['imageid'] = $imageid; $cdata['revids'] = array_keys($revisions); @@ -536,12 +536,12 @@ class Image extends Resource { $h .= "<div dojoType=\"dijit.form.Select\" id=\"addcmsel\" "; $h .= "store=\"cmstore\" query=\"{active: 0}\" "; $h .= "onSetStore=\"updateCurrentConMethods();\"></div>"; - $h .= dijitButton('addcmbtn', _("Add Method"), "addConnectMethod();"); + $h .= dijitButton('addcmbtn', i("Add Method"), "addConnectMethod();"); $h .= "<br>"; - $h .= "<h3>" . _("Current Methods") . "</h3>"; + $h .= "<h3>" . i("Current Methods") . "</h3>"; $h .= "<select id=\"curmethodsel\" multiple size=\"5\">"; $h .= "</select><br>"; - $h .= dijitButton('remcmbtn', _("Remove Selected Methods(s)"), "remConnectMethod();"); + $h .= dijitButton('remcmbtn', i("Remove Selected Methods(s)"), "remConnectMethod();"); $h .= "<br>"; $h .= "<div id=\"cmerror\" class=\"rederrormsg\"></div>\n"; $adminimages = getUserResources(array("imageAdmin"), array("administer")); @@ -557,7 +557,7 @@ class Image extends Resource { $h .= "<INPUT type=hidden id=remcmcont value=\"$cont\">"; if(! $newimage) { $h .= "<div style=\"width: 280px;\">\n"; - $h .= _("NOTE: Connection Method changes take effect immediately; you do <strong>not</strong> need to click \"Submit Changes\" to submit them."); + $h .= i("NOTE: Connection Method changes take effect immediately; you do <strong>not</strong> need to click \"Submit Changes\" to submit them."); $h .= "</div>\n"; } print $h; @@ -577,11 +577,11 @@ class Image extends Resource { $resources = getUserResources(array("imageAdmin")); if(empty($resources['image'])) { - print _("You do not have access to add any subimages to this image."); + print i("You do not have access to add any subimages to this image."); return; } - $h = "<h3>" . _("Add New Subimage") . "</h3>"; + $h = "<h3>" . i("Add New Subimage") . "</h3>"; $h .= "<select dojoType=\"dijit.form.FilteringSelect\" id=\"addsubimagesel\">"; foreach($resources['image'] as $id => $name) { if($name == 'No Image') @@ -589,9 +589,9 @@ class Image extends Resource { $h .= "<option value=$id>$name</option>"; } $h .= "</select>"; - $h .= dijitButton('addbtn', _("Add Subimage"), "addSubimage();"); + $h .= dijitButton('addbtn', i("Add Subimage"), "addSubimage();"); $h .= "<br>"; - $h .= "<h3>" . _("Current Subimages") . "</h3>"; + $h .= "<h3>" . i("Current Subimages") . "</h3>"; $subimgcnt = 0; if(array_key_exists("subimages", $image) && count($image["subimages"])) { $subimages = array(); @@ -608,11 +608,11 @@ class Image extends Resource { else { $h .= "<select id=\"cursubimagesel\" multiple size=\"10\" disabled>"; $image['subimages'] = array(); - $h .= "<option value=\"none\">" . _("(None)") . "</option>"; + $h .= "<option value=\"none\">" . i("(None)") . "</option>"; } $h .= "</select><br>"; - $h .= _("total subimages:") . " <span id=subimgcnt>$subimgcnt</span><br>"; - $h .= dijitButton('rembtn', _("Remove Selected Subimage(s)"), "remSubimages();"); + $h .= i("total subimages:") . " <span id=subimgcnt>$subimgcnt</span><br>"; + $h .= dijitButton('rembtn', i("Remove Selected Subimage(s)"), "remSubimages();"); $h .= "<br>"; $adminimages = getUserResources(array("imageAdmin"), array("administer")); $adminids = array_keys($adminimages["image"]); @@ -627,7 +627,7 @@ class Image extends Resource { $cont = addContinuationsEntry('AJremSubimage', $cdata, SECINDAY, 1, 0); $h .= "<INPUT type=\"hidden\" id=\"remsubimagecont\" value=\"$cont\">"; $h .= "<div style=\"width: 320px;\">\n"; - $h .= _("NOTE: Subimage changes take effect immediately; you do <strong>not</strong> need to click \"Submit Changes\" to submit them."); + $h .= i("NOTE: Subimage changes take effect immediately; you do <strong>not</strong> need to click \"Submit Changes\" to submit them."); $h .= "</div>\n"; print $h; } @@ -676,7 +676,7 @@ class Image extends Resource { # save continuation $cont = addContinuationsEntry('AJsaveResource', $cdata); - $ret = array('title' => _("Edit {$this->restypename}"), + $ret = array('title' => i("Edit {$this->restypename}"), 'cont' => $cont, 'resid' => $imageid, 'data' => $data, @@ -863,7 +863,7 @@ class Image extends Resource { # add the image if(! $imageid = $this->addResource($data)) { sendJSON(array('status' => 'adderror', - 'errormsg' => _("Error encountered while trying to create new image.<br>Please contact an admin for assistance."))); + 'errormsg' => i("Error encountered while trying to create new image.<br>Please contact an admin for assistance."))); return; } @@ -1266,22 +1266,22 @@ class Image extends Resource { function getRevisionHTML($imageid) { $revisions = getImageRevisions($imageid); $rt = ''; - $rt .= "<h3>" . _("Revisions of this Image") . "</h3>\n"; + $rt .= "<h3>" . i("Revisions of this Image") . "</h3>\n"; $rt .= "<table summary=\"\"><tr><td>\n"; if(count($revisions) > 1 && isImageBlockTimeActive($imageid)) { $rt .= "<font color=\"red\">"; - $warn = _("WARNING: This image is part of an active block allocation. Changing the production revision of the image at this time will result in new reservations under the block allocation to have full reload times instead of a < 1 minutes wait."); + $warn = i("WARNING: This image is part of an active block allocation. Changing the production revision of the image at this time will result in new reservations under the block allocation to have full reload times instead of a < 1 minutes wait."); $rt .= preg_replace("/(.{1,100}([ \n]|$))/", '\1<br>', $warn); $rt .= "</font><br>\n"; } $rt .= "<table summary=\"\" id=\"revisiontable\">\n"; $rt .= " <tr>\n"; $rt .= " <td></td>\n"; - $rt .= " <th>" . _("Revision") . "</th>\n"; - $rt .= " <th>" . _("Creator") . "</th>\n"; - $rt .= " <th>" . _("Created") . "</th>\n"; - $rt .= " <th nowrap>" . _("In Production") . "</th>\n"; - $rt .= " <th>" . _("Comments (click to edit)") . "</th>\n"; + $rt .= " <th>" . i("Revision") . "</th>\n"; + $rt .= " <th>" . i("Creator") . "</th>\n"; + $rt .= " <th>" . i("Created") . "</th>\n"; + $rt .= " <th nowrap>" . i("In Production") . "</th>\n"; + $rt .= " <th>" . i("Comments (click to edit)") . "</th>\n"; $rt .= " </tr>\n"; foreach($revisions AS $rev) { if($rev['deleted'] == 1) @@ -1325,7 +1325,7 @@ class Image extends Resource { $cont = addContinuationsEntry('AJdeleteRevisions', $cdata); $ids = implode(',', $keys); $rt .= "<button onclick=\"deleteRevisions('$cont', '$ids'); return false;\">"; - $rt .= _("Delete selected revisions") . "</button>\n"; + $rt .= i("Delete selected revisions") . "</button>\n"; $rt .= "</div>\n"; $rt .= "</td></tr></table>\n"; return $rt; @@ -1346,14 +1346,14 @@ class Image extends Resource { $imagemetaid = getContinuationVar('imagemetaid'); if(! in_array($imageid, $adminids)) { $arr = array('error' => 'noimageaccess', - 'msg' => _("You do not have access to manage this image.")); + 'msg' => i("You do not have access to manage this image.")); sendJSON($arr); return; } $newid = processInputVar('imageid', ARG_NUMERIC); if(! in_array($newid, $userimageids)) { $arr = array('error' => 'nosubimageaccess', - 'msg' => _("You do not have access to add this subimage.")); + 'msg' => i("You do not have access to add this subimage.")); sendJSON($arr); return; } @@ -1413,7 +1413,7 @@ class Image extends Resource { $imagemetaid = getContinuationVar('imagemetaid'); if(! in_array($imageid, $adminids)) { $arr = array('error' => 'noimageaccess', - 'msg' => _("You do not have access to manage this image.")); + 'msg' => i("You do not have access to manage this image.")); sendJSON($arr); return; } @@ -1422,14 +1422,14 @@ class Image extends Resource { foreach($remids as $id) { if(! is_numeric($id)) { $arr = array('error' => 'invalidinput', - 'msg' => _("Non-numeric data was submitted for an image id.")); + 'msg' => i("Non-numeric data was submitted for an image id.")); sendJSON($arr); return; } } if(is_null($imagemetaid)) { $arr = array('error' => 'nullimagemetaid', - 'msg' => _("Invalid infomation in database. Contact your system administrator.")); + 'msg' => i("Invalid infomation in database. Contact your system administrator.")); sendJSON($arr); return; } @@ -1566,11 +1566,11 @@ class Image extends Resource { if(preg_match("/[-'\"]/", $return["name"]) || strlen($return["name"]) > 60 || strlen($return["name"]) < 2) { $return['error'] = 1; - $errormsg[] = _("Name must be from 2 to 60 characters and cannot contain any dashes (-), single (') or double (\") quotes."); + $errormsg[] = i("Name must be from 2 to 60 characters and cannot contain any dashes (-), single (') or double (\") quotes."); } elseif(! preg_match('/^[\x20-\x7E]+$/', $return["name"])) { $return['error'] = 1; - $errormsg[] = _("Name can only contain alphabets, numbers, signs, and spaces."); + $errormsg[] = i("Name can only contain alphabets, numbers, signs, and spaces."); } else { if($return['mode'] == 'edit') @@ -1579,64 +1579,64 @@ class Image extends Resource { $imageid = ''; if($this->checkForImageName($return["name"], "long", $imageid)) { $return['error'] = 1; - $errormsg[] = _("An image already exists with this name."); + $errormsg[] = i("An image already exists with this name."); } } if($return["ram"] < 0 || $return["ram"] > 8388607) { $return['error'] = 1; - $errormsg[] = _("RAM must be between 0 and 8388607"); + $errormsg[] = i("RAM must be between 0 and 8388607"); } if($return["cores"] < 0 || $return["cores"] > 255) { $return['error'] = 1; - $errormsg[] = _("Cores must be between 0 and 255"); + $errormsg[] = i("Cores must be between 0 and 255"); } if($return["cpuspeed"] < 0 || $return["cpuspeed"] > 20000) { $return['error'] = 1; - $errormsg[] = _("Processor Speed must be between 0 and 20000"); + $errormsg[] = i("Processor Speed must be between 0 and 20000"); } $lognetwork = log10($return['networkspeed']); if($lognetwork < 1 || $lognetwork > 5) { $return['error'] = 1; - $errormsg[] = _("Invalid value submitted for network speed"); + $errormsg[] = i("Invalid value submitted for network speed"); } if((! is_numeric($return['concurrent']) && ! empty($return['concurrent'])) || (is_numeric($return['concurrent']) && ($return["concurrent"] < 0 || $return["concurrent"] > 255))) { $return['error'] = 1; - $errormsg[] = _("Max concurrent usage must be between 0 and 255"); + $errormsg[] = i("Max concurrent usage must be between 0 and 255"); } if($return['mode'] == 'edit' && ($return["reload"] < 0 || $return["reload"] > 120)) { $return['error'] = 1; - $errormsg[] = _("Estimated Reload Time must be between 0 and 120"); + $errormsg[] = i("Estimated Reload Time must be between 0 and 120"); } if(! validateUserid($return["owner"])) { $return['error'] = 1; - $errormsg[] = _("Submitted ID is not valid"); + $errormsg[] = i("Submitted ID is not valid"); } if($return['checkout'] != 0 && $return['checkout'] != 1) { $return['error'] = 1; - $errormsg[] = _("Available for checkout must be Yes or No"); + $errormsg[] = i("Available for checkout must be Yes or No"); } if($return['checkuser'] != 0 && $return['checkuser'] != 1) { $return['error'] = 1; - $errormsg[] = _("Check for logged in user must be Yes or No"); + $errormsg[] = i("Check for logged in user must be Yes or No"); } if($return['rootaccess'] != 0 && $return['rootaccess'] != 1) { $return['error'] = 1; - $errormsg[] = _("Users have administrative access must be Yes or No"); + $errormsg[] = i("Users have administrative access must be Yes or No"); } if($return['sethostname'] != 0 && $return['sethostname'] != 1) { $return['error'] = 1; - $errormsg[] = _("Set computer hostname must be Yes or No"); + $errormsg[] = i("Set computer hostname must be Yes or No"); } if($return['mode'] == 'add' && $return['sysprep'] != 0 && $return['sysprep'] != 1) { $return['error'] = 1; - $errormsg[] = _("Use sysprep must be Yes or No"); + $errormsg[] = i("Use sysprep must be Yes or No"); } if(empty($return['desc'])) { $return['error'] = 1; - $errormsg[] = _("You must include a description of the image") . "<br>"; + $errormsg[] = i("You must include a description of the image") . "<br>"; } if($return['mode'] == 'add') { if(! preg_match('/^[,0-9]+$/', $return['connectmethodids'])) { @@ -1933,13 +1933,13 @@ class Image extends Resource { $newimage = getContinuationVar('newimage'); if(! array_key_exists($newid, $methods)) { $arr = array('error' => 'invalidmethod', - 'msg' => _("Invalid method submitted.")); + 'msg' => i("Invalid method submitted.")); sendJSON($arr); return; } if($revid != 0 && ! in_array($revid, $revids)) { $arr = array('error' => 'invalidrevision', - 'msg' => _("Invalid revision id submitted.")); + 'msg' => i("Invalid revision id submitted.")); sendJSON($arr); return; } @@ -2022,14 +2022,14 @@ class Image extends Resource { foreach($remids as $id) { if(! is_numeric($id)) { $arr = array('error' => 'invalidinput', - 'msg' => _("Non-numeric data was submitted for a connection method id.")); + 'msg' => i("Non-numeric data was submitted for a connection method id.")); sendJSON($arr); return; } } if($revid != 0 && ! in_array($revid, $revids)) { $arr = array('error' => 'invalidrevision', - 'msg' => _("Invalid revision id submitted.")); + 'msg' => i("Invalid revision id submitted.")); sendJSON($arr); return; } @@ -2170,7 +2170,7 @@ class Image extends Resource { $inuseids[] = $row['revision']; $inuseids = implode(',', $inuseids); $rc = array('status' => 'error', - 'msg' => _("The following revisions are in use and cannot be deleted at this time:") . " $inuseids"); + 'msg' => i("The following revisions are in use and cannot be deleted at this time:") . " $inuseids"); sendJSON($rc); return; } Modified: vcl/trunk/web/.ht-inc/managementnode.php URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/managementnode.php?rev=1692548&r1=1692547&r2=1692548&view=diff ============================================================================== --- vcl/trunk/web/.ht-inc/managementnode.php (original) +++ vcl/trunk/web/.ht-inc/managementnode.php Fri Jul 24 16:28:20 2015 @@ -292,13 +292,13 @@ class ManagementNode extends Resource { #$h .= "<div style=\"width: 80%; margin-left: 10%;\">\n"; # name - $errmsg = _("Name can only contain letters, numbers, dashes(-), periods(.), and underscores(_). It can be from 1 to 50 characters long."); - $h .= labeledFormItem('name', _('Name') . '*', 'text', '^([a-zA-Z0-9_][-a-zA-Z0-9_\.]{1,49})$', + $errmsg = i("Name can only contain letters, numbers, dashes(-), periods(.), and underscores(_). It can be from 1 to 50 characters long."); + $h .= labeledFormItem('name', i('Name') . '*', 'text', '^([a-zA-Z0-9_][-a-zA-Z0-9_\.]{1,49})$', 1, '', $errmsg); # owner $extra = array('onKeyPress' => 'setOwnerChecking'); - $h .= labeledFormItem('owner', _('Owner') . '*', 'text', '', 1, - "{$user['unityid']}@{$user['affiliation']}", _('Unknown user'), + $h .= labeledFormItem('owner', i('Owner') . '*', 'text', '', 1, + "{$user['unityid']}@{$user['affiliation']}", i('Unknown user'), 'checkOwner', $extra); $cont = addContinuationsEntry('AJvalidateUserid'); $h .= "<input type=\"hidden\" id=\"valuseridcont\" value=\"$cont\">\n"; @@ -306,77 +306,77 @@ class ManagementNode extends Resource { # IP address $ipreg = '(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)'; $ipreg1 = "^$ipreg$"; - $errmsg = _("Invalid IP address specified - must be a valid IPV4 address"); - $h .= labeledFormItem('ipaddress', _('IP Address') . '*', 'text', $ipreg1, 1, '', $errmsg); + $errmsg = i("Invalid IP address specified - must be a valid IPV4 address"); + $h .= labeledFormItem('ipaddress', i('IP Address') . '*', 'text', $ipreg1, 1, '', $errmsg); # State $vals = array(2 => "available", 10 => "maintenance", 5 => "failed"); - $h .= labeledFormItem('stateid', _('State'), 'select', $vals); + $h .= labeledFormItem('stateid', i('State'), 'select', $vals); # sysadmin email $reg = '^([A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4},)*([A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4})$'; - $errmsg = _("Invalid email address(es) specified"); - $h .= labeledFormItem('sysadminemail', _("SysAdmin Email Address(es)"), 'text', $reg, 0, '', + $errmsg = i("Invalid email address(es) specified"); + $h .= labeledFormItem('sysadminemail', i("SysAdmin Email Address(es)"), 'text', $reg, 0, '', $errmsg, '', '', '', helpIcon('sysadminemailhelp')); # shared mailbox $reg = '^([A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4})$'; - $errmsg = _("Invalid email address specified"); - $h .= labeledFormItem('sharedmailbox', _('Address for Shadow Emails'), 'text', $reg, 0, '', + $errmsg = i("Invalid email address specified"); + $h .= labeledFormItem('sharedmailbox', i('Address for Shadow Emails'), 'text', $reg, 0, '', $errmsg, '', '', '', helpIcon('sharedmailboxhelp')); # checkininterval $extra = array('smallDelta' => 1, 'largeDelta' => 2); - $h .= labeledFormItem('checkininterval', _('Check-in Interval (sec)'), 'spinner', '{min:5,max:30,places:0}', + $h .= labeledFormItem('checkininterval', i('Check-in Interval (sec)'), 'spinner', '{min:5,max:30,places:0}', 1, '6', '', '', $extra, '', helpIcon('checkinhelp')); # installpath $reg = '^([-a-zA-Z0-9_\.\/]){2,100}$'; - $errmsg = _("Invalid install path specified"); - $h .= labeledFormItem('installpath', _('Install Path'), 'text', $reg, 0, '', $errmsg, + $errmsg = i("Invalid install path specified"); + $h .= labeledFormItem('installpath', i('Install Path'), 'text', $reg, 0, '', $errmsg, '', '', '', helpIcon('installpathhelp')); # timeserver list $reg = '^(([a-zA-Z0-9_][-a-zA-Z0-9_\.]{1,49})(,?)){1,5}$'; - $errmsg = _("Invalid time server(s) specified. Must be comman delimited list of hostnames or IP addresses, with up to 5 allowed"); + $errmsg = i("Invalid time server(s) specified. Must be comman delimited list of hostnames or IP addresses, with up to 5 allowed"); $val = getVariable('timesource|global'); - $h .= labeledFormItem('timeservers', _('Time Server(s)'), 'text', $reg, 0, $val, $errmsg, + $h .= labeledFormItem('timeservers', i('Time Server(s)'), 'text', $reg, 0, $val, $errmsg, '', '', '', helpIcon('timeservershelp')); # keys $reg = '^([-a-zA-Z0-9_\.\/,]){2,1024}$'; - $errmsg = _("Invalid path to identity key files"); - $h .= labeledFormItem('keys', _('End Node SSH Identity Key Files'), 'text', $reg, 0, '', $errmsg, + $errmsg = i("Invalid path to identity key files"); + $h .= labeledFormItem('keys', i('End Node SSH Identity Key Files'), 'text', $reg, 0, '', $errmsg, '', '', '', helpIcon('identityhelp')); # sshport $extra = array('smallDelta' => 1, 'largeDelta' => 2); - $h .= labeledFormItem('sshport', _('SSH Port for this node'), 'spinner', '{min:1,max:65535,places:0}', + $h .= labeledFormItem('sshport', i('SSH Port for this node'), 'spinner', '{min:1,max:65535,places:0}', 1, '22', '', '', $extra, '', helpIcon('sshporthelp')); # image library $h .= "<div class=\"boxedoptions\">\n"; # imagelibenable $extra = array('onChange' => 'toggleImageLibrary();'); - $h .= labeledFormItem('imagelibenable', _('Enable Image Library'), 'check', '', '', '', '', '', + $h .= labeledFormItem('imagelibenable', i('Enable Image Library'), 'check', '', '', '', '', '', $extra, '', helpIcon('imagelibhelp')); # imagelibgroupid $disabled = array('disabled' => 'true'); $vals = getUserResources(array('mgmtNodeAdmin'), array("manageGroup"), 1); - $h .= labeledFormItem('imagelibgroupid', _('Image Library Management Node Group'), 'select', + $h .= labeledFormItem('imagelibgroupid', i('Image Library Management Node Group'), 'select', $vals['managementnode'], '', '', '', '', $disabled, '', helpIcon('imagelibgrouphelp')); # imagelibuser $reg = '^([-a-zA-Z0-9_\.\/,]){2,20}$'; - $errmsg = _("Invalid image library user"); - $h .= labeledFormItem('imagelibuser', _('Image Library User'), 'text', $reg, 0, '', $errmsg, + $errmsg = i("Invalid image library user"); + $h .= labeledFormItem('imagelibuser', i('Image Library User'), 'text', $reg, 0, '', $errmsg, '', $disabled, '', helpIcon('imagelibuserhelp')); # imagelibkey $reg = '^([-a-zA-Z0-9_\.\/,]){2,100}$'; - $errmsg = _("Invalid image library identity key"); - $h .= labeledFormItem('imagelibkey', _('Image Library SSH Identity Key File'), 'text', $reg, 0, '', $errmsg, + $errmsg = i("Invalid image library identity key"); + $h .= labeledFormItem('imagelibkey', i('Image Library SSH Identity Key File'), 'text', $reg, 0, '', $errmsg, '', $disabled, '', helpIcon('imagelibkeyhelp')); $h .= "</div>\n"; # image library @@ -387,47 +387,47 @@ class ManagementNode extends Resource { $vals = array('dynamicDHCP' => 'Dynamic DHCP', 'manualDHCP' => 'Manual DHCP', 'static' => 'Static'); - $h .= labeledFormItem('publicIPconfig', _('Public NIC configuration method'), 'select', $vals, + $h .= labeledFormItem('publicIPconfig', i('Public NIC configuration method'), 'select', $vals, '', '', '', '', $extra, '', helpIcon('ipconfighelp')); # netmask - $errmsg = _("Invalid public netmask"); - $h .= labeledFormItem('publicnetmask', _('Public Netmask'), 'text', $ipreg1, 0, '', $errmsg, + $errmsg = i("Invalid public netmask"); + $h .= labeledFormItem('publicnetmask', i('Public Netmask'), 'text', $ipreg1, 0, '', $errmsg, '', $disabled, '', helpIcon('netmaskhelp')); # gateway $reg = '^[a-zA-Z0-9_][-a-zA-Z0-9_\.]{1,56}$'; - $errmsg = _("Invalid public gateway"); - $h .= labeledFormItem('publicgateway', _('Public Gateway'), 'text', $reg, 0, '', $errmsg, + $errmsg = i("Invalid public gateway"); + $h .= labeledFormItem('publicgateway', i('Public Gateway'), 'text', $reg, 0, '', $errmsg, '', $disabled, '', helpIcon('gatewayhelp')); # dnsserver $reg = "^($ipreg,)*($ipreg)$"; - $errmsg = _("Invalid public DNS server"); - $h .= labeledFormItem('publicdnsserver', _('Public DNS Server'), 'text', $reg, 0, '', $errmsg, + $errmsg = i("Invalid public DNS server"); + $h .= labeledFormItem('publicdnsserver', i('Public DNS Server'), 'text', $reg, 0, '', $errmsg, '', $disabled, '', helpIcon('dnsserverhelp')); $h .= "</div>\n"; # IP config method # available public networks - $h .= labeledFormItem('availablenetworks', _('Available Public Networks'), 'textarea', '', 1, + $h .= labeledFormItem('availablenetworks', i('Available Public Networks'), 'textarea', '', 1, '', '', '', '', '', helpIcon('availnetshelp')); # federated auth - $h .= labeledFormItem('federatedauth', _('Affiliations using Federated Authentication for Linux Images'), + $h .= labeledFormItem('federatedauth', i('Affiliations using Federated Authentication for Linux Images'), 'textarea', '', 1, '', '', '', '', '', helpIcon('federatedauthhelp')); # NAT Host $h .= "<div id=\"nathost\" class=\"boxedoptions\">\n"; # use as NAT host $extra = array('onChange' => "toggleNAThost();"); - $h .= labeledFormItem('nathostenabled', _('Use as NAT Host'), 'check', '', '', '1', '', '', $extra); + $h .= labeledFormItem('nathostenabled', i('Use as NAT Host'), 'check', '', '', '1', '', '', $extra); # public IP - $errmsg = _("Invalid NAT Public IP address specified - must be a valid IPV4 address"); - $h .= labeledFormItem('natpublicipaddress', _('NAT Public IP Address'), 'text', $ipreg1, 1, '', $errmsg, + $errmsg = i("Invalid NAT Public IP address specified - must be a valid IPV4 address"); + $h .= labeledFormItem('natpublicipaddress', i('NAT Public IP Address'), 'text', $ipreg1, 1, '', $errmsg, '', '', '', helpIcon('natpubliciphelp')); # internal IP - $errmsg = _("Invalid NAT Internal IP address specified - must be a valid IPV4 address"); - $h .= labeledFormItem('natinternalipaddress', _('NAT Internal IP Address'), 'text', $ipreg1, 1, '', $errmsg, + $errmsg = i("Invalid NAT Internal IP address specified - must be a valid IPV4 address"); + $h .= labeledFormItem('natinternalipaddress', i('NAT Internal IP Address'), 'text', $ipreg1, 1, '', $errmsg, '', '', '', helpIcon('natinternaliphelp')); $h .= "</div>\n"; # NAT Host @@ -466,25 +466,25 @@ class ManagementNode extends Resource { $h .= "</div>\n"; # groupdlg $h .= "<div id=\"tooltips\">\n"; - $h .= helpTooltip('sysadminemailhelp', _("Comma delimited list of email addresses for sysadmins who should receive error emails from this management node. Leave empty to disable this feature.")); - $h .= helpTooltip('sharedmailboxhelp', _("Single email address to which copies of all user emails should be sent. This is a high traffic set of emails. Leave empty to disable this feature.")); - $h .= helpTooltip('checkinhelp', _("the number of seconds that this management node will wait before checking the database for tasks.")); - $h .= helpTooltip('installpathhelp', _("path to parent directory of image repository directories (typically /install) - only needed with bare metal installs or VMWare with local disk")); - $h .= helpTooltip('timeservershelp', _("comma delimited list of time servers for this management node")); - $h .= helpTooltip('identityhelp', _("comma delimited list of full paths to ssh identity keys to try when connecting to end nodes (optional)")); - $h .= helpTooltip('sshporthelp', _("SSH port this node is listening on for image file transfers")); - $h .= helpTooltip('imagelibhelp', _("Enable sharing of images between management nodes. This allows a management node to attempt fetching files for a requested image from other management nodes if it does not have them.")); - $h .= helpTooltip('imagelibgrouphelp', _("This management node will try to get image files from other nodes in the selected group.")); - $h .= helpTooltip('imagelibuserhelp', _("userid to use for scp when copying image files from another management node")); - $h .= helpTooltip('imagelibkeyhelp', _("path to ssh identity key file to use for scp when copying image files from another management node")); - $h .= helpTooltip('ipconfighelp', _("Method by which public NIC on nodes controlled by this management node recive their network configuration <ul><li>Dynamic DHCP - nodes receive an address via DHCP from a pool of addresses</li><li>Manual DHCP - nodes always receive the same address via DHCP</li><li>Static - VCL will configure the public address of the node</li></ul>")); - $h .= helpTooltip('netmaskhelp', _("Netmask for public NIC")); - $h .= helpTooltip('gatewayhelp', _("IP address of gateway for public NIC")); - $h .= helpTooltip('dnsserverhelp', _("comma delimited list of IP addresses of DNS servers for public network")); - $h .= helpTooltip('availnetshelp', _("This is a list of IP networks, one per line, available to nodes deployed by this management node. Networks should be specified in x.x.x.x/yy form. It is for deploying servers having a fixed IP address to ensure a node is selected that can actually be on the specified network.")); - $h .= helpTooltip('federatedauthhelp', _("Comma delimited list of affiliations for which user passwords are not set for Linux image reservations under this management node. Each Linux image is then required to have federated authentication set up so that users' passwords are passed along to the federated authentication system when a user attempts to log in. (for clarity, not set setting user passwords does not mean users have an empty password, but that a federated system must authenticate the users)")); - $h .= helpTooltip('natpubliciphelp', _("message")); - $h .= helpTooltip('natinternaliphelp', _("message 2")); + $h .= helpTooltip('sysadminemailhelp', i("Comma delimited list of email addresses for sysadmins who should receive error emails from this management node. Leave empty to disable this feature.")); + $h .= helpTooltip('sharedmailboxhelp', i("Single email address to which copies of all user emails should be sent. This is a high traffic set of emails. Leave empty to disable this feature.")); + $h .= helpTooltip('checkinhelp', i("the number of seconds that this management node will wait before checking the database for tasks.")); + $h .= helpTooltip('installpathhelp', i("path to parent directory of image repository directories (typically /install) - only needed with bare metal installs or VMWare with local disk")); + $h .= helpTooltip('timeservershelp', i("comma delimited list of time servers for this management node")); + $h .= helpTooltip('identityhelp', i("comma delimited list of full paths to ssh identity keys to try when connecting to end nodes (optional)")); + $h .= helpTooltip('sshporthelp', i("SSH port this node is listening on for image file transfers")); + $h .= helpTooltip('imagelibhelp', i("Enable sharing of images between management nodes. This allows a management node to attempt fetching files for a requested image from other management nodes if it does not have them.")); + $h .= helpTooltip('imagelibgrouphelp', i("This management node will try to get image files from other nodes in the selected group.")); + $h .= helpTooltip('imagelibuserhelp', i("userid to use for scp when copying image files from another management node")); + $h .= helpTooltip('imagelibkeyhelp', i("path to ssh identity key file to use for scp when copying image files from another management node")); + $h .= helpTooltip('ipconfighelp', i("Method by which public NIC on nodes controlled by this management node recive their network configuration <ul><li>Dynamic DHCP - nodes receive an address via DHCP from a pool of addresses</li><li>Manual DHCP - nodes always receive the same address via DHCP</li><li>Static - VCL will configure the public address of the node</li></ul>")); + $h .= helpTooltip('netmaskhelp', i("Netmask for public NIC")); + $h .= helpTooltip('gatewayhelp', i("IP address of gateway for public NIC")); + $h .= helpTooltip('dnsserverhelp', i("comma delimited list of IP addresses of DNS servers for public network")); + $h .= helpTooltip('availnetshelp', i("This is a list of IP networks, one per line, available to nodes deployed by this management node. Networks should be specified in x.x.x.x/yy form. It is for deploying servers having a fixed IP address to ensure a node is selected that can actually be on the specified network.")); + $h .= helpTooltip('federatedauthhelp', i("Comma delimited list of affiliations for which user passwords are not set for Linux image reservations under this management node. Each Linux image is then required to have federated authentication set up so that users' passwords are passed along to the federated authentication system when a user attempts to log in. (for clarity, not set setting user passwords does not mean users have an empty password, but that a federated system must authenticate the users)")); + $h .= helpTooltip('natpubliciphelp', i("message")); + $h .= helpTooltip('natinternaliphelp', i("message 2")); $h .= "</div>\n"; # tooltips return $h; } Modified: vcl/trunk/web/.ht-inc/privileges.php URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/privileges.php?rev=1692548&r1=1692547&r2=1692548&view=diff ============================================================================== --- vcl/trunk/web/.ht-inc/privileges.php (original) +++ vcl/trunk/web/.ht-inc/privileges.php Fri Jul 24 16:28:20 2015 @@ -1098,7 +1098,7 @@ function nodeExists($node) { function validateNodeName($name, &$errmsg) { if(preg_match('/^[-A-Za-z0-9_\. ]+$/', $name)) return 1; - $errmsg = _("Node names can only contain letters, numbers, spaces,<br>dashes(-), dots(.), and underscores(_)."); + $errmsg = i("Node names can only contain letters, numbers, spaces,<br>dashes(-), dots(.), and underscores(_)."); return 0; } @@ -1168,7 +1168,7 @@ function AJsubmitRenameNode() { . "name = '$_newname'"; $qh = doQuery($query, 101); if(mysql_num_rows($qh)) { - $msg = _("A sibling node of that name currently exists"); + $msg = i("A sibling node of that name currently exists"); $arr = array('error' => 2, 'message' => $msg); sendJSON($arr); return;
