From a8675b0b11d8fd1c02212b72ec9e7fae1083ccca Mon Sep 17 00:00:00 2001 From: Cory Chaplin Date: Wed, 26 Mar 2014 23:47:57 +0100 Subject: [PATCH] Text theme regression fixes. --- client/assets/text_themes/default.json | 19 ++++++++++--------- client/src/models/application.js | 12 ++++++------ client/src/models/network.js | 10 +++++----- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/client/assets/text_themes/default.json b/client/assets/text_themes/default.json index 902ea40..44dc8db 100644 --- 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 f8e91d3..e163a42 100644 --- a/client/src/models/application.js +++ b/client/src/models/application.js @@ -573,7 +573,7 @@ fn_to_bind['command:save'] = function (ev) { _kiwi.global.settings.save(); - _kiwi.app.panels().active.addMsg('', styleText('save_settings', {'%T': translateText('client_models_application_settings_saved')})); + _kiwi.app.panels().active.addMsg('', styleText('client_models_application_settings_saved', {'%T': translateText('client_models_application_settings_saved')})); }; @@ -615,12 +615,12 @@ // No parameters passed so list them if (!ev.params[0]) { if (list.length > 0) { - _kiwi.app.panels().active.addMsg(' ', styleText('ignore_list', {'%T': translateText('client_models_application_ignore_title')})); + _kiwi.app.panels().active.addMsg(' ', styleText('client_models_application_ignore_title', {'%T': translateText('client_models_application_ignore_title')})); $.each(list, function (idx, ignored_pattern) { _kiwi.app.panels().active.addMsg(' ', styleText('ignored_pattern', {'%T': ignored_pattern})); }); } else { - _kiwi.app.panels().active.addMsg(' ', styleText('ignore_list', {'%T': translateText('client_models_application_ignore_none')})); + _kiwi.app.panels().active.addMsg(' ', styleText('client_models_application_ignore_none', {'%T': translateText('client_models_application_ignore_none')})); } return; } @@ -628,7 +628,7 @@ // We have a parameter, so add it list.push(ev.params[0]); this.connections.active_connection.set('ignore_list', list); - _kiwi.app.panels().active.addMsg(' ', styleText('ignore_nick', {'%T': translateText('client_models_application_ignore_nick', [ev.params[0]])})); + _kiwi.app.panels().active.addMsg(' ', styleText('client_models_application_ignore_nick', {'%T': translateText('client_models_application_ignore_nick', [ev.params[0]])})); }; @@ -636,7 +636,7 @@ var list = this.connections.active_connection.get('ignore_list'); if (!ev.params[0]) { - _kiwi.app.panels().active.addMsg(' ', styleText('stop_notice', {'%T': translateText('client_models_application_ignore_stop_notice')})); + _kiwi.app.panels().active.addMsg(' ', styleText('client_models_application_ignore_stop_notice', {'%T': translateText('client_models_application_ignore_stop_notice')})); return; } @@ -646,7 +646,7 @@ this.connections.active_connection.set('ignore_list', list); - _kiwi.app.panels().active.addMsg(' ', styleText('ignore_stopped', {'%T': translateText('client_models_application_ignore_stopped', [ev.params[0]])})); + _kiwi.app.panels().active.addMsg(' ', styleText('client_models_application_ignore_stopped', {'%T': translateText('client_models_application_ignore_stopped', [ev.params[0]])})); }; diff --git a/client/src/models/network.js b/client/src/models/network.js index cf83418..09a226e 100644 --- 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'); -- 2.25.1