baculum: Tweak add Russian language option to select

diff --git a/gui/baculum/Makefile b/gui/baculum/Makefile
index b658937fc14e5949a4f4e19c0573b0371ec38907..c994ba273be44e06cb743e3d5de60b444a16890d 100644 (file)
--- 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 87d3647b8e30d53326a4eec1561d7901c5dfc3a6..df1528f7ce9e524fd7a19b1a7be8dc48c72dadb9 100644 (file)
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 a735851dfd02455716e02b031e5af6b423de4a90..79112edb1f69d82176da0dc26f545438ed6f3094 100644 (file)
--- 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 c0f969d3518491bb0079cf99c6f13cc3e2a7d91e..bc2c65b1660a9332e491276eeb4ed77070c19fc8 100644 (file)
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 9ae8cf33620715f288d56b4964186e94aad2cde3..8e516d6978aca76275a2b1f1f055b884700f6d26 100644 (file)
--- 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 896a7b04b1959cd2b04eb612e0be2ed2036e35e6..4ba9c6880d2f9f989c6fbc2ea02fb518a74f79cd 100644 (file)
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 71af9a8e8b03716c4d5cf8b5b9979c12683e926c..ad3d71e3f455a41fe454c1e8ba1257e009b5fa44 100644 (file)
--- 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 5c5474528db54fb932440edbd8d6dd5d2d489b69..fd078c0260617f21ec13f92b073064a94204477a 100644 (file)
--- a/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.page
+++ b/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.page
@@ -61,9 +61,10 @@
                                <div class="text"><com:TLabel ForControl="Lang" Text="<%[ Language: ]%>" /></div>
                                <div class="field">
                                        <com:TActiveDropDownList ID="Lang" CssClass="textbox" Width="150px" OnTextChanged="setLang" CausesValidation="false" ClientSide.OnComplete="location.reload();">
-                                               <com:TListItem Value="en" Text="<%[ English ]%>" />
-                                               <com:TListItem Value="pl" Text="<%[ Polish ]%>" />
-                                               <com:TListItem Value="pt" Text="<%[ Portuguese ]%>" />
+                                               <com:TListItem Value="en" Text="English" />
+                                               <com:TListItem Value="pl" Text="Polish" />
+                                               <com:TListItem Value="pt" Text="Portuguese" />
+                                               <com:TListItem Value="ru" Text="Russian" />
                                        </com:TActiveDropDownList>
                                        <com:TCompareValidator CssClass="validator-block" Display="Dynamic" ControlToValidate="Lang" DataType="String" ValueToCompare="none" Operator="NotEqual" Text="<%[ Please select language. ]%>" />
                                </div>

diff --git a/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.php b/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.php
index 20ded02a28688e7c4bbcf9a051faefd79c227cf2..a615747e708e05538f78b91a5aea3f30e61cbd98 100644 (file)
--- 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 6d79dd3738b800f4c4c2d688f8d950b86793e2b7..da64c859968de7dd39730ded3561d6e9e1dd1bcd 100644 (file)
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 9992452e5d80b0f78e5a3262bf5f00dbcd7b1950..524fd8d7fcb6243bd314aa6a0f5f67a2c7b415ea 100644 (file)
--- 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 9f73d7e3239bd259daee5b4d4e91d5dad47625e8..c30058fb8295332b094a2ae7d438efd823c6b947 100644 (file)
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 da88b94b54245e262485330c96191499770547d5..2850cab13df474cb2e1ee9f7d61071ca1ac825da 100644 (file)
--- 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 c9aeb04ecf151126f8be1cd8d126c5f7f0e41583..9183a864fedf1b663307e4b401b34ae30cd52d6b 100644 (file)
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 23e644bef67e95b831b1de08b811c01ecf310d88..fe027e422d0f0c1a20d8f1a5b0f05d7aaf2dc0ca 100644 (file)
--- 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 0285d291509c8b8ab4f7b20914b2cf9b06bdb914..7721e920d6bd5e7e60e422aa8ac420cfe4c95a6a 100644 (file)
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 b2f19e0dd480e6e34ca60ef9a8f9819358e61e91..974b065508f10bccca3f5bcecb6edc12da915bb4 100644 (file)
--- 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 dc0c729c6f6a2bfa4760ff56d6f5cc58185c10fb..9dc63bce61d1bfbcd7b528b25240780d134975fb 100644 (file)
--- a/gui/baculum/protected/Web/Pages/WebConfigWizard.page
+++ b/gui/baculum/protected/Web/Pages/WebConfigWizard.page
@@ -122,10 +122,11 @@
                                <div class="w3-third"><com:TLabel ForControl="Lang" Text="<%[ Language: ]%>" /></div>
                                <div class="w3-third">
                                        <com:TActiveDropDownList ID="Lang" CssClass="w3-select w3-border" OnTextChanged="setLang" CausesValidation="false" ClientSide.OnComplete="location.reload();">
-                                               <com:TListItem Value="en" Text="<%[ English ]%>" />
-                                               <com:TListItem Value="pl" Text="<%[ Polish ]%>" />
-                                               <com:TListItem Value="pt" Text="<%[ Portuguese ]%>" />
-                                               <com:TListItem Value="ja" Text="<%[ Japanese ]%>" />
+                                               <com:TListItem Value="en" Text="English" />
+                                               <com:TListItem Value="pl" Text="Polish" />
+                                               <com:TListItem Value="pt" Text="Portuguese" />
+                                               <com:TListItem Value="ja" Text="Japanese" />
+                                               <com:TListItem Value="ru" Text="Russian" />
                                        </com:TActiveDropDownList>
                                        <com:TCompareValidator CssClass="validator-block" Display="Dynamic" ControlToValidate="Lang" DataType="String" ValueToCompare="none" Operator="NotEqual" Text="<%[ Please select language. ]%>" />
                                </div>