Commit 91ced4d3 authored by Link Mauve's avatar Link Mauve

Normalise the user-facing name of MUC from chatroom to room everywhere.

parent 0ed89234
......@@ -541,7 +541,7 @@ class Core(object):
'It seems that it is the first time you start poezio.\n'
'The online help is here http://doc.poez.io/\n'
'No room is joined by default, but you can join poezio’s'
' chatroom (with /join poezio@muc.poez.io), where you can'
' room (with /join poezio@muc.poez.io), where you can'
' ask for help or tell us how great it is.',
'Help')
self.refresh_window()
......@@ -1319,7 +1319,7 @@ class Core(object):
Disable private tabs when leaving a room
"""
if reason is None:
reason = '\x195}You left the chatroom\x193}'
reason = '\x195}You left the room\x193}'
for tab in self.get_tabs(tabs.PrivateTab):
if tab.name.startswith(room_name):
tab.deactivate(reason=reason)
......@@ -1329,7 +1329,7 @@ class Core(object):
Enable private tabs when joining a room
"""
if reason is None:
reason = '\x195}You joined the chatroom\x193}'
reason = '\x195}You joined the room\x193}'
for tab in self.get_tabs(tabs.PrivateTab):
if tab.name.startswith(room_name):
tab.activate(reason=reason)
......@@ -1844,7 +1844,7 @@ class Core(object):
completion=self.completion.theme)
self.register_command('list', self.command.list,
usage='[server]',
desc="Get the list of public chatrooms"
desc="Get the list of public rooms"
" on the specified server.",
shortdesc='List the rooms.',
completion=self.completion.list)
......
......@@ -592,7 +592,7 @@ class MucTab(ChatTab):
if arg:
msg = ('\x19%(color_spec)s}%(spec)s\x19%(info_col)s} '
'You (\x19%(color)s}%(nick)s\x19%(info_col)s})'
' left the chatroom'
' left the room'
' (\x19o%(reason)s\x19%(info_col)s})') % {
'info_col': info_col, 'reason': arg,
'spec': char_quit, 'color': color,
......@@ -602,7 +602,7 @@ class MucTab(ChatTab):
else:
msg = ('\x19%(color_spec)s}%(spec)s\x19%(info_col)s} '
'You (\x19%(color)s}%(nick)s\x19%(info_col)s})'
' left the chatroom') % {
' left the room') % {
'info_col': info_col,
'spec': char_quit, 'color': color,
'color_spec': spec_col,
......@@ -1136,7 +1136,7 @@ class MucTab(ChatTab):
enable_message = (
'\x19%(color_spec)s}%(spec)s\x19%(info_col)s} You '
'(\x19%(nick_col)s}%(nick)s\x19%(info_col)s}) joined'
' the chatroom') % {
' the room') % {
'nick': from_nick,
'spec': get_theme().CHAR_JOIN,
'color_spec': spec_col,
......@@ -1260,7 +1260,7 @@ class MucTab(ChatTab):
char_join = get_theme().CHAR_JOIN
if not jid.full:
msg = ('\x19%(color_spec)s}%(spec)s \x19%(color)s}%(nick)s'
'\x19%(info_col)s} joined the chatroom') % {
'\x19%(info_col)s} joined the room') % {
'nick': from_nick, 'spec': char_join,
'color': color,
'info_col': info_col,
......@@ -1269,7 +1269,7 @@ class MucTab(ChatTab):
else:
msg = ('\x19%(color_spec)s}%(spec)s \x19%(color)s}%(nick)s'
'\x19%(info_col)s} (\x19%(jid_color)s}%(jid)s\x19'
'%(info_col)s}) joined the chatroom') % {
'%(info_col)s}) joined the room') % {
'spec': char_join, 'nick': from_nick,
'color':color, 'jid':jid.full,
'info_col': info_col,
......@@ -1473,7 +1473,7 @@ class MucTab(ChatTab):
if not jid.full:
leave_msg = ('\x19%(color_spec)s}%(spec)s \x19%(color)s}'
'%(nick)s\x19%(info_col)s} has left the '
'chatroom') % {
'room') % {
'nick':from_nick, 'color':color,
'spec':get_theme().CHAR_QUIT,
'info_col': info_col,
......@@ -1483,7 +1483,7 @@ class MucTab(ChatTab):
leave_msg = ('\x19%(color_spec)s}%(spec)s \x19%(color)s}'
'%(nick)s\x19%(info_col)s} (\x19%(jid_col)s}'
'%(jid)s\x19%(info_col)s}) has left the '
'chatroom') % {
'room') % {
'spec':get_theme().CHAR_QUIT,
'nick':from_nick, 'color':color,
'jid':jid.full, 'info_col': info_col,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment