From b54ef9a321ed0b15485703099fb3ec44632d14f4 Mon Sep 17 00:00:00 2001
From: Darren <darren@darrenwhitlen.com>
Date: Sun, 21 Jul 2013 23:38:30 +0100
Subject: [PATCH] Warn to refresh page after language change
---
client/assets/css/style.css | 2 ++
client/assets/src/applets/settings.js | 1 +
client/assets/src/index.html.tmpl | 4 +++-
client/assets/src/translations/de.po | 3 +++
client/assets/src/translations/en-gb.po | 3 +++
5 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/client/assets/css/style.css b/client/assets/css/style.css
index fb24c53..ba813e5 100644
--- 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 142d5d7..7b4580a 100644
--- a/client/assets/src/applets/settings.js
+++ b/client/assets/src/applets/settings.js
@@ -18,6 +18,7 @@
languages: _kiwi.app.translations,
default_client: _kiwi.global.i18n.translate('client_applets_settings_default_client').fetch(),
make_default: _kiwi.global.i18n.translate('client_applets_settings_default_client_enable').fetch(),
+ locale_restart_needed: _kiwi.global.i18n.translate('client_applets_settings_locale_restart_needed').fetch(),
default_note: _kiwi.global.i18n.translate('client_applets_settings_default_client_notice').fetch('<a href="chrome://settings/handlers">chrome://settings/handlers</a>')
};
this.$el = $(_.template($('#tmpl_applet_settings').html().trim(), text));
diff --git a/client/assets/src/index.html.tmpl b/client/assets/src/index.html.tmpl
index fd80ea8..63fef89 100644
--- a/client/assets/src/index.html.tmpl
+++ b/client/assets/src/index.html.tmpl
@@ -245,7 +245,7 @@
</div>
</section>
- <section>
+ <section class="language">
<h6>Language</h6>
<div class="control-group">
<select data-setting="locale">
@@ -253,6 +253,8 @@
<option value="<%= lang.tag %>"><%= lang.language %></li>
<% }); %>
</select>
+ <br>
+ <small><%= locale_restart_needed %></small>
</div>
</section>
diff --git a/client/assets/src/translations/de.po b/client/assets/src/translations/de.po
index 6edb330..2faa0cd 100755
--- 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"
msgstr "Setze Kiwi als meinen Standard-IRC Client"
+msgid "client_applets_settings_locale_restart_needed"
+msgstr "Notiz: Ãnderungen werden erst wirksam, nachdem Sie die Seite aktualisieren"
+
msgid "client_applets_settings_default_client_notice"
msgstr "Notiz: Nutzer von Chrome oder Chromium müssen ihre Einstellungen durch %s testen, sofern nichts passiert"
diff --git a/client/assets/src/translations/en-gb.po b/client/assets/src/translations/en-gb.po
index 23f3b17..6b1eee8 100755
--- 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"
msgstr "Make Kiwi my default IRC client"
+msgid "client_applets_settings_locale_restart_needed"
+msgstr "Note: Changes will only take effect after you refresh the page"
+
msgid "client_applets_settings_default_client_notice"
msgstr "Note: Chrome or Chromium browser users may need to check their settings via %s if nothing happens"
--
2.25.1