use gettext.install. Fixes #497

35 files changed, 9 insertions, 171 deletions

diff --git a/src/advanced.py b/src/advanced.py
index c58917bb5..141ff3902 100644
--- a/src/advanced.py
+++ b/src/advanced.py
@@ -25,16 +25,9 @@
 ##
 
 import gtk
-import gtk.glade
 import gtkgui_helpers
 
 from common import gajim
-from common import i18n
-
-_ = i18n._
-APP = i18n.APP
-gtk.glade.bindtextdomain(APP, i18n.DIR)
-gtk.glade.textdomain(APP)
 
 (
 OPT_TYPE,
diff --git a/src/chat_control.py b/src/chat_control.py
index a39962fcc..3d5733760 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -18,7 +18,6 @@
 import os
 import time
 import gtk
-import gtk.glade
 import pango
 import gobject
 import gtkgui_helpers
@@ -41,11 +40,6 @@ try:
 except:
 	HAS_GTK_SPELL = False
 
-####################
-# FIXME: Can't this stuff happen once?
-from common import i18n
-_ = i18n._
-APP = i18n.APP
 
 ################################################################################
 class ChatControlBase(MessageControl):
diff --git a/src/common/check_paths.py b/src/common/check_paths.py
index 396db51da..03850e7c4 100644
--- a/src/common/check_paths.py
+++ b/src/common/check_paths.py
@@ -28,10 +28,6 @@ import stat
 
 from common import gajim
 import logger
-import i18n
-
-_ = i18n._
-Q_ = i18n.Q_
 
 from pysqlite2 import dbapi2 as sqlite # DO NOT MOVE ABOVE OF import gajim
 
diff --git a/src/common/config.py b/src/common/config.py
index e20a0baba..fb5bb4a50 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -20,8 +20,6 @@
 
 import sre
 import copy
-import i18n
-_ = i18n._
 
 
 (
diff --git a/src/common/connection.py b/src/common/connection.py
index 9a34524ab..7a4574d11 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -42,9 +42,6 @@ from common import GnuPG
 from connection_handlers import *
 USE_GPG = GnuPG.USE_GPG
 
-from common import i18n
-_ = i18n._
-
 class Connection(ConnectionHandlers):
 	'''Connection class'''
 	def __init__(self, name):
diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index bd0a100c3..e2e6cfef5 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -32,8 +32,6 @@ import common.xmpp
 from common import GnuPG
 from common import helpers
 from common import gajim
-from common import i18n
-_ = i18n._
 
 STATUS_LIST = ['offline', 'connecting', 'online', 'chat', 'away', 'xa', 'dnd',
 	'invisible']
diff --git a/src/common/exceptions.py b/src/common/exceptions.py
index 3389f3aab..0b1bc8c4a 100644
--- a/src/common/exceptions.py
+++ b/src/common/exceptions.py
@@ -23,9 +23,6 @@
 ## GNU General Public License for more details.
 ##
 
-from common import i18n
-_ = i18n._
-
 class PysqliteNotAvailable(Exception):
 	'''sqlite2 is not installed or python bindings are missing'''
 	def __init__(self):
diff --git a/src/common/helpers.py b/src/common/helpers.py
index c7593d562..e8b4a0eef 100644
--- a/src/common/helpers.py
+++ b/src/common/helpers.py
@@ -26,7 +26,7 @@ import sha
 from encodings.punycode import punycode_encode
 
 import gajim
-import i18n
+from i18n import Q_
 from xmpp_stringprep import nodeprep, resourceprep, nameprep
 
 try:
@@ -36,9 +36,6 @@ try:
 except:
 	pass
 
-_ = i18n._
-Q_ = i18n.Q_
-
 special_groups = (_('Transports'), _('Not in Roster'), _('Observers'))
 
 class InvalidFormat(Exception):
diff --git a/src/common/i18n.py b/src/common/i18n.py
index 7af267990..ae23f0e2f 100644
--- a/src/common/i18n.py
+++ b/src/common/i18n.py
@@ -48,21 +48,11 @@ if os.name == 'nt':
 	if lang:
 		os.environ['LANG'] = lang
 
-_translation = None
-
-def init():
-	global _translation
-	try:
-		_translation = gettext.translation(APP, DIR)
-	except IOError:
-		_translation = gettext.NullTranslations()
-
-init()
-
-def _(s):
-	if s == '':
-		return s
-	return _translation.ugettext(s)
+gettext.install(APP, DIR, unicode = True)
+if gettext._translations:
+	_translation = gettext._translations.values()[0]
+else:
+	_translation = gettext.NullTranslations()
 
 def Q_(s):
 	# Qualified translatable strings
diff --git a/src/common/logger.py b/src/common/logger.py
index c7acf8ede..8ab8ee785 100644
--- a/src/common/logger.py
+++ b/src/common/logger.py
@@ -29,11 +29,8 @@ import time
 import datetime
 
 import exceptions
-import i18n
 import gajim
 
-_ = i18n._
-
 try:
 	from pysqlite2 import dbapi2 as sqlite
 except ImportError:
diff --git a/src/common/optparser.py b/src/common/optparser.py
index 8b8adb4e2..d7f27647d 100644
--- a/src/common/optparser.py
+++ b/src/common/optparser.py
@@ -26,8 +26,6 @@ import os
 import sys
 import locale
 from common import gajim
-from common import i18n
-_ = i18n._
 
 class OptionsParser:
 	def __init__(self, filename):
diff --git a/src/config.py b/src/config.py
index ae9e1088d..35b3b45f2 100644
--- a/src/config.py
+++ b/src/config.py
@@ -16,7 +16,6 @@
 ##
 
 import gtk
-import gtk.glade
 import gobject
 import os
 import common.config
@@ -38,12 +37,6 @@ except:
 from common import helpers
 from common import gajim
 from common import connection
-from common import i18n
-
-_ = i18n._
-APP = i18n.APP
-gtk.glade.bindtextdomain (APP, i18n.DIR)
-gtk.glade.textdomain (APP)
 
 #---------- PreferencesWindow class -------------#
 class PreferencesWindow:
diff --git a/src/conversation_textview.py b/src/conversation_textview.py
index bcf101292..9fb099277 100644
--- a/src/conversation_textview.py
+++ b/src/conversation_textview.py
@@ -24,7 +24,6 @@
 ##
 
 import gtk
-import gtk.glade
 import pango
 import gobject
 import time
@@ -36,14 +35,8 @@ import locale
 import gtkgui_helpers
 from common import gajim
 from common import helpers
-from common import i18n
 from calendar import timegm
 
-_ = i18n._
-APP = i18n.APP
-gtk.glade.bindtextdomain(APP, i18n.DIR)
-gtk.glade.textdomain(APP)
-
 class ConversationTextview:
 	'''Class for the conversation textview (where user reads already said messages)
 	for chat/groupchat windows'''
diff --git a/src/dbus_support.py b/src/dbus_support.py
index 9d8d74bd6..59e751c41 100644
--- a/src/dbus_support.py
+++ b/src/dbus_support.py
@@ -20,8 +20,6 @@ import sys
 
 from common import gajim
 from common import exceptions
-from common import i18n
-_ = i18n._
 
 try:
 	import dbus
diff --git a/src/dialogs.py b/src/dialogs.py
index 523686973..7293f6c1b 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -19,7 +19,6 @@
 ##
 
 import gtk
-import gtk.glade
 import gobject
 import os
 import sys
@@ -42,12 +41,6 @@ from advanced import AdvancedConfigurationWindow
 
 from common import gajim
 from common import helpers
-from common import i18n
-
-_ = i18n._
-APP = i18n.APP
-gtk.glade.bindtextdomain (APP, i18n.DIR)
-gtk.glade.textdomain (APP)
 
 class EditGroupsDialog:
 	'''Class for the edit group dialog window'''
diff --git a/src/disco.py b/src/disco.py
index 2730b68f2..8254e399e 100644
--- a/src/disco.py
+++ b/src/disco.py
@@ -51,7 +51,6 @@ import inspect
 import weakref
 import gobject
 import gtk
-import gtk.glade
 import pango
 
 import dialogs
@@ -60,12 +59,6 @@ import gtkgui_helpers
 
 from common import gajim
 from common import xmpp
-from common import i18n
-
-_ = i18n._
-APP = i18n.APP
-gtk.glade.bindtextdomain (APP, i18n.DIR)
-gtk.glade.textdomain (APP)
 
 # Dictionary mapping category, type pairs to browser class, image pairs.
 # This is a function, so we can call it after the classes are declared.
diff --git a/src/filetransfers_window.py b/src/filetransfers_window.py
index b413dea79..2b93eaa28 100644
--- a/src/filetransfers_window.py
+++ b/src/filetransfers_window.py
@@ -18,7 +18,6 @@
 ##
 
 import gtk
-import gtk.glade
 import gobject
 import pango
 import os
@@ -30,12 +29,6 @@ import dialogs
 
 from common import gajim
 from common import helpers
-from common import i18n
-
-_ = i18n._
-APP = i18n.APP
-gtk.glade.bindtextdomain (APP, i18n.DIR)
-gtk.glade.textdomain (APP)
 
 C_IMAGE = 0
 C_LABELS = 1
diff --git a/src/gajim-remote.py b/src/gajim-remote.py
index fddd334ba..03e64f1f1 100755
--- a/src/gajim-remote.py
+++ b/src/gajim-remote.py
@@ -38,8 +38,6 @@ signal.signal(signal.SIGINT, signal.SIG_DFL) # ^C exits the application
 from common import exceptions
 from common import i18n
 
-_ = i18n._
-i18n.init()
 try:
 	PREFERRED_ENCODING = locale.getpreferredencoding()
 except:
diff --git a/src/gajim.py b/src/gajim.py
index 6e2433e24..2a85da404 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -33,14 +33,13 @@ import sys
 import os
 import urllib
 
+from common import i18n
+
 import message_control
 
 from chat_control import ChatControlBase
 
 from common import exceptions
-from common import i18n
-i18n.init()
-_ = i18n._
 
 try:
 	import gtk
diff --git a/src/gajim_themes_window.py b/src/gajim_themes_window.py
index c57ed2665..33d5e0569 100644
--- a/src/gajim_themes_window.py
+++ b/src/gajim_themes_window.py
@@ -25,17 +25,11 @@
 ##
 
 import gtk
-import gtk.glade
 import pango
 import dialogs
 import gtkgui_helpers
 
 from common import gajim
-from common import i18n
-_ = i18n._
-APP = i18n.APP
-gtk.glade.bindtextdomain (APP, i18n.DIR)
-gtk.glade.textdomain (APP)
 
 class GajimThemesWindow:
 
diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index 68b2bdb34..cd22d30e3 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -23,7 +23,6 @@
 import os
 import time
 import gtk
-import gtk.glade
 import pango
 import gobject
 import gtkgui_helpers
@@ -40,13 +39,6 @@ from common import helpers
 from chat_control import ChatControl
 from chat_control import ChatControlBase
 from conversation_textview import ConversationTextview
-from common import i18n
-
-_ = i18n._
-Q_ = i18n.Q_
-APP = i18n.APP
-gtk.glade.bindtextdomain(APP, i18n.DIR)
-gtk.glade.textdomain(APP)
 
 #(status_image, type, nick, shown_nick)
 (
diff --git a/src/gtkexcepthook.py b/src/gtkexcepthook.py
index 515af42ae..875da8ee4 100644
--- a/src/gtkexcepthook.py
+++ b/src/gtkexcepthook.py
@@ -37,9 +37,7 @@ import dialogs
 
 from cStringIO import StringIO
 from common import helpers
-from common import i18n
 
-_ = i18n._
 _exception_in_progress = threading.Lock()
 
 def _info(type, value, tb):
diff --git a/src/gtkgui_helpers.py b/src/gtkgui_helpers.py
index 2a331082c..e8262a62c 100644
--- a/src/gtkgui_helpers.py
+++ b/src/gtkgui_helpers.py
@@ -38,8 +38,6 @@ if os.name == 'nt':
 		HAS_PYWIN32 = False
 
 from common import i18n
-i18n.init()
-_ = i18n._
 from common import gajim
 from common import helpers
 
diff --git a/src/history_manager.py b/src/history_manager.py
index 8ddc0f29e..4090a3092 100755
--- a/src/history_manager.py
+++ b/src/history_manager.py
@@ -24,7 +24,6 @@ import sys
 import os
 import signal
 import gtk
-import gtk.glade
 import time
 import locale
 
@@ -36,9 +35,6 @@ from common.logger import LOG_DB_PATH, constants
 from common import gajim
 from common import i18n
 from common import helpers
-_ = i18n._
-gtk.glade.bindtextdomain(i18n.APP, i18n.DIR)
-gtk.glade.textdomain(i18n.APP)
 
 # time, message, subject
 (
diff --git a/src/history_window.py b/src/history_window.py
index d0e42b18d..fba1684ff 100644
--- a/src/history_window.py
+++ b/src/history_window.py
@@ -24,7 +24,6 @@
 ##
 
 import gtk
-import gtk.glade
 import gobject
 import time
 import calendar
@@ -34,17 +33,11 @@ import conversation_textview
 
 from common import gajim
 from common import helpers
-from common import i18n
 
 from common.logger import Constants
 
 constants = Constants()
 
-_ = i18n._
-APP = i18n.APP
-gtk.glade.bindtextdomain(APP, i18n.DIR)
-gtk.glade.textdomain(APP)
-
 # contact_name, date, message, time
 (
 C_CONTACT_NAME,
diff --git a/src/message_control.py b/src/message_control.py
index 8d6b71901..728c60922 100644
--- a/src/message_control.py
+++ b/src/message_control.py
@@ -11,8 +11,6 @@
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
 ##
-import gtk
-import gtk.glade
 import gtkgui_helpers
 
 from common import gajim
@@ -23,12 +21,6 @@ TYPE_GC = 'gc'
 TYPE_PM = 'pm'
 
 ####################
-# FIXME: Can't this stuff happen once?
-from common import i18n
-_ = i18n._
-APP = i18n.APP
-
-####################
 
 class MessageControl:
 	'''An abstract base widget that can embed in the gtk.Notebook of a MessageWindow'''
diff --git a/src/message_window.py b/src/message_window.py
index dfef0f8bf..bb570fe47 100644
--- a/src/message_window.py
+++ b/src/message_window.py
@@ -22,7 +22,6 @@
 ##
 
 import gtk
-import gtk.glade
 
 import common
 import gtkgui_helpers
@@ -32,12 +31,6 @@ from chat_control import ChatControlBase
 from common import gajim
 
 ####################
-# FIXME: Can't this stuff happen once?
-from common import i18n
-_ = i18n._
-APP = i18n.APP
-
-####################
 
 class MessageWindow:
 	'''Class for windows which contain message like things; chats,
diff --git a/src/migrate_logs_to_dot9_db.py b/src/migrate_logs_to_dot9_db.py
index 1362d3dc8..c3768f952 100755
--- a/src/migrate_logs_to_dot9_db.py
+++ b/src/migrate_logs_to_dot9_db.py
@@ -32,7 +32,6 @@ import time
 from common import logger
 from common import i18n
 
-_ = i18n._
 try:
 	PREFERRED_ENCODING = sys.getpreferredencoding()
 except:
diff --git a/src/notify.py b/src/notify.py
index d10ac8a80..72346f890 100644
--- a/src/notify.py
+++ b/src/notify.py
@@ -23,10 +23,7 @@ import dialogs
 import gtkgui_helpers
 
 from common import gajim
-from common import i18n
 from common import helpers
-i18n.init()
-_ = i18n._
 
 import dbus_support
 if dbus_support.supported:
diff --git a/src/remote_control.py b/src/remote_control.py
index 52b36acb9..8d57c411b 100644
--- a/src/remote_control.py
+++ b/src/remote_control.py
@@ -31,9 +31,7 @@ import os
 from common import gajim
 from common import helpers
 from time import time
-from common import i18n
 from dialogs import AddNewContactWindow, NewChatDialog
-_ = i18n._
 
 import dbus_support
 if dbus_support.supported:
diff --git a/src/roster_window.py b/src/roster_window.py
index 559410e91..029baf8bf 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -15,7 +15,6 @@
 ##
 
 import gtk
-import gtk.glade
 import gobject
 import os
 import time
@@ -33,17 +32,11 @@ import message_control
 
 from common import gajim
 from common import helpers
-from common import i18n
 from message_window import MessageWindowMgr
 from chat_control import ChatControl
 from groupchat_control import GroupchatControl
 from groupchat_control import PrivateChatControl
 
-_ = i18n._
-APP = i18n.APP
-gtk.glade.bindtextdomain(APP, i18n.DIR)
-gtk.glade.textdomain(APP)
-
 #(icon, name, type, jid, account, editable, second pixbuf)
 (
 C_IMG, # image to show state (online, new message etc)
diff --git a/src/systray.py b/src/systray.py
index 36417fc3c..5efc19378 100644
--- a/src/systray.py
+++ b/src/systray.py
@@ -18,7 +18,6 @@
 ##
 
 import gtk
-import gtk.glade
 import gobject
 import os
 
@@ -29,7 +28,6 @@ import gtkgui_helpers
 
 from common import gajim
 from common import helpers
-from common import i18n
 
 HAS_SYSTRAY_CAPABILITIES = True
 
@@ -42,11 +40,6 @@ except:
 		gajim.log.debug('No trayicon module available')
 		HAS_SYSTRAY_CAPABILITIES = False
 
-_ = i18n._
-APP = i18n.APP
-gtk.glade.bindtextdomain(APP, i18n.DIR)
-gtk.glade.textdomain(APP)
-
 
 class Systray:
 	'''Class for icon in the notification area
diff --git a/src/systraywin32.py b/src/systraywin32.py
index bfe7cfebd..54b8e0c1e 100644
--- a/src/systraywin32.py
+++ b/src/systraywin32.py
@@ -42,10 +42,6 @@ WM_TRAYMESSAGE = win32con.WM_USER + 20
 import gtkgui_helpers
 from common import gajim
 from common import i18n
-_ = i18n._
-APP = i18n.APP
-gtk.glade.bindtextdomain(APP, i18n.DIR)
-gtk.glade.textdomain(APP)
 
 class SystrayWINAPI:
 	def __init__(self, gtk_window):
diff --git a/src/tooltips.py b/src/tooltips.py
index 9ff9f9a94..a5e446ccd 100644
--- a/src/tooltips.py
+++ b/src/tooltips.py
@@ -27,9 +27,6 @@ from common import gajim
 from common import helpers
 from common import i18n
 
-_ = i18n._
-APP = i18n.APP
-
 class BaseTooltip:
 	''' Base Tooltip class;
 		Usage:
diff --git a/src/vcard.py b/src/vcard.py
index 0adf43992..331717408 100644
--- a/src/vcard.py
+++ b/src/vcard.py
@@ -14,7 +14,6 @@
 ##
 
 import gtk
-import gtk.glade
 import gobject
 import base64
 import mimetypes
@@ -27,12 +26,7 @@ import dialogs
 
 from common import helpers
 from common import gajim
-from common import i18n
-_ = i18n._
-Q_ = i18n.Q_
-APP = i18n.APP
-gtk.glade.bindtextdomain (APP, i18n.DIR)
-gtk.glade.textdomain (APP)
+from common.i18n import Q_
 
 def get_avatar_pixbuf_encoded_mime(photo):
 	'''return the pixbuf of the image