Text theme ordering more logical; Text theme 'privmsg' naming consistency

diff --git a/client/assets/text_themes/default.json b/client/assets/text_themes/default.json
index 30c6145643ac0f18c91a146e5a5da60b89bcf5d8..772ab288f46e911d866293b1980ceaf50e1701c4 100644 (file)
--- a/client/assets/text_themes/default.json
+++ b/client/assets/text_themes/default.json
@@ -6,17 +6,18 @@
     "channel_selfkick": "× %text",
     "channel_badpassword": "× %text",
     "channel_topic": "ⓘ %text",
-    "mode": "ⓘ %nick %text",
-    "selfmode": "ⓘ %nick %text",
     "channel_banned": "× %text",
     "channel_badkey": "⚠ %text",
     "channel_inviteonly": "⚠ %channel %text",
     "channel_alreadyin": "⚠ %nick %text",
     "channel_limitreached": "⚠ %channel %text",
-    "nickname_alreadyinuse": "⚠ %text",
     "channel_invalid_name": "⚠ %channel %text",
-    "network_disconnected": "⚠ %text",
     "channel_topic_setby": "ⓘ %text",
+    "channel_has_been_invited": "ⓘ %nick %text",
+    "mode": "ⓘ %nick %text",
+    "selfmode": "ⓘ %nick %text",
+    "nickname_alreadyinuse": "⚠ %text",
+    "network_disconnected": "⚠ %text",
     "whois_channels": "%text",
     "whois_idle_and_signon": "%text",
     "whois_away": "%text",
@@ -25,7 +26,6 @@
     "whois_notfound": "ⓘ %text",
     "nick_changed": "ⓘ %nick %text",
     "applet_notfound": "⚠ %text",
-    "channel_has_been_invited": "ⓘ %nick %text",
     "encoding_changed": "ⓘ %text",
     "encoding_invalid": "⚠ %text",
     "settings_saved": "ⓘ %text",
@@ -38,8 +38,8 @@
     "no_such_nick": "ⓘ %nick: %text",
     "unknown_command": "ⓘ %text",
     "motd": "%text",
-    "privmsg": "%text",
     "ctcp": "[CTCP] %text",
+    "privmsg": "%text",
     "notice": "%text",
     "action": "* %nick %text",
     "whois_ident": "%nick [%nick!%ident@%host] * %text",
@@ -49,7 +49,5 @@
     "rejoin": "%text",
     "set_setting": "ⓘ %text",
     "list_aliases": "ⓘ %text",
-    "ignored_pattern": "ⓘ %text",
-    "query": "%text",
-    "msg": "%text"
+    "ignored_pattern": "ⓘ %text"
 }
\ No newline at end of file

diff --git a/client/src/models/application.js b/client/src/models/application.js
index e43a8e76e506c92687343739c18b7f5dc2932d5d..82547fafc2f32f8ae3268da2421a2083bacf6fa6 100644 (file)
--- a/client/src/models/application.js
+++ b/client/src/models/application.js
@@ -531,7 +531,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'), styleText('query', {text: message}));\r
+            panel.addMsg(_kiwi.app.connections.active_connection.get('nick'), styleText('privmsg', {text: message}), 'privmsg');\r
         }\r
 \r
     }\r
@@ -544,7 +544,7 @@
         ev.params.shift();\r
         message = formatToIrcMsg(ev.params.join(' '));\r
 \r
-        panel.addMsg(_kiwi.app.connections.active_connection.get('nick'), styleText('msg', {text: message}));\r
+        panel.addMsg(_kiwi.app.connections.active_connection.get('nick'), styleText('privmsg', {text: message}), 'privmsg');\r
         this.connections.active_connection.gateway.msg(destination, message);\r
     }\r
 \r