From dd98aa44a5084f0590645f5ee9565ab962e6c844 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Sun, 10 May 2015 10:37:00 +0200
Subject: =?UTF-8?q?Remove=20gettext=20support,=20as=20we=20don=E2=80=99t?=
 =?UTF-8?q?=20want=20to=20translate=20poezio,=20and=20it=20takes=20more=20?=
 =?UTF-8?q?than=201ms=20per=20call.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/commands.py |  69 ++++++-----
 src/core/core.py     | 321 +++++++++++++++++++++++++--------------------------
 src/core/handlers.py |  57 +++++----
 src/core/structs.py  |  51 ++++----
 4 files changed, 247 insertions(+), 251 deletions(-)

(limited to 'src/core')

diff --git a/src/core/commands.py b/src/core/commands.py
index d3bf8023..3830d72a 100644
--- a/src/core/commands.py
+++ b/src/core/commands.py
@@ -8,7 +8,6 @@ log = logging.getLogger(__name__)
 
 import os
 from datetime import datetime
-from gettext import gettext as _
 from xml.etree import cElementTree as ET
 
 from slixmpp.xmlstream.stanzabase import StanzaBase
@@ -65,7 +64,7 @@ def command_help(self, args):
         buff.extend(acc)
 
         msg = '\n'.join(buff)
-        msg += _("\nType /help <command_name> to know what each command does")
+        msg += "\nType /help <command_name> to know what each command does"
     else:
         command = args[0].lstrip('/').strip()
 
@@ -74,10 +73,10 @@ def command_help(self, args):
         elif command in self.commands:
             tup = self.commands[command]
         else:
-            self.information(_('Unknown command: %s') % command, 'Error')
+            self.information('Unknown command: %s' % command, 'Error')
             return
         if isinstance(tup, Command):
-            msg = _('Usage: /%s %s\n' % (command, tup.usage))
+            msg = 'Usage: /%s %s\n' % (command, tup.usage)
             msg += tup.desc
         else:
             msg = tup[1]
@@ -155,7 +154,7 @@ def command_presence(self, args):
         self.events.trigger('send_normal_presence', pres)
         pres.send()
     except:
-        self.information(_('Could not send directed presence'), 'Error')
+        self.information('Could not send directed presence', 'Error')
         log.debug('Could not send directed presence to %s', jid, exc_info=True)
         return
     tab = self.get_tab_by_name(jid)
@@ -286,14 +285,14 @@ def command_version(self, args):
     def callback(res):
         "Callback for /version"
         if not res:
-            return self.information(_('Could not get the software'
-                                      ' version from %s') % jid,
-                                    _('Warning'))
-        version = _('%s is running %s version %s on %s') % (
+            return self.information('Could not get the software'
+                                    ' version from %s' % jid,
+                                    'Warning')
+        version = '%s is running %s version %s on %s' % (
                         jid,
-                        res.get('name') or _('an unknown software'),
-                        res.get('version') or _('unknown'),
-                        res.get('os') or _('an unknown platform'))
+                        res.get('name') or 'an unknown software',
+                        res.get('version') or 'unknown',
+                        res.get('os') or 'an unknown platform')
         self.information(version, 'Info')
 
     if args is None:
@@ -522,9 +521,9 @@ def command_remove_bookmark(self, args):
 
     def cb(success):
         if success:
-            self.information(_('Bookmark deleted'), 'Info')
+            self.information('Bookmark deleted', 'Info')
         else:
-            self.information(_('Error while deleting the bookmark'), 'Error')
+            self.information('Error while deleting the bookmark', 'Error')
 
     if not args:
         tab = self.current_tab()
@@ -532,13 +531,13 @@ def command_remove_bookmark(self, args):
             self.bookmarks.remove(tab.name)
             self.bookmarks.save(self.xmpp, callback=cb)
         else:
-            self.information(_('No bookmark to remove'), 'Info')
+            self.information('No bookmark to remove', 'Info')
     else:
         if self.bookmarks[args[0]]:
             self.bookmarks.remove(args[0])
             self.bookmarks.save(self.xmpp, callback=cb)
         else:
-            self.information(_('No bookmark to remove'), 'Info')
+            self.information('No bookmark to remove', 'Info')
 
 @command_args_parser.quoted(0, 3)
 def command_set(self, args):
@@ -610,8 +609,8 @@ def command_set(self, args):
             if args[0] == '.':
                 name = safeJID(self.current_tab().name).bare
                 if not name:
-                    self.information(_('Invalid tab to use the "." argument.'),
-                                     _('Error'))
+                    self.information('Invalid tab to use the "." argument.',
+                                     'Error')
                     return
                 section = name
             else:
@@ -672,7 +671,7 @@ def command_server_cycle(self, args):
         if isinstance(tab, tabs.MucTab):
             domain = safeJID(tab.name).domain
         else:
-            return self.information(_("No server specified"), "Error")
+            return self.information("No server specified", "Error")
     for tab in self.get_tabs(tabs.MucTab):
         if tab.name.endswith(domain):
             if tab.joined:
@@ -695,11 +694,11 @@ def command_last_activity(self, args):
         "Callback for the last activity"
         if iq['type'] != 'result':
             if iq['error']['type'] == 'auth':
-                self.information(_('You are not allowed to see the '
-                                   'activity of this contact.'),
-                                 _('Error'))
+                self.information('You are not allowed to see the '
+                                 'activity of this contact.',
+                                 'Error')
             else:
-                self.information(_('Error retrieving the activity'), 'Error')
+                self.information('Error retrieving the activity', 'Error')
             return
         seconds = iq['last_activity']['seconds']
         status = iq['last_activity']['status']
@@ -731,9 +730,9 @@ def command_mood(self, args):
 
     mood = args[0]
     if mood not in pep.MOODS:
-        return self.information(_('%s is not a correct value for a mood.')
+        return self.information('%s is not a correct value for a mood.'
                                 % mood,
-                                _('Error'))
+                                'Error')
     if len(args) == 2:
         text = args[1]
     else:
@@ -752,9 +751,9 @@ def command_activity(self, args):
 
     general = args[0]
     if general not in pep.ACTIVITIES:
-        return self.information(_('%s is not a correct value for an activity')
+        return self.information('%s is not a correct value for an activity'
                                     % general,
-                                _('Error'))
+                                'Error')
     specific = None
     text = None
     if length == 2:
@@ -766,9 +765,9 @@ def command_activity(self, args):
         specific = args[1]
         text = args[2]
     if specific and specific not in pep.ACTIVITIES[general]:
-        return self.information(_('%s is not a correct value '
-                                  'for an activity') % specific,
-                                _('Error'))
+        return self.information('%s is not a correct value '
+                                'for an activity' % specific,
+                                'Error')
     self.xmpp.plugin['xep_0108'].publish_activity(general, specific, text,
                                                   callback=dumb_callback)
 
@@ -862,7 +861,7 @@ def command_destroy_room(self, args):
     elif isinstance(self.current_tab(), tabs.MucTab) and not args[0]:
         muc.destroy_room(self.xmpp, self.current_tab().general_jid)
     else:
-        self.information(_('Invalid JID: "%s"') % args[0], _('Error'))
+        self.information('Invalid JID: "%s"' % args[0], 'Error')
 
 @command_args_parser.quoted(1, 1, [''])
 def command_bind(self, args):
@@ -873,7 +872,7 @@ def command_bind(self, args):
         return self.command_help('bind')
 
     if not config.silent_set(args[0], args[1], section='bindings'):
-        self.information(_('Unable to write in the config file'), 'Error')
+        self.information('Unable to write in the config file', 'Error')
 
     if args[1]:
         self.information('%s is now bound to %s' % (args[0], args[1]), 'Info')
@@ -913,7 +912,7 @@ def command_rawxml(self, args):
 
         stanza.send()
     except:
-        self.information(_('Could not send custom stanza'), 'Error')
+        self.information('Could not send custom stanza', 'Error')
         log.debug('/rawxml: Could not send custom stanza (%s)',
                 repr(stanza),
                 exc_info=True)
@@ -941,9 +940,9 @@ def command_plugins(self):
     """
     /plugins
     """
-    self.information(_("Plugins currently in use: %s") %
+    self.information("Plugins currently in use: %s" %
                         repr(list(self.plugin_manager.plugins.keys())),
-                     _('Info'))
+                     'Info')
 
 @command_args_parser.quoted(1, 1)
 def command_message(self, args):
diff --git a/src/core/core.py b/src/core/core.py
index e5a6a970..92c9f987 100644
--- a/src/core/core.py
+++ b/src/core/core.py
@@ -17,7 +17,6 @@ import pipes
 import sys
 import time
 from threading import Event
-from gettext import gettext as _
 
 from slixmpp.xmlstream.handler import Callback
 
@@ -509,15 +508,15 @@ class Core(object):
         default_tab = tabs.RosterInfoTab()
         default_tab.on_gain_focus()
         self.tabs.append(default_tab)
-        self.information(_('Welcome to poezio!'), _('Info'))
+        self.information('Welcome to poezio!', 'Info')
         if firstrun:
-            self.information(_(
+            self.information(
                 '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'
-                ' ask for help or tell us how great it is.'),
-                _('Help'))
+                ' ask for help or tell us how great it is.',
+                'Help')
         self.refresh_window()
         self.xmpp.plugin['xep_0012'].begin_idle(jid=self.xmpp.boundjid)
 
@@ -650,9 +649,9 @@ class Core(object):
                                       self.information_win_size,
                                       'var')
         if not ok:
-            self.information(_('Unable to save runtime preferences'
-                               ' in the config file'),
-                             _('Error'))
+            self.information('Unable to save runtime preferences'
+                             ' in the config file',
+                             'Error')
 
     def on_roster_enter_key(self, roster_row):
         """
@@ -708,8 +707,8 @@ class Core(object):
                 func(arg)
                 return
             else:
-                self.information(_("Unknown command (%s)") % (command),
-                                 _('Error'))
+                self.information("Unknown command (%s)" % (command),
+                                 'Error')
 
     def exec_command(self, command):
         """
@@ -842,8 +841,8 @@ class Core(object):
             msg = msg.replace('\n', '|') if msg else ''
             ok = ok and config.silent_set('status_message', msg)
             if not ok:
-                self.information(_('Unable to save the status in '
-                                   'the config file'), 'Error')
+                self.information('Unable to save the status in '
+                                 'the config file', 'Error')
 
     def get_bookmark_nickname(self, room_name):
         """
@@ -917,18 +916,18 @@ class Core(object):
                 if code in DEPRECATED_ERRORS:
                     body = DEPRECATED_ERRORS[code]
                 else:
-                    body = condition or _('Unknown error')
+                    body = condition or 'Unknown error'
             else:
                 if code in ERROR_AND_STATUS_CODES:
                     body = ERROR_AND_STATUS_CODES[code]
                 else:
-                    body = condition or _('Unknown error')
+                    body = condition or 'Unknown error'
         if code:
-            message = _('%(from)s: %(code)s - %(msg)s: %(body)s') % {
-                    'from': sender, 'msg': msg, 'body': body, 'code': code}
+            message = '%(from)s: %(code)s - %(msg)s: %(body)s' % {
+                      'from': sender, 'msg': msg, 'body': body, 'code': code}
         else:
-            message = _('%(from)s: %(msg)s: %(body)s') % {
-                    'from': sender, 'msg': msg, 'body': body}
+            message = '%(from)s: %(msg)s: %(body)s' % {
+                      'from': sender, 'msg': msg, 'body': body}
         return message
 
 
@@ -1295,7 +1294,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 chatroom\x193}'
         for tab in self.get_tabs(tabs.PrivateTab):
             if tab.name.startswith(room_name):
                 tab.deactivate(reason=reason)
@@ -1305,7 +1304,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 chatroom\x193}'
         for tab in self.get_tabs(tabs.PrivateTab):
             if tab.name.startswith(room_name):
                 tab.activate(reason=reason)
@@ -1594,7 +1593,7 @@ class Core(object):
         """
         enabled = config.get('enable_vertical_tab_list')
         if not config.silent_set('enable_vertical_tab_list', str(not enabled)):
-            self.information(_('Unable to write in the config file'), 'Error')
+            self.information('Unable to write in the config file', 'Error')
         self.call_for_resize()
 
     def resize_global_information_win(self):
@@ -1719,225 +1718,225 @@ class Core(object):
         Register the commands when poezio starts
         """
         self.register_command('help', self.command_help,
-                usage=_('[command]'),
+                usage='[command]',
                 shortdesc='\\_o< KOIN KOIN KOIN',
                 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"),
-                shortdesc=_('Join a room'),
+                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",
+                shortdesc='Join a room',
                 completion=self.completion_join)
         self.register_command('exit', self.command_quit,
-                desc=_('Just disconnect from the server and exit poezio.'),
-                shortdesc=_('Exit poezio.'))
+                desc='Just disconnect from the server and exit poezio.',
+                shortdesc='Exit poezio.')
         self.register_command('quit', self.command_quit,
-                desc=_('Just disconnect from the server and exit poezio.'),
-                shortdesc=_('Exit poezio.'))
+                desc='Just disconnect from the server and exit poezio.',
+                shortdesc='Exit poezio.')
         self.register_command('next', self.rotate_rooms_right,
-                shortdesc=_('Go to the next room.'))
+                shortdesc='Go to the next room.')
         self.register_command('prev', self.rotate_rooms_left,
-                shortdesc=_('Go to the previous room.'))
+                shortdesc='Go to the previous room.')
         self.register_command('win', self.command_win,
-                usage=_('<number or name>'),
-                shortdesc=_('Go to the specified room'),
+                usage='<number or name>',
+                shortdesc='Go to the specified room',
                 completion=self.completion_win)
         self.commands['w'] = self.commands['win']
         self.register_command('move_tab', self.command_move_tab,
-                usage=_('<source> <destination>'),
-                desc=_("Insert the <source> tab at the position of "
-                    "<destination>. 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. You can use \".\" as a shortcut for the current "
-                    "tab."),
-                shortdesc=_('Move a tab.'),
+                usage='<source> <destination>',
+                desc="Insert the <source> tab at the position of "
+                     "<destination>. 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. You can use \".\" as a shortcut for the current "
+                     "tab.",
+                shortdesc='Move a tab.',
                 completion=self.completion_move_tab)
         self.register_command('destroy_room', self.command_destroy_room,
-                usage=_('[room JID]'),
-                desc=_('Try to destroy the room [room JID], or the current'
-                       ' tab if it is a multi-user chat and [room JID] is '
-                       'not given.'),
-                shortdesc=_('Destroy a room.'),
+                usage='[room JID]',
+                desc='Try to destroy the room [room JID], or the current'
+                     ' tab if it is a multi-user chat and [room JID] is '
+                     'not given.',
+                shortdesc='Destroy a room.',
                 completion=None)
         self.register_command('show', self.command_status,
-                usage=_('<availability> [status message]'),
-                desc=_("Sets your availability and (optionally) your status "
-                    "message. The <availability> 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.'),
+                usage='<availability> [status message]',
+                desc="Sets your availability and (optionally) your status "
+                     "message. The <availability> 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 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.'),
+                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 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=_("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."),
+                usage="[roomname][/nick] [autojoin] [password]",
+                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] <option> [value]"),
-                desc=_("Set the value of an option in your configuration file."
-                    " You can, for example, change your default nickname by "
-                    "doing `/set default_nick toto` or your resource with `/set"
-                    " resource blabla`. You can also set options in specific "
-                    "sections with `/set bindings M-i ^i` or in specific plugin"
-                    " with `/set mpd_client| host 127.0.0.1`. `toggle` can be "
-                    "used as a special value to toggle a boolean option."),
-                shortdesc=_("Set the value of an option"),
+                usage="[plugin|][section] <option> [value]",
+                desc="Set the value of an option in your configuration file."
+                     " You can, for example, change your default nickname by "
+                     "doing `/set default_nick toto` or your resource with `/set"
+                     " resource blabla`. You can also set options in specific "
+                     "sections with `/set bindings M-i ^i` or in specific plugin"
+                     " with `/set mpd_client| host 127.0.0.1`. `toggle` can be "
+                     "used as a special value to toggle a boolean option.",
+                shortdesc="Set the value of an option",
                 completion=self.completion_set)
         self.register_command('set_default', self.command_set_default,
-                usage=_("[section] <option>"),
-                desc=_("Set the default value of an option. For example, "
-                       "`/set_default resource` will reset the resource "
-                       "option. You can also reset options in specific "
-                       "sections by doing `/set_default section option`."),
-                shortdesc=_("Set the default value of an option"),
+                usage="[section] <option>",
+                desc="Set the default value of an option. For example, "
+                     "`/set_default resource` will reset the resource "
+                     "option. You can also reset options in specific "
+                     "sections by doing `/set_default section option`.",
+                shortdesc="Set the default value of an option",
                 completion=self.completion_set_default)
         self.register_command('toggle', self.command_toggle,
-                usage=_('<option>'),
-                desc=_('Shortcut for /set <option> toggle'),
-                shortdesc=_('Toggle an option'),
+                usage='<option>',
+                desc='Shortcut for /set <option> toggle',
+                shortdesc='Toggle an option',
                 completion=self.completion_toggle)
         self.register_command('theme', self.command_theme,
-                usage=_('[theme name]'),
-                desc=_("Reload the theme defined in the config file. If theme"
-                    "_name is provided, set that theme before reloading it."),
-                shortdesc=_('Load a theme'),
+                usage='[theme name]',
+                desc="Reload the theme defined in the config file. If theme"
+                     "_name is provided, set that theme before reloading it.",
+                shortdesc='Load a theme',
                 completion=self.completion_theme)
         self.register_command('list', self.command_list,
-                usage=_('[server]'),
-                desc=_("Get the list of public chatrooms"
-                    " on the specified server."),
-                shortdesc=_('List the rooms.'),
+                usage='[server]',
+                desc="Get the list of public chatrooms"
+                     " on the specified server.",
+                shortdesc='List the rooms.',
                 completion=self.completion_list)
         self.register_command('message', self.command_message,
-                usage=_('<jid> [optional message]'),
-                desc=_("Open a conversation with the specified JID (even if it"
-                    " is not in our roster), and send a message to it, if the "
-                    "message is specified."),
-                shortdesc=_('Send a message'),
+                usage='<jid> [optional message]',
+                desc="Open a conversation with the specified JID (even if it"
+                     " is not in our roster), and send a message to it, if the "
+                     "message is specified.",
+                shortdesc='Send a message',
                 completion=self.completion_message)
         self.register_command('version', self.command_version,
                 usage='<jid>',
-                desc=_("Get the software version of the given JID (usually its"
-                    " XMPP client and Operating System)."),
-                shortdesc=_('Get the software version of a JID.'),
+                desc="Get the software version of the given JID (usually its"
+                     " XMPP client and Operating System).",
+                shortdesc='Get the software version of a JID.',
                 completion=self.completion_version)
         self.register_command('server_cycle', self.command_server_cycle,
-                usage=_('[domain] [message]'),
-                desc=_('Disconnect and reconnect in all the rooms in domain.'),
-                shortdesc=_('Cycle a range of rooms'),
+                usage='[domain] [message]',
+                desc='Disconnect and reconnect in all the rooms in domain.',
+                shortdesc='Cycle a range of rooms',
                 completion=self.completion_server_cycle)
         self.register_command('bind', self.command_bind,
-                usage=_('<key> <equ>'),
-                desc=_("Bind a key to another key or to a “command”. For "
-                    "example \"/bind ^H KEY_UP\" makes Control + h do the"
-                    " same same as the Up key."),
+                usage='<key> <equ>',
+                desc="Bind a key to another key or to a “command”. For "
+                     "example \"/bind ^H KEY_UP\" makes Control + h do the"
+                     " same same as the Up key.",
                 completion=self.completion_bind,
-                shortdesc=_('Bind a key to another key.'))
+                shortdesc='Bind a key to another key.')
         self.register_command('load', self.command_load,
-                usage=_('<plugin> [<otherplugin> …]'),
-                shortdesc=_('Load the specified plugin(s)'),
+                usage='<plugin> [<otherplugin> …]',
+                shortdesc='Load the specified plugin(s)',
                 completion=self.plugin_manager.completion_load)
         self.register_command('unload', self.command_unload,
-                usage=_('<plugin> [<otherplugin> …]'),
-                shortdesc=_('Unload the specified plugin(s)'),
+                usage='<plugin> [<otherplugin> …]',
+                shortdesc='Unload the specified plugin(s)',
                 completion=self.plugin_manager.completion_unload)
         self.register_command('plugins', self.command_plugins,
-                shortdesc=_('Show the plugins in use.'))
+                shortdesc='Show the plugins in use.')
         self.register_command('presence', self.command_presence,
-                usage=_('<JID> [type] [status]'),
-                desc=_("Send a directed presence to <JID> and using"
-                    " [type] and [status] if provided."),
-                shortdesc=_('Send a directed presence.'),
+                usage='<JID> [type] [status]',
+                desc="Send a directed presence to <JID> and using"
+                     " [type] and [status] if provided.",
+                shortdesc='Send a directed presence.',
                 completion=self.completion_presence)
         self.register_command('rawxml', self.command_rawxml,
                 usage='<xml>',
-                shortdesc=_('Send a custom xml stanza.'))
+                shortdesc='Send a custom xml stanza.')
         self.register_command('invite', self.command_invite,
-                usage=_('<jid> <room> [reason]'),
-                desc=_('Invite jid in room with reason.'),
-                shortdesc=_('Invite someone in a room.'),
+                usage='<jid> <room> [reason]',
+                desc='Invite jid in room with reason.',
+                shortdesc='Invite someone in a room.',
                 completion=self.completion_invite)
         self.register_command('invitations', self.command_invitations,
-                shortdesc=_('Show the pending invitations.'))
+                shortdesc='Show the pending invitations.')
         self.register_command('bookmarks', self.command_bookmarks,
-                shortdesc=_('Show the current bookmarks.'))
+                shortdesc='Show the current bookmarks.')
         self.register_command('remove_bookmark', self.command_remove_bookmark,
                 usage='[jid]',
-                desc=_("Remove the specified bookmark, or the "
-                    "bookmark on the current tab, if any."),
-                shortdesc=_('Remove a bookmark'),
+                desc="Remove the specified bookmark, or the "
+                     "bookmark on the current tab, if any.",
+                shortdesc='Remove a bookmark',
                 completion=self.completion_remove_bookmark)
         self.register_command('xml_tab', self.command_xml_tab,
-                shortdesc=_('Open an XML tab.'))
+                shortdesc='Open an XML tab.')
         self.register_command('runkey', self.command_runkey,
-                usage=_('<key>'),
-                shortdesc=_('Execute the action defined for <key>.'),
+                usage='<key>',
+                shortdesc='Execute the action defined for <key>.',
                 completion=self.completion_runkey)
         self.register_command('self', self.command_self,
-                shortdesc=_('Remind you of who you are.'))
+                shortdesc='Remind you of who you are.')
         self.register_command('last_activity', self.command_last_activity,
                 usage='<jid>',
-                desc=_('Informs you of the last activity of a JID.'),
-                shortdesc=_('Get the activity of someone.'),
+                desc='Informs you of the last activity of a JID.',
+                shortdesc='Get the activity of someone.',
                 completion=self.completion_last_activity)
         self.register_command('ad-hoc', self.command_adhoc,
                 usage='<jid>',
-                shortdesc=_('List available ad-hoc commands on the given jid'))
+                shortdesc='List available ad-hoc commands on the given jid')
         self.register_command('reload', self.command_reload,
-                shortdesc=_('Reload the config. You can achieve the same by '
-                            'sending SIGUSR1 to poezio.'))
+                shortdesc='Reload the config. You can achieve the same by '
+                          'sending SIGUSR1 to poezio.')
 
         if config.get('enable_user_activity'):
             self.register_command('activity', self.command_activity,
                     usage='[<general> [specific] [text]]',
-                    desc=_('Send your current activity to your contacts '
-                           '(use the completion). Nothing means '
-                           '"stop broadcasting an activity".'),
-                    shortdesc=_('Send your activity.'),
+                    desc='Send your current activity to your contacts '
+                         '(use the completion). Nothing means '
+                         '"stop broadcasting an activity".',
+                    shortdesc='Send your activity.',
                     completion=self.completion_activity)
         if config.get('enable_user_mood'):
             self.register_command('mood', self.command_mood,
                     usage='[<mood> [text]]',
-                    desc=_('Send your current mood to your contacts '
-                           '(use the completion). Nothing means '
-                           '"stop broadcasting a mood".'),
-                    shortdesc=_('Send your mood.'),
+                    desc='Send your current mood to your contacts '
+                         '(use the completion). Nothing means '
+                         '"stop broadcasting a mood".',
+                    shortdesc='Send your mood.',
                     completion=self.completion_mood)
         if config.get('enable_user_gaming'):
             self.register_command('gaming', self.command_gaming,
                     usage='[<game name> [server address]]',
-                    desc=_('Send your current gaming activity to '
-                           'your contacts. Nothing means "stop '
-                           'broadcasting a gaming activity".'),
-                    shortdesc=_('Send your gaming activity.'),
+                    desc='Send your current gaming activity to '
+                         'your contacts. Nothing means "stop '
+                         'broadcasting a gaming activity".',
+                    shortdesc='Send your gaming activity.',
                     completion=None)
 
 ####################### XMPP Event Handlers  ##################################
diff --git a/src/core/handlers.py b/src/core/handlers.py
index 720a0977..828c39d1 100644
--- a/src/core/handlers.py
+++ b/src/core/handlers.py
@@ -12,7 +12,6 @@ import ssl
 import sys
 import time
 from hashlib import sha1, sha512
-from gettext import gettext as _
 from os import path
 
 from slixmpp import InvalidJID
@@ -80,8 +79,8 @@ def check_bookmark_storage(self, features):
             type_ = iq['error']['type']
             condition = iq['error']['condition']
             if not (type_ == 'cancel' and condition == 'item-not-found'):
-                self.information(_('Unable to fetch the remote'
-                                   ' bookmarks; %s: %s') % (type_, condition),
+                self.information('Unable to fetch the remote'
+                                 ' bookmarks; %s: %s' % (type_, condition),
                                  'Error')
             return
         remote_bookmarks = self.bookmarks.remote()
@@ -245,7 +244,7 @@ def on_error_message(self, message):
     tab = self.get_conversation_by_jid(message['from'], create=False)
     error_msg = self.get_error_message(message, deprecated=True)
     if not tab:
-        return self.information(error_msg, _('Error'))
+        return self.information(error_msg, 'Error')
     error = '\x19%s}%s\x19o' % (dump_tuple(get_theme().COLOR_CHAR_NACK),
                                   error_msg)
     if not tab.nack_message('\n' + error, message['id'], message['to']):
@@ -522,7 +521,7 @@ def on_groupchat_message(self, message):
 
     tab = self.get_tab_by_name(room_from, tabs.MucTab)
     if not tab:
-        self.information(_("message received for a non-existing room: %s") % (room_from))
+        self.information("message received for a non-existing room: %s" % (room_from))
         muc.leave_groupchat(self.xmpp, room_from, self.own_nick, msg='')
         return
 
@@ -763,10 +762,10 @@ def on_subscription_request(self, presence):
             contact = roster.get_and_set(jid)
         roster.update_contact_groups(contact)
         contact.pending_in = True
-        self.information(_('%s wants to subscribe to your presence, '
-                           'use /accept <jid> or /deny <jid> to accept '
-                           'or reject the query.') % jid,
-                          'Roster')
+        self.information('%s wants to subscribe to your presence, '
+                         'use /accept <jid> or /deny <jid> to accept '
+                         'or reject the query.' % jid,
+                         'Roster')
         self.get_tab_by_number(0).state = 'highlight'
         roster.modified()
     if isinstance(self.current_tab(), tabs.RosterInfoTab):
@@ -859,7 +858,7 @@ def on_got_offline(self, presence):
         return
     jid = presence['from']
     if not logger.log_roster_change(jid.bare, 'got offline'):
-        self.information(_('Unable to write in the log file'), 'Error')
+        self.information('Unable to write in the log file', 'Error')
     # If a resource got offline, display the message in the conversation with this
     # precise resource.
     if jid.resource:
@@ -883,7 +882,7 @@ def on_got_online(self, presence):
         return
     roster.modified()
     if not logger.log_roster_change(jid.bare, 'got online'):
-        self.information(_('Unable to write in the log file'), 'Error')
+        self.information('Unable to write in the log file', 'Error')
     resource = Resource(jid.full, {
         'priority': presence.get_priority() or 0,
         'status': presence['status'],
@@ -920,7 +919,7 @@ def on_failed_connection(self, error):
     """
     We cannot contact the remote server
     """
-    self.information(_("Connection to remote server failed: %s" % (error,)), _('Error'))
+    self.information("Connection to remote server failed: %s" % (error,), 'Error')
 
 def on_disconnected(self, event):
     """
@@ -931,10 +930,10 @@ def on_disconnected(self, event):
     roster.modified()
     for tab in self.get_tabs(tabs.MucTab):
         tab.disconnect()
-    msg_typ = _('Error') if not self.legitimate_disconnect else _('Info')
-    self.information(_("Disconnected from server."), msg_typ)
+    msg_typ = 'Error' if not self.legitimate_disconnect else 'Info'
+    self.information("Disconnected from server.", msg_typ)
     if not self.legitimate_disconnect and config.get('auto_reconnect', True):
-        self.information(_("Auto-reconnecting."), _('Info'))
+        self.information("Auto-reconnecting.", 'Info')
         self.xmpp.connect()
 
 def on_stream_error(self, event):
@@ -942,29 +941,29 @@ def on_stream_error(self, event):
     When we receive a stream error
     """
     if event and event['text']:
-        self.information(_('Stream error: %s') % event['text'], _('Error'))
+        self.information('Stream error: %s' % event['text'], 'Error')
 
 def on_failed_all_auth(self, event):
     """
     Authentication failed
     """
-    self.information(_("Authentication failed (bad credentials?)."),
-                     _('Error'))
+    self.information("Authentication failed (bad credentials?).",
+                     'Error')
     self.legitimate_disconnect = True
 
 def on_no_auth(self, event):
     """
     Authentication failed (no mech)
     """
-    self.information(_("Authentication failed, no login method available."),
-                     _('Error'))
+    self.information("Authentication failed, no login method available.",
+                     'Error')
     self.legitimate_disconnect = True
 
 def on_connected(self, event):
     """
     Remote host responded, but we are not yet authenticated
     """
-    self.information(_("Connected to server."), 'Info')
+    self.information("Connected to server.", 'Info')
 
 def on_connecting(self, event):
     """
@@ -979,8 +978,8 @@ def on_session_start(self, event):
     self.connection_time = time.time()
     if not self.plugins_autoloaded: # Do not reload plugins on reconnection
         self.autoload_plugins()
-    self.information(_("Authentication success."), 'Info')
-    self.information(_("Your JID is %s") % self.xmpp.boundjid.full, 'Info')
+    self.information("Authentication success.", 'Info')
+    self.information("Your JID is %s" % self.xmpp.boundjid.full, 'Info')
     if not self.xmpp.anon:
         # request the roster
         self.xmpp.get_roster()
@@ -1075,12 +1074,12 @@ def on_groupchat_subject(self, message):
         # Do not display the message if the subject did not change or if we
         # receive an empty topic when joining the room.
         if nick_from:
-            tab.add_message(_("\x19%(info_col)s}%(nick)s set the subject to: %(subject)s") %
+            tab.add_message("\x19%(info_col)s}%(nick)s set the subject to: %(subject)s" %
                     {'info_col': dump_tuple(get_theme().COLOR_INFORMATION_TEXT), 'nick':nick_from, 'subject':subject},
                     time=None,
                     typ=2)
         else:
-            tab.add_message(_("\x19%(info_col)s}The subject is: %(subject)s") %
+            tab.add_message("\x19%(info_col)s}The subject is: %(subject)s" %
                     {'subject':subject, 'info_col': dump_tuple(get_theme().COLOR_INFORMATION_TEXT)},
                     time=None,
                     typ=2)
@@ -1144,14 +1143,14 @@ def room_error(self, error, room_name):
                     nick_color=get_theme().COLOR_ERROR_MSG, typ=2)
     code = error['error']['code']
     if code == '401':
-        msg = _('To provide a password in order to join the room, type "/join / password" (replace "password" by the real password)')
+        msg = 'To provide a password in order to join the room, type "/join / password" (replace "password" by the real password)'
         tab.add_message(msg, typ=2)
     if code == '409':
         if config.get('alternative_nickname') != '':
             self.command_join('%s/%s'% (tab.name, tab.own_nick+config.get('alternative_nickname')))
         else:
             if not tab.joined:
-                tab.add_message(_('You can join the room with an other nick, by typing "/join /other_nick"'), typ=2)
+                tab.add_message('You can join the room with an other nick, by typing "/join /other_nick"', typ=2)
     self.refresh_window()
 
 def outgoing_stanza(self, stanza):
@@ -1243,7 +1242,7 @@ def validate_ssl(self, pem):
                     self.information('Setting new certificate: old: %s, new: %s' % (cert, sha2_found_cert), 'Info')
                     log.debug('Setting certificate to %s', sha2_found_cert)
                     if not config.silent_set('certificate', sha2_found_cert):
-                        self.information(_('Unable to write in the config file'), 'Error')
+                        self.information('Unable to write in the config file', 'Error')
                 else:
                     self.information('You refused to validate the certificate. You are now disconnected', 'Info')
                     self.disconnect()
@@ -1263,7 +1262,7 @@ def validate_ssl(self, pem):
     else:
         log.debug('First time. Setting certificate to %s', sha2_found_cert)
         if not config.silent_set('certificate', sha2_found_cert):
-            self.information(_('Unable to write in the config file'), 'Error')
+            self.information('Unable to write in the config file', 'Error')
 
 def _composing_tab_state(tab, state):
     """
diff --git a/src/core/structs.py b/src/core/structs.py
index d97acd9f..4ce0ef43 100644
--- a/src/core/structs.py
+++ b/src/core/structs.py
@@ -2,39 +2,38 @@
 Module defining structures useful to the core class and related methods
 """
 import collections
-from gettext import gettext as _
 
 # http://xmpp.org/extensions/xep-0045.html#errorstatus
 ERROR_AND_STATUS_CODES = {
-    '401': _('A password is required'),
-    '403': _('Permission denied'),
-    '404': _('The room doesn’t exist'),
-    '405': _('Your are not allowed to create a new room'),
-    '406': _('A reserved nick must be used'),
-    '407': _('You are not in the member list'),
-    '409': _('This nickname is already in use or has been reserved'),
-    '503': _('The maximum number of users has been reached'),
+    '401': 'A password is required',
+    '403': 'Permission denied',
+    '404': 'The room doesn’t exist',
+    '405': 'Your are not allowed to create a new room',
+    '406': 'A reserved nick must be used',
+    '407': 'You are not in the member list',
+    '409': 'This nickname is already in use or has been reserved',
+    '503': 'The maximum number of users has been reached',
     }
 
 # http://xmpp.org/extensions/xep-0086.html
 DEPRECATED_ERRORS = {
-    '302': _('Redirect'),
-    '400': _('Bad request'),
-    '401': _('Not authorized'),
-    '402': _('Payment required'),
-    '403': _('Forbidden'),
-    '404': _('Not found'),
-    '405': _('Not allowed'),
-    '406': _('Not acceptable'),
-    '407': _('Registration required'),
-    '408': _('Request timeout'),
-    '409': _('Conflict'),
-    '500': _('Internal server error'),
-    '501': _('Feature not implemented'),
-    '502': _('Remote server error'),
-    '503': _('Service unavailable'),
-    '504': _('Remote server timeout'),
-    '510': _('Disconnected'),
+    '302': 'Redirect',
+    '400': 'Bad request',
+    '401': 'Not authorized',
+    '402': 'Payment required',
+    '403': 'Forbidden',
+    '404': 'Not found',
+    '405': 'Not allowed',
+    '406': 'Not acceptable',
+    '407': 'Registration required',
+    '408': 'Request timeout',
+    '409': 'Conflict',
+    '500': 'Internal server error',
+    '501': 'Feature not implemented',
+    '502': 'Remote server error',
+    '503': 'Service unavailable',
+    '504': 'Remote server timeout',
+    '510': 'Disconnected',
 }
 
 possible_show = {'available':None,
-- 
cgit v1.2.3