From: Marcin Haba Date: Tue, 10 Nov 2020 01:58:51 +0000 (+0100) Subject: baculum: Tweak add Russian language option to select X-Git-Tag: Release-9.6.7~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e0fa488a1f4e248dcadddbeaf4b8136a3de9946;p=thirdparty%2Fbacula.git baculum: Tweak add Russian language option to select --- diff --git a/gui/baculum/Makefile b/gui/baculum/Makefile index b658937fc..c994ba273 100644 --- a/gui/baculum/Makefile +++ b/gui/baculum/Makefile @@ -67,8 +67,8 @@ miscfilesrc = index.php \ LICENSE \ README -localeweblang = en pl pt ja -localeapilang = en pl pt +localeweblang = en pl pt ja ru +localeapilang = en pl pt ru localewebdirsrc = $(datadir)/$(webdir)/Lang localeapidirsrc = $(datadir)/$(apidir)/Lang localemofile = messages.mo diff --git a/gui/baculum/protected/API/Lang/en/messages.mo b/gui/baculum/protected/API/Lang/en/messages.mo index 87d3647b8..df1528f7c 100644 Binary files a/gui/baculum/protected/API/Lang/en/messages.mo and b/gui/baculum/protected/API/Lang/en/messages.mo differ diff --git a/gui/baculum/protected/API/Lang/en/messages.po b/gui/baculum/protected/API/Lang/en/messages.po index a735851df..79112edb1 100644 --- a/gui/baculum/protected/API/Lang/en/messages.po +++ b/gui/baculum/protected/API/Lang/en/messages.po @@ -20,15 +20,6 @@ msgstr "Language" msgid "select language" msgstr "select language" -msgid "English" -msgstr "English" - -msgid "Polish" -msgstr "Polish" - -msgid "Portuguese" -msgstr "Portuguese" - msgid "« Previous" msgstr "« Previous" diff --git a/gui/baculum/protected/API/Lang/pl/messages.mo b/gui/baculum/protected/API/Lang/pl/messages.mo index c0f969d35..bc2c65b16 100644 Binary files a/gui/baculum/protected/API/Lang/pl/messages.mo and b/gui/baculum/protected/API/Lang/pl/messages.mo differ diff --git a/gui/baculum/protected/API/Lang/pl/messages.po b/gui/baculum/protected/API/Lang/pl/messages.po index 9ae8cf336..8e516d697 100644 --- a/gui/baculum/protected/API/Lang/pl/messages.po +++ b/gui/baculum/protected/API/Lang/pl/messages.po @@ -24,15 +24,6 @@ msgstr "Język" msgid "select language" msgstr "wybierz język" -msgid "English" -msgstr "angielski" - -msgid "Polish" -msgstr "polski" - -msgid "Portuguese" -msgstr "portugalski" - msgid "« Previous" msgstr "« Wstecz" diff --git a/gui/baculum/protected/API/Lang/pt/messages.mo b/gui/baculum/protected/API/Lang/pt/messages.mo index 896a7b04b..4ba9c6880 100644 Binary files a/gui/baculum/protected/API/Lang/pt/messages.mo and b/gui/baculum/protected/API/Lang/pt/messages.mo differ diff --git a/gui/baculum/protected/API/Lang/pt/messages.po b/gui/baculum/protected/API/Lang/pt/messages.po index 71af9a8e8..ad3d71e3f 100644 --- a/gui/baculum/protected/API/Lang/pt/messages.po +++ b/gui/baculum/protected/API/Lang/pt/messages.po @@ -24,15 +24,6 @@ msgstr "Idioma" msgid "select language" msgstr "selecione o idioma" -msgid "English" -msgstr "Inglês" - -msgid "Polish" -msgstr "Polonês" - -msgid "Portuguese" -msgstr "Português" - msgid "« Previous" msgstr "« Voltar" diff --git a/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.page b/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.page index 5c5474528..fd078c026 100644 --- a/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.page +++ b/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.page @@ -61,9 +61,10 @@
- - - + + + +
diff --git a/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.php b/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.php index 20ded02a2..a615747e7 100644 --- a/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.php +++ b/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.php @@ -79,14 +79,16 @@ class APIInstallWizard extends BaculumAPIPage { public function onInit($param) { parent::onInit($param); - if (isset($_SESSION['language'])) { - $this->Lang->SelectedValue = $_SESSION['language']; - } $config = $this->getModule('api_config'); $this->config = $config->getConfig(); $this->first_run = (count($this->config) === 0); $oauth2_cfg = $this->getModule('oauth2_config')->getConfig(); $this->add_auth_params = (count($oauth2_cfg) === 0); + if (isset($_SESSION['language'])) { + $this->Lang->SelectedValue = $_SESSION['language']; + } elseif (!$this->first_run && isset($this->config['api']['lang'])) { + $this->Lang->SelectedValue = $this->config['api']['lang']; + } } public function onLoad($param) { diff --git a/gui/baculum/protected/Web/Lang/en/messages.mo b/gui/baculum/protected/Web/Lang/en/messages.mo index 6d79dd373..da64c8599 100644 Binary files a/gui/baculum/protected/Web/Lang/en/messages.mo and b/gui/baculum/protected/Web/Lang/en/messages.mo differ diff --git a/gui/baculum/protected/Web/Lang/en/messages.po b/gui/baculum/protected/Web/Lang/en/messages.po index 9992452e5..524fd8d7f 100644 --- a/gui/baculum/protected/Web/Lang/en/messages.po +++ b/gui/baculum/protected/Web/Lang/en/messages.po @@ -17,18 +17,6 @@ msgstr "Language:" msgid "select language" msgstr "select language" -msgid "English" -msgstr "English" - -msgid "Polish" -msgstr "Polish" - -msgid "Portuguese" -msgstr "Portuguese" - -msgid "Japanese" -msgstr "Japanese" - msgid "Language" msgstr "Language" diff --git a/gui/baculum/protected/Web/Lang/ja/messages.mo b/gui/baculum/protected/Web/Lang/ja/messages.mo index 9f73d7e32..c30058fb8 100644 Binary files a/gui/baculum/protected/Web/Lang/ja/messages.mo and b/gui/baculum/protected/Web/Lang/ja/messages.mo differ diff --git a/gui/baculum/protected/Web/Lang/ja/messages.po b/gui/baculum/protected/Web/Lang/ja/messages.po index da88b94b5..2850cab13 100644 --- a/gui/baculum/protected/Web/Lang/ja/messages.po +++ b/gui/baculum/protected/Web/Lang/ja/messages.po @@ -477,9 +477,6 @@ msgstr "Enabled:" msgid "End time" msgstr "終了時間" -msgid "English" -msgstr "English" - msgid "Enter" msgstr "Enter" @@ -691,9 +688,6 @@ msgstr "" "It seems that there is no files for choosing or file records in database for " "this job has been purged (file retention period expired)" -msgid "Japanese" -msgstr "Japanese" - msgid "Job Retention" msgstr "Job Retention" @@ -1126,9 +1120,6 @@ msgstr "Please select language." msgid "Please unassign resource %s \"%s\" from these resources and try again." msgstr "Please unassign resource %s \"%s\" from these resources and try again." -msgid "Polish" -msgstr "Polish" - msgid "Pool" msgstr "Pool" @@ -1153,9 +1144,6 @@ msgstr "Pools" msgid "Port:" msgstr "ポート番号:" -msgid "Portuguese" -msgstr "Portuguese" - msgid "Previous" msgstr "戻る" diff --git a/gui/baculum/protected/Web/Lang/pl/messages.mo b/gui/baculum/protected/Web/Lang/pl/messages.mo index c9aeb04ec..9183a864f 100644 Binary files a/gui/baculum/protected/Web/Lang/pl/messages.mo and b/gui/baculum/protected/Web/Lang/pl/messages.mo differ diff --git a/gui/baculum/protected/Web/Lang/pl/messages.po b/gui/baculum/protected/Web/Lang/pl/messages.po index 23e644bef..fe027e422 100644 --- a/gui/baculum/protected/Web/Lang/pl/messages.po +++ b/gui/baculum/protected/Web/Lang/pl/messages.po @@ -23,18 +23,6 @@ msgstr "Język:" msgid "select language" msgstr "wybierz język" -msgid "English" -msgstr "angielski" - -msgid "Polish" -msgstr "polski" - -msgid "Portuguese" -msgstr "portugalski" - -msgid "Japanese" -msgstr "japoński" - msgid "Language" msgstr "Język" diff --git a/gui/baculum/protected/Web/Lang/pt/messages.mo b/gui/baculum/protected/Web/Lang/pt/messages.mo index 0285d2915..7721e920d 100644 Binary files a/gui/baculum/protected/Web/Lang/pt/messages.mo and b/gui/baculum/protected/Web/Lang/pt/messages.mo differ diff --git a/gui/baculum/protected/Web/Lang/pt/messages.po b/gui/baculum/protected/Web/Lang/pt/messages.po index b2f19e0dd..974b06550 100644 --- a/gui/baculum/protected/Web/Lang/pt/messages.po +++ b/gui/baculum/protected/Web/Lang/pt/messages.po @@ -23,18 +23,6 @@ msgstr "Idioma:" msgid "select language" msgstr "selecione o idioma" -msgid "English" -msgstr "Inglês" - -msgid "Polish" -msgstr "Polonês" - -msgid "Portuguese" -msgstr "Português" - -msgid "Japanese" -msgstr "Japonês" - msgid "Language" msgstr "Idioma" diff --git a/gui/baculum/protected/Web/Pages/WebConfigWizard.page b/gui/baculum/protected/Web/Pages/WebConfigWizard.page index dc0c729c6..9dc63bce6 100644 --- a/gui/baculum/protected/Web/Pages/WebConfigWizard.page +++ b/gui/baculum/protected/Web/Pages/WebConfigWizard.page @@ -122,10 +122,11 @@
- - - - + + + + +