Finishing first run of text themes.

diff --git a/client/assets/text_themes/default.json b/client/assets/text_themes/default.json
index 5b90e8f746229fc06751e78bce01eca737c16f27..902ea409b8693bc07cb8c4de2fda3880ebe55d60 100644 (file)
--- a/client/assets/text_themes/default.json
+++ b/client/assets/text_themes/default.json
@@ -24,6 +24,10 @@
   "client_models_network_idle": "%T",
   "client_models_network_nickname_notfound": "%T",
   "client_models_network_nickname_changed": "%N %T",
+  "client_models_application_applet_notfound": "%T",
+  "client_models_application_has_been_invited": "== %N %T",
+  "client_models_application_encoding_changed": "%T",
+  "client_models_application_encoding_invalid": "%T",
   "chanop_privs_needed": "== %T",
   "no_such_nick": "== %N: %T",
   "unknown_command": "%T",
@@ -34,5 +38,17 @@
   "action": "* %T",
   "whois_ident": "%N [%N!%J@%H] * %T",
   "whois": "%T",
-  "who": "%N [%N!%J@%H] * %R"
+  "who": "%N [%N!%J@%H] * %R",
+  "quit": "%T",
+  "rejoin": "%T",
+  "set_setting": "%T",
+  "save_settings": "%T",
+  "list_aliases": "%T",
+  "ignore_list": "%T:",
+  "ignored_pattern": "%T",
+  "ignore_nick": "%T",
+  "stop_notice": "%T",
+  "ignore_stopped": "%T",
+  "query": "%T",
+  "msg": "%T"
 }
\ No newline at end of file

diff --git a/client/src/helpers/utils.js b/client/src/helpers/utils.js
index f9384c3b5237ec9ed31f58129a5808c1d858cd5b..9c32e02ac3b562d6ec1cfb6095aaa1b72f9add4a 100644 (file)
--- a/client/src/helpers/utils.js
+++ b/client/src/helpers/utils.js
@@ -505,6 +505,8 @@ function parseISO8601(str) {
 
 // Simplyfy the translation syntax
 function translateText(string_id, params) {
+    if (params === undefined) var params = '';
+    
     return _kiwi.global.i18n.translate(string_id).fetch(params);
 }
 // Simplyfy the text styling syntax

diff --git a/client/src/models/application.js b/client/src/models/application.js
index bc60a95be33d6a0023fbe4773fe91e1d23e12cbe..f8e91d3e9b135505d1d8429edba44ec55ed3e1a6 100644 (file)
--- a/client/src/models/application.js
+++ b/client/src/models/application.js
@@ -369,13 +369,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
@@ -388,7 +388,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
@@ -404,13 +404,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
@@ -567,13 +567,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('save_settings', {'%T': translateText('client_models_application_settings_saved')}));\r
             };\r
 \r
 \r
@@ -583,7 +583,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
@@ -615,12 +615,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('ignore_list', {'%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('ignore_list', {'%T': translateText('client_models_application_ignore_none')}));\r
                     }\r
                     return;\r
                 }\r
@@ -628,7 +628,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('ignore_nick', {'%T': translateText('client_models_application_ignore_nick', [ev.params[0]])}));\r
             };\r
 \r
 \r
@@ -636,7 +636,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('stop_notice', {'%T': translateText('client_models_application_ignore_stop_notice')}));\r
                     return;\r
                 }\r
 \r
@@ -646,7 +646,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('ignore_stopped', {'%T': translateText('client_models_application_ignore_stopped', [ev.params[0]])}));\r
             };\r
 \r
 \r
@@ -706,7 +706,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
@@ -719,7 +719,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
@@ -729,7 +729,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
@@ -842,7 +842,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
@@ -869,7 +869,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
@@ -904,14 +904,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
@@ -973,7 +973,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
@@ -983,7 +983,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

diff --git a/client/src/models/network.js b/client/src/models/network.js
index dfd03cc08431781f55511f04e2609eed8c1a30d6..cf8341882dc4b5c2bdf0f07a963cfa4e39a77192 100644 (file)
--- a/client/src/models/network.js
+++ b/client/src/models/network.js
@@ -735,7 +735,7 @@
         } else if (event.away_reason) {
             panel.addMsg(event.nick, styleText('client_models_network_away', {'%N': event.nick, '%T': translateText('client_models_network_away', [event.away_reason])}), 'whois');
         } else {
-            panel.addMsg(event.nick, client_models_network_server('client_models_network_idle', {'%N': event.nick, '%T': translateText('client_models_network_idle', [idle_time])}), 'whois');
+            panel.addMsg(event.nick, styleText('client_models_network_idle', {'%N': event.nick, '%T': translateText('client_models_network_idle', [idle_time])}), 'whois');
         }
     }
 

diff --git a/client/src/translations/en-gb.po b/client/src/translations/en-gb.po
index f4788810f758acf9e17b756f3477a67a2161ad64..ad8271ef6f04155060919ce5a4c5a524f0661df7 100755 (executable)
--- a/client/src/translations/en-gb.po
+++ b/client/src/translations/en-gb.po
@@ -148,6 +148,10 @@ msgstr "Stopped ignoring %s"
 msgid "client_models_application_applet_notfound"
 msgstr "Applet \"%s\" does not exist"
 
+#: 
+msgid "client_models_application_has_been_invited"
+msgstr "has been invited to %s"
+
 #: 
 msgid "client_models_application_encoding_changed"
 msgstr "Encoding modified to %s"

diff --git a/client/src/translations/fr.po b/client/src/translations/fr.po
index de1ca278c35cfdc5b1dee1982690007e19b7340c..6d9b5842722c26d752313f1dcde87e445c5f51ad 100644 (file)
--- a/client/src/translations/fr.po
+++ b/client/src/translations/fr.po
@@ -108,6 +108,10 @@ msgstr "Chargement..."
 msgid "client_models_applet_notfound"
 msgstr "Introuvable."
 
+#: 
+msgid "client_models_application_has_been_invited"
+msgstr "a été invité à rejoindre %s"
+
 #: client/assets/src/models/application.js
 msgid "client_models_application_reconnecting"
 msgstr "Vous avez été déconnecté. Tentative de reconnexion en cours."