From 0ad9712d0c7421c4d9b2d9ebb4b7d328c90e2253 Mon Sep 17 00:00:00 2001 From: Mathieu Pasquet Date: Tue, 26 Nov 2013 18:37:06 +0100 Subject: [PATCH] refactor the texts in core to be more readable and fix some typos --- plugins/ping.py | 1 - src/core.py | 71 ++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 58 insertions(+), 14 deletions(-) diff --git a/plugins/ping.py b/plugins/ping.py index 8d478e24..0e436e89 100644 --- a/plugins/ping.py +++ b/plugins/ping.py @@ -66,7 +66,6 @@ class Plugin(BasePlugin): start = time.time() def callback(iq): delay = time.time() - start - self.api.information("coucou %s %s" % (iq, type(iq))) if iq['type'] == 'error' and iq['error']['condition'] in ('remote-server-timeout', 'remote-server-not-found'): self.api.information('%s did not respond to ping' % jid, 'Info') else: diff --git a/src/core.py b/src/core.py index 3fc63295..1d2ab522 100644 --- a/src/core.py +++ b/src/core.py @@ -2610,7 +2610,17 @@ class Core(object): completion=self.completion_help) self.register_command('join', self.command_join, usage=_("[room_name][@server][/nick] [password]"), - desc=_("Join the specified room. You can specify a nickname after a slash (/). If no nickname is specified, you will use the default_nick in the configuration file. You can omit the room name: you will then join the room you\'re looking at (useful if you were kicked). You can also provide a room_name without specifying a server, the server of the room you're currently in will be used. You can also provide a password to join the room.\nExamples:\n/join room@server.tld\n/join room@server.tld/John\n/join room2\n/join /me_again\n/join\n/join room@server.tld/my_nick password\n/join / password"), + desc=_("Join the specified room. You can specify a nickname " + "after a slash (/). If no nickname is specified, you will" + " use the default_nick in the configuration file. You can" + " omit the room name: you will then join the room you\'re" + " looking at (useful if you were kicked). You can also " + "provide a room_name without specifying a server, the " + "server of the room you're currently in will be used. You" + " can also provide a password to join the room.\nExamples" + ":\n/join room@server.tld\n/join room@server.tld/John\n" + "/join room2\n/join /me_again\n/join\n/join room@server" + ".tld/my_nick password\n/join / password"), shortdesc=_('Join a room'), completion=self.completion_join) self.register_command('exit', self.command_quit, @@ -2630,48 +2640,78 @@ class Core(object): self.commands['w'] = self.commands['win'] self.register_command('move_tab', self.command_move_tab, usage=_(' '), - desc=_('Insert the tab at the position of . This will make the following tabs shift in some cases (refer to the documentation). A tab can be designated by its number or by the beginning of its address.'), + desc=_("Insert the tab at the position of " + ". This will make the following tabs shift in" + " some cases (refer to the documentation). A tab can be " + "designated by its number or by the beginning of its " + "address."), shortdesc=_('Move a tab.'), completion=self.completion_move_tab) self.register_command('show', self.command_status, usage=_(' [status message]'), - desc=_('Sets your availability and (optionally) your status message. The argument is one of \"available, chat, away, afk, dnd, busy, xa\" and the optional [status message] argument will be your status message.'), + desc=_("Sets your availability and (optionally) your status " + "message. The argument is one of \"available" + ", chat, away, afk, dnd, busy, xa\" and the optional " + "[status message] argument will be your status message."), shortdesc=_('Change your availability.'), completion=self.completion_status) self.commands['status'] = self.commands['show'] self.register_command('bookmark_local', self.command_bookmark_local, usage=_("[roomname][/nick] [password]"), - desc=_("Bookmark Local: Bookmark locally the specified room (you will then auto-join it on each poezio start). This commands uses almost the same syntaxe as /join. Type /help join for syntaxe examples. Note that when typing \"/bookmark\" on its own, the room will be bookmarked with the nickname you\'re currently using in this room (instead of default_nick)"), + desc=_("Bookmark Local: Bookmark locally the specified room " + "(you will then auto-join it on each poezio start). This" + " commands uses almost the same syntaxe as /join. Type " + "/help join for syntax examples. Note that when typing " + "\"/bookmark\" on its own, the room will be bookmarked " + "with the nickname you\'re currently using in this room " + "(instead of default_nick)"), shortdesc=_('Bookmark a room locally.'), completion=self.completion_bookmark_local) self.register_command('bookmark', self.command_bookmark, usage=_("[roomname][/nick] [autojoin] [password]"), - desc=_("\nBookmark: Bookmark online the specified room (you will then auto-join it on each poezio start if autojoin is specified and is 'true'). This commands uses almost the same syntaxe as /join. Type /help join for syntaxe examples. Note that when typing \"/bookmark\" on its own, the room will be bookmarked with the nickname you\'re currently using in this room (instead of default_nick)"), + desc=_("Bookmark: Bookmark online the specified room (you " + "will then auto-join it on each poezio start if autojoin" + " is specified and is 'true'). This commands uses almost" + " the same syntax as /join. Type /help join for syntax " + "examples. Note that when typing \"/bookmark\" alone, the" + " room will be bookmarked with the nickname you\'re " + "currently using in this room (instead of default_nick)."), shortdesc=_("Bookmark a room online."), completion=self.completion_bookmark) self.register_command('set', self.command_set, usage=_("[plugin|][section]