Use `translateText` instead of a local helper
authorNick Fisher <spadgos@gmail.com>
Wed, 17 Dec 2014 16:19:21 +0000 (17:19 +0100)
committerNick Fisher <spadgos@gmail.com>
Wed, 17 Dec 2014 16:19:21 +0000 (17:19 +0100)
client/src/applets/settings.js

index 0428d9dd954bcf315650e67cdacc1ddebe1b90e8..ccf502413d68dd82f6a89f29fc62de203e73c476 100644 (file)
@@ -8,28 +8,24 @@
         },\r
 \r
         initialize: function (options) {\r
-            function t(key, vars) {\r
-                var trans = _kiwi.global.i18n.translate(key);\r
-                return trans.fetch.apply(trans, Array.prototype.slice.call(arguments, 1));\r
-            }\r
             var text = {\r
-                tabs                  : t('client_applets_settings_channelview_tabs'),\r
-                list                  : t('client_applets_settings_channelview_list'),\r
-                large_amounts_of_chans: t('client_applets_settings_channelview_list_notice'),\r
-                join_part             : t('client_applets_settings_notification_joinpart'),\r
-                count_all_activity    : t('client_applets_settings_notification_count_all_activity'),\r
-                timestamps            : t('client_applets_settings_timestamp'),\r
-                timestamp_24          : t('client_applets_settings_timestamp_24_hour'),\r
-                mute                  : t('client_applets_settings_notification_sound'),\r
-                emoticons             : t('client_applets_settings_emoticons'),\r
-                scroll_history        : t('client_applets_settings_history_length'),\r
+                tabs                  : translateText('client_applets_settings_channelview_tabs'),\r
+                list                  : translateText('client_applets_settings_channelview_list'),\r
+                large_amounts_of_chans: translateText('client_applets_settings_channelview_list_notice'),\r
+                join_part             : translateText('client_applets_settings_notification_joinpart'),\r
+                count_all_activity    : translateText('client_applets_settings_notification_count_all_activity'),\r
+                timestamps            : translateText('client_applets_settings_timestamp'),\r
+                timestamp_24          : translateText('client_applets_settings_timestamp_24_hour'),\r
+                mute                  : translateText('client_applets_settings_notification_sound'),\r
+                emoticons             : translateText('client_applets_settings_emoticons'),\r
+                scroll_history        : translateText('client_applets_settings_history_length'),\r
                 languages             : _kiwi.app.translations,\r
-                default_client        : t('client_applets_settings_default_client'),\r
-                make_default          : t('client_applets_settings_default_client_enable'),\r
-                locale_restart_needed : t('client_applets_settings_locale_restart_needed'),\r
-                default_note          : t('client_applets_settings_default_client_notice', '<a href="chrome://settings/handlers">chrome://settings/handlers</a>'),\r
-                html5_notifications   : t('client_applets_settings_html5_notifications'),\r
-                enable_notifications  : t('client_applets_settings_enable_notifications'),\r
+                default_client        : translateText('client_applets_settings_default_client'),\r
+                make_default          : translateText('client_applets_settings_default_client_enable'),\r
+                locale_restart_needed : translateText('client_applets_settings_locale_restart_needed'),\r
+                default_note          : translateText('client_applets_settings_default_client_notice', '<a href="chrome://settings/handlers">chrome://settings/handlers</a>'),\r
+                html5_notifications   : translateText('client_applets_settings_html5_notifications'),\r
+                enable_notifications  : translateText('client_applets_settings_enable_notifications'),\r
                 theme_thumbnails: _.map(_kiwi.app.themes, function (theme) {\r
                     return _.template($('#tmpl_theme_thumbnail').html().trim(), theme);\r
                 })\r
 \r
     var Applet = Backbone.Model.extend({\r
         initialize: function () {\r
-            this.set('title', _kiwi.global.i18n.translate('client_applets_settings_title').fetch());\r
+            this.set('title', translateText('client_applets_settings_title'));\r
             this.view = new View();\r
         }\r
     });\r