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 32bf8554b8e31a8fb55ef91f7b75eddb253b823c..bc16d376698347fb958cde596eb49233dc80b55d 100644 (file)
--- 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(),\r
                 large_amounts_of_chans: _kiwi.global.i18n.translate('client_applets_settings_channelview_list_notice').fetch(),\r
                 join_part: _kiwi.global.i18n.translate('client_applets_settings_notification_joinpart').fetch(),\r
+                count_joins_parts: _kiwi.global.i18n.translate('client_applets_settings_notification_countjoinparts').fetch(),\r
                 timestamps: _kiwi.global.i18n.translate('client_applets_settings_timestamp').fetch(),\r
                 mute: _kiwi.global.i18n.translate('client_applets_settings_notification_sound').fetch(),\r
                 emoticons: _kiwi.global.i18n.translate('client_applets_settings_emoticons').fetch(),\r

diff --git a/client/src/index.html.tmpl b/client/src/index.html.tmpl
index aeed33dd4e13d4e4153dc52bbd5febd8a1dfc739..e1d1778a672a7525ac5675482af7a833a04dcbdd 100644 (file)
--- a/client/src/index.html.tmpl
+++ b/client/src/index.html.tmpl
@@ -226,6 +226,12 @@
                             <%= join_part %>\r
                         </label>\r
                     </div>\r
+                    <div class="checkbox">\r
+                        <label>\r
+                            <input data-setting="count_joins_parts" type="checkbox">\r
+                            <%= count_joins_parts %>\r
+                        </label>\r
+                    </div>\r
                     <div class="checkbox">\r
                         <label>\r
                             <input data-setting="show_timestamps" type="checkbox">\r

diff --git a/client/src/translations/en-gb.po b/client/src/translations/en-gb.po
index e25085f6578d4511f54a3b47443b06bc0076824e..c8c5ca25e30b4845ac049c156ba104c8aeec1612 100755 (executable)
--- 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"