Warn to refresh page after language change

diff --git a/client/assets/css/style.css b/client/assets/css/style.css
index fb24c53c11926fb6c63eb9b06e21017b27df4e97..ba813e5d63257d81e42f87404f5a2f41662d8ff1 100644 (file)
--- a/client/assets/css/style.css
+++ b/client/assets/css/style.css
@@ -379,6 +379,8 @@ html, body { height:100%; }
     margin-bottom: 0;
 }
 
+#kiwi .settings_container section.language select { width:300px; }
+
 @media screen and (max-width: 768px) {
     #kiwi .settings_container {
         padding: 25px;

diff --git a/client/assets/src/applets/settings.js b/client/assets/src/applets/settings.js
index 142d5d7007c6a496a853cfe2b81d8ace4c40ddb9..7b4580a2afd4ef0c25c60cb131aef12e4f12b5ab 100644 (file)
--- a/client/assets/src/applets/settings.js
+++ b/client/assets/src/applets/settings.js
@@ -18,6 +18,7 @@
                 languages: _kiwi.app.translations,\r
                 default_client: _kiwi.global.i18n.translate('client_applets_settings_default_client').fetch(),\r
                 make_default: _kiwi.global.i18n.translate('client_applets_settings_default_client_enable').fetch(),\r
+                locale_restart_needed: _kiwi.global.i18n.translate('client_applets_settings_locale_restart_needed').fetch(),\r
                 default_note: _kiwi.global.i18n.translate('client_applets_settings_default_client_notice').fetch('<a href="chrome://settings/handlers">chrome://settings/handlers</a>')\r
             };\r
             this.$el = $(_.template($('#tmpl_applet_settings').html().trim(), text));\r

diff --git a/client/assets/src/index.html.tmpl b/client/assets/src/index.html.tmpl
index fd80ea8b7d97ba765ff9fce708ca23891950ba20..63fef896a812825659f5d03dc80e8a7d148eda2a 100644 (file)
--- a/client/assets/src/index.html.tmpl
+++ b/client/assets/src/index.html.tmpl
@@ -245,7 +245,7 @@
                 </div>\r
             </section>\r
 \r
-            <section>\r
+            <section class="language">\r
                 <h6>Language</h6>\r
                 <div class="control-group">\r
                     <select data-setting="locale">\r
@@ -253,6 +253,8 @@
                             <option value="<%= lang.tag %>"><%= lang.language %></li>\r
                         <% }); %>\r
                     </select>\r
+                    <br>\r
+                    <small><%= locale_restart_needed %></small>\r
                 </div>\r
             </section>\r
 \r

diff --git a/client/assets/src/translations/de.po b/client/assets/src/translations/de.po
index 6edb330bb1784da71bdb8734c621aee3da41396f..2faa0cd9e2ef7c791fd96f239020edb283c7816c 100755 (executable)
--- a/client/assets/src/translations/de.po
+++ b/client/assets/src/translations/de.po
@@ -57,6 +57,9 @@ msgstr "Standard IRC Client"
 msgid "client_applets_settings_default_client_enable"\r
 msgstr "Setze Kiwi als meinen Standard-IRC Client"\r
 \r
+msgid "client_applets_settings_locale_restart_needed"\r
+msgstr "Notiz: Änderungen werden erst wirksam, nachdem Sie die Seite aktualisieren"\r
+\r
 msgid "client_applets_settings_default_client_notice"\r
 msgstr "Notiz: Nutzer von Chrome oder Chromium müssen ihre Einstellungen durch %s testen, sofern nichts passiert"\r
 \r

diff --git a/client/assets/src/translations/en-gb.po b/client/assets/src/translations/en-gb.po
index 23f3b17bc27f6cc69f166e3c022b817160f223cd..6b1eee8565b24e5a318c07efda93f2315412251b 100755 (executable)
--- a/client/assets/src/translations/en-gb.po
+++ b/client/assets/src/translations/en-gb.po
@@ -57,6 +57,9 @@ msgstr "Default IRC client"
 msgid "client_applets_settings_default_client_enable"\r
 msgstr "Make Kiwi my default IRC client"\r
 \r
+msgid "client_applets_settings_locale_restart_needed"\r
+msgstr "Note: Changes will only take effect after you refresh the page"\r
+\r
 msgid "client_applets_settings_default_client_notice"\r
 msgstr "Note: Chrome or Chromium browser users may need to check their settings via %s if nothing happens"\r
 \r