Text theme regression fixes.

diff --git a/client/assets/text_themes/default.json b/client/assets/text_themes/default.json
index 902ea409b8693bc07cb8c4de2fda3880ebe55d60..44dc8db75dcafde199146c75c39c8ad46cdcbc77 100644 (file)
--- a/client/assets/text_themes/default.json
+++ b/client/assets/text_themes/default.json
@@ -10,8 +10,8 @@
   "client_models_network_selfmode": "== %N %T",
   "client_models_network_banned": "== %T",
   "client_models_network_channel_badkey": "== %T",
-  "client_models_network_channel_inviteonly": "== %T",
-  "client_models_network_channel_alreadyin": "== %T",
+  "client_models_network_channel_inviteonly": "== %C %T",
+  "client_models_network_channel_alreadyin": "== %N %T",
   "client_models_network_channel_limitreached": "== %C %T",
   "client_models_network_nickname_alreadyinuse": "== %T",
   "client_models_network_channel_invalid_name": "== %C %T",
@@ -23,18 +23,24 @@
   "client_models_network_server": "%T",
   "client_models_network_idle": "%T",
   "client_models_network_nickname_notfound": "%T",
-  "client_models_network_nickname_changed": "%N %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",
+  "client_models_application_settings_saved": "%T",
+  "client_models_application_ignore_title": "%T:",
+  "client_models_application_ignore_none": "%T",
+  "client_models_application_ignore_nick": "%T",
+  "client_models_application_ignore_stop_notice": "%T",
+  "client_models_application_ignore_stopped": "%T",
   "chanop_privs_needed": "== %T",
   "no_such_nick": "== %N: %T",
   "unknown_command": "%T",
   "motd": "%T",
   "privmsg": "%T",
   "ctcp": "CTCP: %T",
-  "notice": "NOTICE: %T",
+  "notice": "%T",
   "action": "* %T",
   "whois_ident": "%N [%N!%J@%H] * %T",
   "whois": "%T",
@@ -42,13 +48,8 @@
   "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/models/application.js b/client/src/models/application.js
index f8e91d3e9b135505d1d8429edba44ec55ed3e1a6..e163a428f5c4b424b82e9115c2338d6694c46427 100644 (file)
--- a/client/src/models/application.js
+++ b/client/src/models/application.js
@@ -573,7 +573,7 @@
 \r
             fn_to_bind['command:save'] = function (ev) {\r
                 _kiwi.global.settings.save();\r
-                _kiwi.app.panels().active.addMsg('', styleText('save_settings', {'%T': translateText('client_models_application_settings_saved')}));\r
+                _kiwi.app.panels().active.addMsg('', styleText('client_models_application_settings_saved', {'%T': translateText('client_models_application_settings_saved')}));\r
             };\r
 \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(' ', styleText('ignore_list', {'%T': translateText('client_models_application_ignore_title')}));\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(' ', styleText('ignored_pattern', {'%T': ignored_pattern}));\r
                         });\r
                     } else {\r
-                        _kiwi.app.panels().active.addMsg(' ', styleText('ignore_list', {'%T': translateText('client_models_application_ignore_none')}));\r
+                        _kiwi.app.panels().active.addMsg(' ', styleText('client_models_application_ignore_none', {'%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(' ', styleText('ignore_nick', {'%T': translateText('client_models_application_ignore_nick', [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
@@ -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(' ', styleText('stop_notice', {'%T': translateText('client_models_application_ignore_stop_notice')}));\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
@@ -646,7 +646,7 @@
 \r
                 this.connections.active_connection.set('ignore_list', list);\r
 \r
-                _kiwi.app.panels().active.addMsg(' ', styleText('ignore_stopped', {'%T': translateText('client_models_application_ignore_stopped', [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

diff --git a/client/src/models/network.js b/client/src/models/network.js
index cf8341882dc4b5c2bdf0f07a963cfa4e39a77192..09a226e82d3d2f2fe210d4beace2e0406608dc47 100644 (file)
--- a/client/src/models/network.js
+++ b/client/src/models/network.js
@@ -171,7 +171,7 @@
                 // If not a valid channel name, display a warning
                 if (!that.isChannelName(channel_name)) {
                     that.panels.server.addMsg('', styleText('client_models_network_channel_invalid_name', {'%T': translateText('client_models_network_channel_invalid_name', []), '%C': channel_name}));
-                    _kiwi.app.message.text(_kiwi.global.i18n.translate('client_models_network_channel_invalid_name').fetch(channel_name), {timeout: 5000});
+                    _kiwi.app.message.text(channel_name + ' ' + _kiwi.global.i18n.translate('client_models_network_channel_invalid_name').fetch(channel_name), {timeout: 5000});
                     return;
                 }
 
@@ -430,7 +430,7 @@
             member = panel.get('members').getByNick(event.nick);
             if (member) {
                 member.set('nick', event.newnick);
-                panel.addMsg('', styleText('client_models_network_nickname_changed', {'%M': member.getMemberMask(), '%T': translateText('client_models_network_nickname_changed', [event.newnick]), '%C': name}), 'action nick', {time: event.time});
+                panel.addMsg('', styleText('client_models_network_nickname_changed', {'%N': event.nick, '%T': translateText('client_models_network_nickname_changed', [event.newnick]), '%C': name}), 'action nick', {time: event.time});
             }
         });
     }
@@ -792,14 +792,14 @@
             break;
         case 'invite_only_channel':
             panel.addMsg(' ', styleText('client_models_network_channel_inviteonly', {'%N': event.nick, '%T': translateText('client_models_network_channel_inviteonly', [event.nick, event.channel]), '%C': event.channel}), 'status');
-            _kiwi.app.message.text(_kiwi.global.i18n.translate('client_models_network_channel_inviteonly').fetch(event.channel));
+            _kiwi.app.message.text(event.channel + ' ' + _kiwi.global.i18n.translate('client_models_network_channel_inviteonly').fetch());
             break;
         case 'user_on_channel':
-            panel.addMsg(' ', styleText('client_models_network_channel_alreadyin', {'%N': event.nick, '%T': translateText('client_models_network_channel_alreadyin', [event.nick]), '%C': event.channel}));
+            panel.addMsg(' ', styleText('client_models_network_channel_alreadyin', {'%N': event.nick, '%T': translateText('client_models_network_channel_alreadyin'), '%C': event.channel}));
             break;
         case 'channel_is_full':
             panel.addMsg(' ', styleText('client_models_network_channel_limitreached', {'%N': event.nick, '%T': translateText('client_models_network_channel_limitreached', [event.channel]), '%C': event.channel}), 'status');
-            _kiwi.app.message.text(_kiwi.global.i18n.translate('client_models_network_channel_limitreached').fetch(event.channel));
+            _kiwi.app.message.text(event.channel + ' ' + _kiwi.global.i18n.translate('client_models_network_channel_limitreached').fetch(event.channel));
             break;
         case 'chanop_privs_needed':
             panel.addMsg(' ', styleText('chanop_privs_needed', {'%T': event.reason, '%C': event.channel}), 'status');