From fcdf388726bc45b2b78a1893a09776e78ef8bf71 Mon Sep 17 00:00:00 2001 From: bergware Date: Sun, 17 May 2020 07:50:01 +0200 Subject: [PATCH 1/4] Multi-language support --- .../include/DockerContainers.php | 2 +- .../include/ShowPlugins.php | 2 +- .../dynamix.vm.manager/include/VMMachines.php | 2 +- plugins/dynamix.vm.manager/include/VMedit.php | 2 +- plugins/dynamix/ArrayOperation.page | 2 +- plugins/dynamix/ShareEdit.page | 2 +- plugins/dynamix/include/DefaultPageLayout.php | 36 +++++++++---------- plugins/dynamix/include/DeviceList.php | 2 +- .../dynamix/include/NotificationsArchive.php | 2 +- plugins/dynamix/include/ShareList.php | 4 +-- plugins/dynamix/include/SmartInfo.php | 2 +- plugins/dynamix/include/TrialRequest.php | 2 +- plugins/dynamix/include/update.crypto.php | 2 +- 13 files changed, 31 insertions(+), 31 deletions(-) diff --git a/plugins/dynamix.docker.manager/include/DockerContainers.php b/plugins/dynamix.docker.manager/include/DockerContainers.php index e52a984b9..7e594ee06 100644 --- a/plugins/dynamix.docker.manager/include/DockerContainers.php +++ b/plugins/dynamix.docker.manager/include/DockerContainers.php @@ -133,7 +133,7 @@ foreach ($containers as $ct) { echo "0%
"; echo "
0 / 0"; echo ""; - echo ""; + echo ""; echo "
"; echo htmlspecialchars(str_replace('Up',_('Uptime'),my_lang_log($ct['Status'])))."
"._('Created')." ".htmlspecialchars(my_lang($ct['Created']))."
"; } diff --git a/plugins/dynamix.plugin.manager/include/ShowPlugins.php b/plugins/dynamix.plugin.manager/include/ShowPlugins.php index ebea00953..6e3721274 100644 --- a/plugins/dynamix.plugin.manager/include/ShowPlugins.php +++ b/plugins/dynamix.plugin.manager/include/ShowPlugins.php @@ -138,7 +138,7 @@ foreach (glob($plugins,GLOB_NOSORT) as $plugin_link) { if ($changes !== false) { $txtfile = "/tmp/plugins/".basename($plugin_file,'.plg').".txt"; file_put_contents($txtfile,$changes); - $version .= " "; + $version .= " "; } //write plugin information $empty = false; diff --git a/plugins/dynamix.vm.manager/include/VMMachines.php b/plugins/dynamix.vm.manager/include/VMMachines.php index 954816109..d895c0909 100644 --- a/plugins/dynamix.vm.manager/include/VMMachines.php +++ b/plugins/dynamix.vm.manager/include/VMMachines.php @@ -114,7 +114,7 @@ foreach ($vms as $vm) { echo "$mem"; echo "$disks"; echo "$graphics"; - echo ""; + echo ""; /* Disk device information */ echo "" : "' style='display:none'>"); diff --git a/plugins/dynamix.vm.manager/include/VMedit.php b/plugins/dynamix.vm.manager/include/VMedit.php index 7c330ee3d..4caac02fd 100644 --- a/plugins/dynamix.vm.manager/include/VMedit.php +++ b/plugins/dynamix.vm.manager/include/VMedit.php @@ -46,7 +46,7 @@ if (!empty($_GET['uuid'])) { $res = $lv->domain_get_domain_by_uuid($_GET['uuid']); if ($res === false) { - echo "

"._('Invalid VM to edit').".

"; + echo "

"._('Invalid VM to edit').".

"; return; } diff --git a/plugins/dynamix/ArrayOperation.page b/plugins/dynamix/ArrayOperation.page index fe73ac917..28c4122dc 100644 --- a/plugins/dynamix/ArrayOperation.page +++ b/plugins/dynamix/ArrayOperation.page @@ -43,7 +43,7 @@ function check_encryption() { echo mk_option(1,'text',_('Passphrase')); echo mk_option(1,'file',_('Keyfile')); echo ""; - echo ""._('Passphrase').":"._('show passphrase').""; + echo ""._('Passphrase').":"._('show passphrase').""; echo ""._('Retype passphrase').":"; echo ""._('Keyfile').":"; } diff --git a/plugins/dynamix/ShareEdit.page b/plugins/dynamix/ShareEdit.page index 6bb4af070..922a14eac 100644 --- a/plugins/dynamix/ShareEdit.page +++ b/plugins/dynamix/ShareEdit.page @@ -35,7 +35,7 @@ if ($name == "") { $share = $shares[$name]; } else { /* handle share deleted case */ - echo "

"._('Share')." '".htmlspecialchars($name)."' "._('has been deleted').".

"; + echo "

"._('Share')." '".htmlspecialchars($name)."' "._('has been deleted').".

"; return; } diff --git a/plugins/dynamix/include/DefaultPageLayout.php b/plugins/dynamix/include/DefaultPageLayout.php index eb6cfdd34..bbadcc4e5 100644 --- a/plugins/dynamix/include/DefaultPageLayout.php +++ b/plugins/dynamix/include/DefaultPageLayout.php @@ -72,7 +72,7 @@ if ($themes2) { } $notes = '/var/tmp/unRAIDServer.txt'; if (!file_exists($notes)) file_put_contents($notes,shell_exec("$docroot/plugins/dynamix.plugin.manager/scripts/plugin changes $docroot/plugins/unRAIDServer/unRAIDServer.plg")); -$notes = " " +$notes = " " ?> @@ -170,7 +170,7 @@ function done(key) { location.replace(path); } function chkDelete(form, button) { - button.value = form.confirmDelete.checked ? '' : ''; + button.value = form.confirmDelete.checked ? "" : ""; button.disabled = false; } function openBox(cmd,title,height,width,load,func,id) { @@ -295,8 +295,8 @@ function hideUpgrade(set) { } function openUpgrade() { hideUpgrade(); - swal({title:' Unraid OS',text:'?',type:'warning',showCancelButton:true,confirmButtonText:'',cancelButtonText:''},function(){ - openBox('/plugins/dynamix.plugin.manager/scripts/plugin&arg1=update&arg2=unRAIDServer.plg',' Unraid OS',600,900,true); + swal({title:" Unraid OS",text:"?",type:'warning',showCancelButton:true,confirmButtonText:"",cancelButtonText:""},function(){ + openBox("/plugins/dynamix.plugin.manager/scripts/plugin&arg1=update&arg2=unRAIDServer.plg"," Unraid OS",600,900,true); }); } function notifier() { @@ -446,7 +446,7 @@ foreach ($buttons as $button) { if (substr($icon,0,3)!='fa-') $icon = "fa-$icon"; $icon = ""; } - $title = $themes2 ? "" : " title='"._($button['Title'])."'"; + $title = $themes2 ? "" : " title=\""._($button['Title'])."\""; echo ""; } else echo "
"; @@ -535,7 +535,7 @@ default: } echo ""; echo "Unraid® webGui ©2020, Lime Technology, Inc."; -echo " "._('manual').""; +echo " "._('manual').""; echo ""; ?>