From 2e6dd28aa2c0f499e2b8c2afdae89ad73fc6b60d Mon Sep 17 00:00:00 2001 From: Darren Date: Sat, 19 Apr 2014 22:39:18 +0100 Subject: [PATCH] Shortening text_theme keys --- client/assets/text_themes/default.json | 70 +++++++++++++------------- client/assets/text_themes/symbols.json | 70 +++++++++++++------------- client/src/models/application.js | 20 ++++---- client/src/models/channel.js | 10 ++-- client/src/models/network.js | 36 ++++++------- client/src/views/channel.js | 2 +- 6 files changed, 104 insertions(+), 104 deletions(-) diff --git a/client/assets/text_themes/default.json b/client/assets/text_themes/default.json index 4efa452..3d4f13a 100644 --- a/client/assets/text_themes/default.json +++ b/client/assets/text_themes/default.json @@ -1,39 +1,39 @@ { - "client_models_channel_join": "== %N %T", - "client_models_channel_part": "== %N %T", - "client_models_channel_quit": "== %N %T", - "client_models_channel_kicked": "== %N %T", - "client_models_channel_selfkick": "== %T", - "client_models_network_badpassword": "== %T", - "client_views_channel_topic": "== %T", - "client_models_network_mode": "== %N %T", - "client_models_network_selfmode": "== %N %T", - "client_models_network_banned": "== %T", - "client_models_network_channel_badkey": "== %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", - "client_models_network_disconnected": "%T", - "client_models_network_topic": "%T", - "client_models_network_channels": "%T", - "client_models_network_idle_and_signon": "%T", - "client_models_network_away": "%T", - "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_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", + "channel_join": "== %N %T", + "channel_part": "== %N %T", + "channel_quit": "== %N %T", + "channel_kicked": "== %N %T", + "channel_selfkick": "== %T", + "channel_badpassword": "== %T", + "channel_topic": "== %T", + "mode": "== %N %T", + "selfmode": "== %N %T", + "channel_banned": "== %T", + "channel_badkey": "== %T", + "channel_inviteonly": "== %C %T", + "channel_alreadyin": "== %N %T", + "channel_limitreached": "== %C %T", + "nickname_alreadyinuse": "== %T", + "channel_invalid_name": "== %C %T", + "network_disconnected": "%T", + "channel_topic_setby": "%T", + "whois_channels": "%T", + "whois_idle_and_signon": "%T", + "whois_away": "%T", + "whois_server": "%T", + "whois_idle": "%T", + "whois_notfound": "%T", + "nick_changed": "== %N %T", + "applet_notfound": "%T", + "channel_has_been_invited": "== %N %T", + "encoding_changed": "%T", + "encoding_invalid": "%T", + "settings_saved": "%T", + "ignore_title": "%T:", + "ignore_none": "%T", + "ignore_nick": "%T", + "ignore_stop_notice": "%T", + "ignore_stopped": "%T", "chanop_privs_needed": "== %T", "no_such_nick": "== %N: %T", "unknown_command": "%T", diff --git a/client/assets/text_themes/symbols.json b/client/assets/text_themes/symbols.json index cfa2591..9139fc5 100644 --- a/client/assets/text_themes/symbols.json +++ b/client/assets/text_themes/symbols.json @@ -1,39 +1,39 @@ { - "client_models_channel_join": "%C14→ %N %T", - "client_models_channel_part": "%C14← %N %T", - "client_models_channel_quit": "%C14← %N %T", - "client_models_channel_kicked": "%C4×%O %N %T", - "client_models_channel_selfkick": "%C4× %T", - "client_models_network_badpassword": "%C4× %T", - "client_views_channel_topic": "%C10ⓘ %T", - "client_models_network_mode": "%C10ⓘ %N %T", - "client_models_network_selfmode": "%C10ⓘ %N %T", - "client_models_network_banned": "%C3×%O %T", - "client_models_network_channel_badkey": "%C4⚠ %T", - "client_models_network_channel_inviteonly": "%C4⚠ %C %T", - "client_models_network_channel_alreadyin": "%C4⚠ %N %T", - "client_models_network_channel_limitreached": "%C4⚠ %C %T", - "client_models_network_nickname_alreadyinuse": "%C4⚠ %T", - "client_models_network_channel_invalid_name": "%C4⚠ %C %T", - "client_models_network_disconnected": "%C4⚠ %T", - "client_models_network_topic": "%C10ⓘ %T", - "client_models_network_channels": "%C14%T", - "client_models_network_idle_and_signon": "%C14%T", - "client_models_network_away": "%C14%T", - "client_models_network_server": "%C14%T", - "client_models_network_idle": "%C14%T", - "client_models_network_nickname_notfound": "%C10ⓘ %T", - "client_models_network_nickname_changed": "%C14ⓘ %N %T", - "client_models_application_applet_notfound": "%C4⚠ %T", - "client_models_application_has_been_invited": "%C7ⓘ %N %T", - "client_models_application_encoding_changed": "%C10ⓘ %T", - "client_models_application_encoding_invalid": "%C4⚠ %T", - "client_models_application_settings_saved": "%C10ⓘ %T", - "client_models_application_ignore_title": "%C10%T:", - "client_models_application_ignore_none": "%C10%T", - "client_models_application_ignore_nick": "%C10%T", - "client_models_application_ignore_stop_notice": "%C10%T", - "client_models_application_ignore_stopped": "%C10%T", + "channel_join": "%C14→ %N %T", + "channel_part": "%C14← %N %T", + "channel_quit": "%C14← %N %T", + "channel_kicked": "%C4×%O %N %T", + "channel_selfkick": "%C4× %T", + "channel_badpassword": "%C4× %T", + "channel_topic": "%C10ⓘ %T", + "mode": "%C10ⓘ %N %T", + "selfmode": "%C10ⓘ %N %T", + "channel_banned": "%C3×%O %T", + "channel_badkey": "%C4⚠ %T", + "channel_inviteonly": "%C4⚠ %C %T", + "channel_alreadyin": "%C4⚠ %N %T", + "channel_limitreached": "%C4⚠ %C %T", + "nickname_alreadyinuse": "%C4⚠ %T", + "channel_invalid_name": "%C4⚠ %C %T", + "network_disconnected": "%C4⚠ %T", + "channel_topic_setby": "%C10ⓘ %T", + "whois_channels": "%C14%T", + "whois_idle_and_signon": "%C14%T", + "whois_away": "%C14%T", + "whois_server": "%C14%T", + "whois_idle": "%C14%T", + "whois_notfound": "%C10ⓘ %T", + "nick_changed": "%C14ⓘ %N %T", + "applet_notfound": "%C4⚠ %T", + "channel_has_been_invited": "%C7ⓘ %N %T", + "encoding_changed": "%C10ⓘ %T", + "encoding_invalid": "%C4⚠ %T", + "settings_saved": "%C10ⓘ %T", + "ignore_title": "%C10%T:", + "ignore_none": "%C10%T", + "ignore_nick": "%C10%T", + "ignore_stop_notice": "%C10%T", + "ignore_stopped": "%C10%T", "chanop_privs_needed": "%C4⚠ %T", "no_such_nick": "%C10ⓘ %N: %T", "unknown_command": "%C10ⓘ %T", diff --git a/client/src/models/application.js b/client/src/models/application.js index d275953..49bbc0a 100644 --- a/client/src/models/application.js +++ b/client/src/models/application.js @@ -396,7 +396,7 @@ fn_to_bind['command:save'] = function (ev) { _kiwi.global.settings.save(); - _kiwi.app.panels().active.addMsg('', styleText('client_models_application_settings_saved', {'%T': translateText('client_models_application_settings_saved')})); + _kiwi.app.panels().active.addMsg('', styleText('settings_saved', {'%T': translateText('client_models_application_settings_saved')})); }; @@ -438,12 +438,12 @@ // No parameters passed so list them if (!ev.params[0]) { if (list.length > 0) { - _kiwi.app.panels().active.addMsg(' ', styleText('client_models_application_ignore_title', {'%T': translateText('client_models_application_ignore_title')})); + _kiwi.app.panels().active.addMsg(' ', styleText('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('client_models_application_ignore_none', {'%T': translateText('client_models_application_ignore_none')})); + _kiwi.app.panels().active.addMsg(' ', styleText('ignore_none', {'%T': translateText('client_models_application_ignore_none')})); } return; } @@ -451,7 +451,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('client_models_application_ignore_nick', {'%T': translateText('client_models_application_ignore_nick', [ev.params[0]])})); + _kiwi.app.panels().active.addMsg(' ', styleText('ignore_nick', {'%T': translateText('client_models_application_ignore_nick', [ev.params[0]])})); }; @@ -459,7 +459,7 @@ var list = this.connections.active_connection.get('ignore_list'); if (!ev.params[0]) { - _kiwi.app.panels().active.addMsg(' ', styleText('client_models_application_ignore_stop_notice', {'%T': translateText('client_models_application_ignore_stop_notice')})); + _kiwi.app.panels().active.addMsg(' ', styleText('ignore_stop_notice', {'%T': translateText('client_models_application_ignore_stop_notice')})); return; } @@ -469,7 +469,7 @@ this.connections.active_connection.set('ignore_list', list); - _kiwi.app.panels().active.addMsg(' ', styleText('client_models_application_ignore_stopped', {'%T': translateText('client_models_application_ignore_stopped', [ev.params[0]])})); + _kiwi.app.panels().active.addMsg(' ', styleText('ignore_stopped', {'%T': translateText('client_models_application_ignore_stopped', [ev.params[0]])})); }; @@ -667,7 +667,7 @@ if (_kiwi.applets[ev.params[0]]) { panel.load(new _kiwi.applets[ev.params[0]]()); } else { - _kiwi.app.panels().server.addMsg('', styleText('client_models_application_applet_notfound', {'%T': translateText('client_models_application_applet_notfound', [ev.params[0]])})); + _kiwi.app.panels().server.addMsg('', styleText('applet_notfound', {'%T': translateText('client_models_application_applet_notfound', [ev.params[0]])})); return; } } @@ -694,7 +694,7 @@ _kiwi.app.connections.active_connection.gateway.raw('INVITE ' + nick + ' ' + channel); - _kiwi.app.panels().active.addMsg('', styleText('client_models_application_has_been_invited', {'%N': nick, '%T': translateText('client_models_application_has_been_invited', [channel])}), 'action'); + _kiwi.app.panels().active.addMsg('', styleText('channel_has_been_invited', {'%N': nick, '%T': translateText('client_models_application_has_been_invited', [channel])}), 'action'); } @@ -729,9 +729,9 @@ if (ev.params[0]) { _kiwi.gateway.setEncoding(null, ev.params[0], function (success) { if (success) { - _kiwi.app.panels().active.addMsg('', styleText('client_models_application_encoding_changed', {'%T': translateText('client_models_application_encoding_changed', [ev.params[0]])})); + _kiwi.app.panels().active.addMsg('', styleText('encoding_changed', {'%T': translateText('client_models_application_encoding_changed', [ev.params[0]])})); } else { - _kiwi.app.panels().active.addMsg('', styleText('client_models_application_encoding_invalid', {'%T': translateText('client_models_application_encoding_invalid', [ev.params[0]])})); + _kiwi.app.panels().active.addMsg('', styleText('encoding_invalid', {'%T': translateText('client_models_application_encoding_invalid', [ev.params[0]])})); } }); } else { diff --git a/client/src/models/channel.js b/client/src/models/channel.js index bb4f835..26f1433 100644 --- a/client/src/models/channel.js +++ b/client/src/models/channel.js @@ -22,7 +22,7 @@ _kiwi.model.Channel = _kiwi.model.Panel.extend({ return; } - this.addMsg(' ', styleText('client_models_channel_join', {'%M': member.getMemberMask(), '%T': translateText('client_models_channel_join'), '%C': name}), 'action join', {time: options.kiwi.time}); + this.addMsg(' ', styleText('channel_join', {'%M': member.getMemberMask(), '%T': translateText('client_models_channel_join'), '%C': name}), 'action join', {time: options.kiwi.time}); }, this); members.bind("remove", function (member, members, options) { @@ -30,20 +30,20 @@ _kiwi.model.Channel = _kiwi.model.Panel.extend({ var msg = (options.kiwi.message) ? '(' + options.kiwi.message + ')' : ''; if (options.kiwi.type === 'quit' && show_message) { - this.addMsg(' ', styleText('client_models_channel_quit', {'%M': member.getMemberMask(), '%T': translateText('client_models_channel_quit', [msg]), '%C': name}), 'action quit', {time: options.kiwi.time}); + this.addMsg(' ', styleText('channel_quit', {'%M': member.getMemberMask(), '%T': translateText('client_models_channel_quit', [msg]), '%C': name}), 'action quit', {time: options.kiwi.time}); } else if (options.kiwi.type === 'kick') { if (!options.kiwi.current_user_kicked) { //If user kicked someone, show the message regardless of settings. if (show_message || options.kiwi.current_user_initiated) { - this.addMsg(' ', styleText('client_models_channel_kicked', {'%M': member.getMemberMask(), '%T': translateText('client_models_channel_kicked', [options.kiwi.by, msg]), '%C': name}), 'action kick', {time: options.kiwi.time}); + this.addMsg(' ', styleText('channel_kicked', {'%M': member.getMemberMask(), '%T': translateText('client_models_channel_kicked', [options.kiwi.by, msg]), '%C': name}), 'action kick', {time: options.kiwi.time}); } } else { - this.addMsg(' ', styleText('client_models_channel_selfkick', {'%T': translateText('client_models_channel_selfkick', [options.kiwi.by, msg]), '%C': name}), 'action kick', {time: options.kiwi.time}); + this.addMsg(' ', styleText('channel_selfkick', {'%T': translateText('client_models_channel_selfkick', [options.kiwi.by, msg]), '%C': name}), 'action kick', {time: options.kiwi.time}); } } else if (show_message) { - this.addMsg(' ', styleText('client_models_channel_part', {'%M': member.getMemberMask(), '%T': translateText('client_models_channel_part', [msg]), '%C': name}), 'action part', {time: options.kiwi.time}); + this.addMsg(' ', styleText('channel_part', {'%M': member.getMemberMask(), '%T': translateText('client_models_channel_part', [msg]), '%C': name}), 'action part', {time: options.kiwi.time}); } }, this); diff --git a/client/src/models/network.js b/client/src/models/network.js index cf58243..9e67ba2 100644 --- a/client/src/models/network.js +++ b/client/src/models/network.js @@ -241,7 +241,7 @@ function onDisconnect(event) { $.each(this.panels.models, function (index, panel) { - panel.addMsg('', styleText('client_models_network_disconnected', {'%T': translateText('client_models_network_disconnected', [])}), 'action quit'); + panel.addMsg('', styleText('network_disconnected', {'%T': translateText('client_models_network_disconnected', [])}), 'action quit'); }); } @@ -441,7 +441,7 @@ member = panel.get('members').getByNick(event.nick); if (member) { member.set('nick', event.newnick); - 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}); + panel.addMsg('', styleText('nick_changed', {'%N': event.nick, '%T': translateText('client_models_network_nickname_changed', [event.newnick]), '%C': name}), 'action nick', {time: event.time}); } }); } @@ -568,7 +568,7 @@ if (!c) return; when = formatDate(new Date(event.when * 1000)); - c.addMsg('', styleText('client_models_network_topic', {'%T': translateText('client_models_network_topic', [event.nick, when]), '%C': event.channel}), 'topic'); + c.addMsg('', styleText('channel_topic_setby', {'%T': translateText('client_models_network_topic', [event.nick, when]), '%C': event.channel}), 'topic'); } @@ -706,7 +706,7 @@ request_updated_banlist = true; } - channel.addMsg('', styleText('client_models_network_mode', {'%N': event.nick, '%T': translateText('client_models_network_mode', [friendlyModeString()]), '%C': event.target}), 'action mode', {time: event.time}); + channel.addMsg('', styleText('mode', {'%N': event.nick, '%T': translateText('client_models_network_mode', [friendlyModeString()]), '%C': event.target}), 'action mode', {time: event.time}); // TODO: Be smart, remove the specific ban from the banlist rather than request a whole banlist if (request_updated_banlist) @@ -715,7 +715,7 @@ } else { // This is probably a mode being set on us. if (event.target.toLowerCase() === this.get("nick").toLowerCase()) { - this.panels.server.addMsg('', styleText('client_models_network_selfmode', {'%N': event.nick, '%T': translateText('client_models_network_mode', [friendlyModeString()]), '%C': event.target}), 'action mode'); + this.panels.server.addMsg('', styleText('selfmode', {'%N': event.nick, '%T': translateText('client_models_network_mode', [friendlyModeString()]), '%C': event.target}), 'action mode'); } else { console.log('MODE command recieved for unknown target %s: ', event.target, event); } @@ -740,9 +740,9 @@ panel.addMsg(event.nick, styleText('whois_ident', {'%N': event.nick, '%J': event.ident, '%H': event.host, '%T': event.msg}), 'whois'); } else if (event.chans) { - panel.addMsg(event.nick, styleText('client_models_network_channels', {'%N': event.nick, '%T': translateText('client_models_network_channels', [event.chans])}), 'whois'); + panel.addMsg(event.nick, styleText('whois_channels', {'%N': event.nick, '%T': translateText('client_models_network_channels', [event.chans])}), 'whois'); } else if (event.irc_server) { - panel.addMsg(event.nick, styleText('client_models_network_server', {'%N': event.nick, '%T': translateText('client_models_network_server', [event.irc_server, event.server_info])}), 'whois'); + panel.addMsg(event.nick, styleText('whois_server', {'%N': event.nick, '%T': translateText('client_models_network_server', [event.irc_server, event.server_info])}), 'whois'); } else if (event.msg) { panel.addMsg(event.nick, styleText('whois', {'%T': event.msg}), 'whois'); } else if (event.logon) { @@ -750,11 +750,11 @@ logon_date.setTime(event.logon * 1000); logon_date = formatDate(logon_date); - panel.addMsg(event.nick, styleText('client_models_network_idle_and_signon', {'%N': event.nick, '%T': translateText('client_models_network_idle_and_signon', [idle_time, logon_date])}), 'whois'); + panel.addMsg(event.nick, styleText('whois_idle_and_signon', {'%N': event.nick, '%T': translateText('client_models_network_idle_and_signon', [idle_time, logon_date])}), 'whois'); } 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'); + panel.addMsg(event.nick, styleText('whois_away', {'%N': event.nick, '%T': translateText('client_models_network_away', [event.away_reason])}), 'whois'); } else { - panel.addMsg(event.nick, styleText('client_models_network_idle', {'%N': event.nick, '%T': translateText('client_models_network_idle', [idle_time])}), 'whois'); + panel.addMsg(event.nick, styleText('whois_idle', {'%N': event.nick, '%T': translateText('client_models_network_idle', [idle_time])}), 'whois'); } } @@ -768,7 +768,7 @@ if (event.host) { panel.addMsg(event.nick, styleText('who', {'%N': event.nick, '%J': event.ident, '%H': event.host, '%R': event.real_name, '%T': event.msg}), 'whois'); } else { - panel.addMsg(event.nick, styleText('client_models_network_nickname_notfound', {'%N': event.nick, '%T': translateText('client_models_network_nickname_notfound', [])}), 'whois'); + panel.addMsg(event.nick, styleText('whois_notfound', {'%N': event.nick, '%T': translateText('client_models_network_nickname_notfound', [])}), 'whois'); } } @@ -802,22 +802,22 @@ switch (event.error) { case 'banned_from_channel': - panel.addMsg(' ', styleText('client_models_network_banned', {'%N': event.nick, '%T': translateText('client_models_network_banned', [event.channel, event.reason]), '%C': event.channel}), 'status'); + panel.addMsg(' ', styleText('channel_banned', {'%N': event.nick, '%T': translateText('client_models_network_banned', [event.channel, event.reason]), '%C': event.channel}), 'status'); _kiwi.app.message.text(_kiwi.global.i18n.translate('client_models_network_banned').fetch(event.channel, event.reason)); break; case 'bad_channel_key': - panel.addMsg(' ', styleText('client_models_network_channel_badkey', {'%N': event.nick, '%T': translateText('client_models_network_channel_badkey', [event.channel]), '%C': event.channel}), 'status'); + panel.addMsg(' ', styleText('channel_badkey', {'%N': event.nick, '%T': translateText('client_models_network_channel_badkey', [event.channel]), '%C': event.channel}), 'status'); _kiwi.app.message.text(_kiwi.global.i18n.translate('client_models_network_channel_badkey').fetch(event.channel)); 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'); + panel.addMsg(' ', styleText('channel_inviteonly', {'%N': event.nick, '%T': translateText('client_models_network_channel_inviteonly', [event.nick, event.channel]), '%C': event.channel}), 'status'); _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'), '%C': event.channel})); + panel.addMsg(' ', styleText('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'); + panel.addMsg(' ', styleText('channel_limitreached', {'%N': event.nick, '%T': translateText('client_models_network_channel_limitreached', [event.channel]), '%C': event.channel}), 'status'); _kiwi.app.message.text(event.channel + ' ' + _kiwi.global.i18n.translate('client_models_network_channel_limitreached').fetch(event.channel)); break; case 'chanop_privs_needed': @@ -833,7 +833,7 @@ } break; case 'nickname_in_use': - this.panels.server.addMsg(' ', styleText('client_models_network_nickname_alreadyinuse', {'%N': event.nick, '%T': translateText('client_models_network_nickname_alreadyinuse', [event.nick]), '%C': event.channel}), 'status'); + this.panels.server.addMsg(' ', styleText('nickname_alreadyinuse', {'%N': event.nick, '%T': translateText('client_models_network_nickname_alreadyinuse', [event.nick]), '%C': event.channel}), 'status'); if (this.panels.server !== this.panels.active) { _kiwi.app.message.text(_kiwi.global.i18n.translate('client_models_network_nickname_alreadyinuse').fetch(event.nick)); } @@ -846,7 +846,7 @@ break; case 'password_mismatch': - this.panels.server.addMsg(' ', styleText('client_models_network_badpassword', {'%N': event.nick, '%T': translateText('client_models_network_badpassword', []), '%C': event.channel}), 'status'); + this.panels.server.addMsg(' ', styleText('channel_badpassword', {'%N': event.nick, '%T': translateText('client_models_network_badpassword', []), '%C': event.channel}), 'status'); break; default: // We don't know what data contains, so don't do anything with it. diff --git a/client/src/views/channel.js b/client/src/views/channel.js index 5f819f6..7e5e313 100644 --- a/client/src/views/channel.js +++ b/client/src/views/channel.js @@ -243,7 +243,7 @@ _kiwi.view.Channel = _kiwi.view.Panel.extend({ topic = this.model.get("topic"); } - this.model.addMsg('', styleText('client_views_channel_topic', {'%T': translateText('client_views_channel_topic', [this.model.get('name'), topic]), '%C': this.model.get('name')}), 'topic'); + this.model.addMsg('', styleText('channel_topic', {'%T': translateText('client_views_channel_topic', [this.model.get('name'), topic]), '%C': this.model.get('name')}), 'topic'); // If this is the active channel then update the topic bar if (_kiwi.app.panels().active === this) { -- 2.25.1