From: Tony Lechner <tony.lechner@gmail.com>
Date: Thu, 5 Dec 2013 05:10:24 +0000 (-0600)
Subject: Added hide-join/parts-from-configs to settings screen with en-gb translation only.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=305c4a348aa375603a70bb7e7de91556d64973b4;p=KiwiIRC.git

Added hide-join/parts-from-configs to settings screen with en-gb translation only.
---

diff --git a/client/src/applets/settings.js b/client/src/applets/settings.js
index 32bf855..bc16d37 100644
--- a/client/src/applets/settings.js
+++ b/client/src/applets/settings.js
@@ -13,6 +13,7 @@
                 list: _kiwi.global.i18n.translate('client_applets_settings_channelview_list').fetch(),
                 large_amounts_of_chans: _kiwi.global.i18n.translate('client_applets_settings_channelview_list_notice').fetch(),
                 join_part: _kiwi.global.i18n.translate('client_applets_settings_notification_joinpart').fetch(),
+                count_joins_parts: _kiwi.global.i18n.translate('client_applets_settings_notification_countjoinparts').fetch(),
                 timestamps: _kiwi.global.i18n.translate('client_applets_settings_timestamp').fetch(),
                 mute: _kiwi.global.i18n.translate('client_applets_settings_notification_sound').fetch(),
                 emoticons: _kiwi.global.i18n.translate('client_applets_settings_emoticons').fetch(),
diff --git a/client/src/index.html.tmpl b/client/src/index.html.tmpl
index aeed33d..e1d1778 100644
--- a/client/src/index.html.tmpl
+++ b/client/src/index.html.tmpl
@@ -226,6 +226,12 @@
                             <%= join_part %>
                         </label>
                     </div>
+                    <div class="checkbox">
+                        <label>
+                            <input data-setting="count_joins_parts" type="checkbox">
+                            <%= count_joins_parts %>
+                        </label>
+                    </div>
                     <div class="checkbox">
                         <label>
                             <input data-setting="show_timestamps" type="checkbox">
diff --git a/client/src/translations/en-gb.po b/client/src/translations/en-gb.po
index e25085f..c8c5ca2 100755
--- a/client/src/translations/en-gb.po
+++ b/client/src/translations/en-gb.po
@@ -64,6 +64,10 @@ msgstr "for large amounts of channels"
 msgid "client_applets_settings_notification_joinpart"
 msgstr "Join/part channel notifications"
 
+#: 
+msgid "client_applets_settings_notification_countjoinparts"
+msgstr "Count join/part messages as notifications"
+
 #: 
 msgid "client_applets_settings_timestamp"
 msgstr "Timestamps"