Merge pull request #708 from bergware/mutli-language

Multi cache pool support
This commit is contained in:
tom mortensen
2020-06-10 16:22:34 -07:00
committed by GitHub
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -241,7 +241,7 @@ function validate(poolname) {
swal({title:"_(Invalid pool name)_",text:"_(Pool name already exists)_",type:'error',confirmButtonText:"_(Ok)_"});
return false;
} else if (!valid.test(poolname)) {
swal({title:"_(Invalid pool name)_",text:"_(Use lowercase characters with no trailing digits)_",type:'error',confirmButtonText:"_(Ok)_"});
swal({title:"_(Invalid pool name)_",text:"_(Use only lowercase with no special characters or leading/trailing digits)_",type:'error',confirmButtonText:"_(Ok)_"});
return false;
} else {
return true;
+2 -2
View File
@@ -120,10 +120,10 @@ function device_desc(&$disk) {
}
function assignment(&$disk) {
global $var, $devs;
$out = "<form method='POST' name=\"{$disk['name']}Form\" action='/update.htm' target='progressFrame'>";
$out = "<form method='POST' id=\"{$disk['name']}Form\" action='/update.htm' target='progressFrame'>";
$out .= "<input type='hidden' name='changeDevice' value='apply'>";
$out .= "<input type='hidden' name='csrf_token' value='{$var['csrf_token']}'>";
$out .= "<select class=\"slot\" name=\"slotId.{$disk['idx']}\" onChange=\"{$disk['name']}Form.submit()\">";
$out .= "<select class='slot' name='slotId.{$disk['idx']}' onChange='\$(\"#{$disk['name']}Form\").submit()'>";
$empty = $disk['idSb']!='' ? _('no device') : _('unassigned');
if ($disk['id']!='') {
$out .= "<option value=\"{$disk['id']}\" selected>".device_desc($disk)."</option>";