Merge remote branch 'origin/development' into text_themes

[KiwiIRC.git] / client / src / models / application.js

diff --git a/client/src/models/application.js b/client/src/models/application.js
index ecd5279a897ada76c163a3dbe500dacaf9bf7cc4..7080652b00cee946361ebe82f58e4bb8ba4a26c7 100644 (file)
--- a/client/src/models/application.js
+++ b/client/src/models/application.js
@@ -193,13 +193,13 @@
 \r
                     // Mention the disconnection on every channel\r
                     _kiwi.app.connections.forEach(function(connection) {\r
-                        connection.panels.server.addMsg('', msg, 'action quit');\r
+                        connection.panels.server.addMsg('', styleText('quit', {'%T': msg}), 'action quit');\r
 \r
                         connection.panels.forEach(function(panel) {\r
                             if (!panel.isChannel())\r
                                 return;\r
 \r
-                            panel.addMsg('', msg, 'action quit');\r
+                            panel.addMsg('', styleText('quit', {'%T': msg}), 'action quit');\r
                         });\r
                     });\r
 \r
@@ -212,7 +212,7 @@
 \r
                     // Only need to mention the repeating re-connection messages on server panels\r
                     _kiwi.app.connections.forEach(function(connection) {\r
-                        connection.panels.server.addMsg('', msg, 'action quit');\r
+                        connection.panels.server.addMsg('', styleText('quit', {'%T': msg}), 'action quit');\r
                     });\r
                 });\r
 \r
@@ -228,13 +228,13 @@
 \r
                     // Mention the re-connection on every channel\r
                     _kiwi.app.connections.forEach(function(connection) {\r
-                        connection.panels.server.addMsg('', msg, 'action join');\r
+                        connection.panels.server.addMsg('', styleText('rejoin', {'%T': msg}), 'action join');\r
 \r
                         connection.panels.forEach(function(panel) {\r
                             if (!panel.isChannel())\r
                                 return;\r
 \r
-                            panel.addMsg('', msg, 'action join');\r
+                            panel.addMsg('', styleText('rejoin', {'%T': msg}), 'action join');\r
                         });\r
                     });\r
 \r
@@ -391,13 +391,13 @@
                 }\r
 \r
                 // Read the value to the user\r
-                _kiwi.app.panels().active.addMsg('', setting + ' = ' + _kiwi.global.settings.get(setting).toString());\r
+                _kiwi.app.panels().active.addMsg('', styleText('set_setting', {'%T': setting + ' = ' + _kiwi.global.settings.get(setting).toString()}));\r
             };\r
 \r
 \r
             fn_to_bind['command:save'] = function (ev) {\r
                 _kiwi.global.settings.save();\r
-                _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('client_models_application_settings_saved').fetch());\r
+                _kiwi.app.panels().active.addMsg('', styleText('client_models_application_settings_saved', {'%T': translateText('client_models_application_settings_saved')}));\r
             };\r
 \r
 \r
@@ -407,7 +407,7 @@
                 // No parameters passed so list them\r
                 if (!ev.params[1]) {\r
                     $.each(controlbox.preprocessor.aliases, function (name, rule) {\r
-                        _kiwi.app.panels().server.addMsg(' ', name + '   =>   ' + rule);\r
+                        _kiwi.app.panels().server.addMsg(' ', styleText('list_aliases', {'%T': name + '   =>   ' + rule}));\r
                     });\r
                     return;\r
                 }\r
@@ -439,12 +439,12 @@
                 // No parameters passed so list them\r
                 if (!ev.params[0]) {\r
                     if (list.length > 0) {\r
-                        _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('client_models_application_ignore_title').fetch() + ':');\r
+                        _kiwi.app.panels().active.addMsg(' ', styleText('client_models_application_ignore_title', {'%T': translateText('client_models_application_ignore_title')}));\r
                         $.each(list, function (idx, ignored_pattern) {\r
-                            _kiwi.app.panels().active.addMsg(' ', ignored_pattern);\r
+                            _kiwi.app.panels().active.addMsg(' ', styleText('ignored_pattern', {'%T': ignored_pattern}));\r
                         });\r
                     } else {\r
-                        _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('client_models_application_ignore_none').fetch());\r
+                        _kiwi.app.panels().active.addMsg(' ', styleText('client_models_application_ignore_none', {'%T': translateText('client_models_application_ignore_none')}));\r
                     }\r
                     return;\r
                 }\r
@@ -452,7 +452,7 @@
                 // We have a parameter, so add it\r
                 list.push(ev.params[0]);\r
                 this.connections.active_connection.set('ignore_list', list);\r
-                _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('client_models_application_ignore_nick').fetch(ev.params[0]));\r
+                _kiwi.app.panels().active.addMsg(' ', styleText('client_models_application_ignore_nick', {'%T': translateText('client_models_application_ignore_nick', [ev.params[0]])}));\r
             };\r
 \r
 \r
@@ -460,7 +460,7 @@
                 var list = this.connections.active_connection.get('ignore_list');\r
 \r
                 if (!ev.params[0]) {\r
-                    _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('client_models_application_ignore_stop_notice').fetch());\r
+                    _kiwi.app.panels().active.addMsg(' ', styleText('client_models_application_ignore_stop_notice', {'%T': translateText('client_models_application_ignore_stop_notice')}));\r
                     return;\r
                 }\r
 \r
@@ -470,7 +470,7 @@
 \r
                 this.connections.active_connection.set('ignore_list', list);\r
 \r
-                _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('client_models_application_ignore_stopped').fetch(ev.params[0]));\r
+                _kiwi.app.panels().active.addMsg(' ', styleText('client_models_application_ignore_stopped', {'%T': translateText('client_models_application_ignore_stopped', [ev.params[0]])}));\r
             };\r
 \r
 \r
@@ -530,7 +530,7 @@
 \r
         if (message) {\r
             this.connections.active_connection.gateway.msg(panel.get('name'), message);\r
-            panel.addMsg(_kiwi.app.connections.active_connection.get('nick'), message);\r
+            panel.addMsg(_kiwi.app.connections.active_connection.get('nick'), styleText('query', {'%T': message}));\r
         }\r
 \r
     }\r
@@ -543,7 +543,7 @@
         ev.params.shift();\r
         message = formatToIrcMsg(ev.params.join(' '));\r
 \r
-        panel.addMsg(_kiwi.app.connections.active_connection.get('nick'), message);\r
+        panel.addMsg(_kiwi.app.connections.active_connection.get('nick'), styleText('msg', {'%T': message}));\r
         this.connections.active_connection.gateway.msg(destination, message);\r
     }\r
 \r
@@ -553,7 +553,7 @@
         }\r
 \r
         var panel = _kiwi.app.panels().active;\r
-        panel.addMsg('', '* ' + _kiwi.app.connections.active_connection.get('nick') + ' ' + ev.params.join(' '), 'action');\r
+        panel.addMsg('', styleText('action', {'%T': _kiwi.app.connections.active_connection.get('nick') + ' ' + ev.params.join(' ')}), 'action');\r
         this.connections.active_connection.gateway.action(panel.get('name'), ev.params.join(' '));\r
     }\r
 \r
@@ -668,7 +668,7 @@
             if (_kiwi.applets[ev.params[0]]) {\r
                 panel.load(new _kiwi.applets[ev.params[0]]());\r
             } else {\r
-                _kiwi.app.panels().server.addMsg('', _kiwi.global.i18n.translate('client_models_application_applet_notfound').fetch(ev.params[0]));\r
+                _kiwi.app.panels().server.addMsg('', styleText('client_models_application_applet_notfound', {'%T': translateText('client_models_application_applet_notfound', [ev.params[0]])}));\r
                 return;\r
             }\r
         }\r
@@ -695,7 +695,7 @@
 \r
         _kiwi.app.connections.active_connection.gateway.raw('INVITE ' + nick + ' ' + channel);\r
 \r
-        _kiwi.app.panels().active.addMsg('', '== ' + nick + ' has been invited to ' + channel, 'action');\r
+        _kiwi.app.panels().active.addMsg('', styleText('client_models_application_has_been_invited', {'%N': nick, '%T': translateText('client_models_application_has_been_invited', [channel])}), 'action');\r
     }\r
 \r
 \r
@@ -730,14 +730,14 @@
         if (ev.params[0]) {\r
             _kiwi.gateway.setEncoding(null, ev.params[0], function (success) {\r
                 if (success) {\r
-                    _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('client_models_application_encoding_changed').fetch(ev.params[0]));\r
+                    _kiwi.app.panels().active.addMsg('', styleText('client_models_application_encoding_changed', {'%T': translateText('client_models_application_encoding_changed', [ev.params[0]])}));\r
                 } else {\r
-                    _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('client_models_application_encoding_invalid').fetch(ev.params[0]));\r
+                    _kiwi.app.panels().active.addMsg('', styleText('client_models_application_encoding_invalid', {'%T': translateText('client_models_application_encoding_invalid', [ev.params[0]])}));\r
                 }\r
             });\r
         } else {\r
-            _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('client_models_application_encoding_notspecified').fetch());\r
-            _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('client_models_application_encoding_usage').fetch());\r
+            _kiwi.app.panels().active.addMsg('', styleText('client_models_application_encoding_notspecified', {'%T': translateText('client_models_application_encoding_notspecified')}));\r
+            _kiwi.app.panels().active.addMsg('', styleText('client_models_application_encoding_usage', {'%T': translateText('client_models_application_encoding_usage')}));\r
         }\r
     }\r
 \r
@@ -799,7 +799,7 @@
         // Use the same nick as we currently have\r
         nick = _kiwi.app.connections.active_connection.get('nick');\r
 \r
-        _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('client_models_application_connection_connecting').fetch(server, port.toString()));\r
+        _kiwi.app.panels().active.addMsg('', styleText('client_models_application_connection_connecting', {'%T': translateText('client_models_application_connection_connecting', [server, port.toString()])}));\r
 \r
         _kiwi.gateway.newConnection({\r
             nick: nick,\r
@@ -809,7 +809,7 @@
             password: password\r
         }, function(err, new_connection) {\r
             if (err)\r
-                _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('client_models_application_connection_error').fetch(server, port.toString(), err.toString()));\r
+                _kiwi.app.panels().active.addMsg('', styleText('client_models_application_connection_error', {'%T': translateText('client_models_application_connection_error', [server, port.toString(), err.toString()])}));\r
         });\r
     }\r
 \r