i18n support for internationalisation

4 files changed, 81 insertions, 70 deletions

diff --git a/plugins/gtkgui/config.py b/plugins/gtkgui/config.py
index 1bdba1b91..ed7679a82 100644
--- a/plugins/gtkgui/config.py
+++ b/plugins/gtkgui/config.py
@@ -22,8 +22,12 @@ pygtk.require('2.0')
 import gtk
 from gtk import TRUE, FALSE
 import gtk.glade,gobject
-import os,string#,time,Queue
-#import common.optparser,common.sleepy
+import os,string
+from common import i18n
+_ = i18n._
+APP = i18n.APP
+gtk.glade.bindtextdomain (APP, i18n.DIR)
+gtk.glade.textdomain (APP)
 
 from dialogs import *
 
@@ -93,11 +97,11 @@ class vCard_Window:
 		if self.plugin.connected[self.account]:
 			self.plugin.send('ASK_VCARD', self.account, self.jid)
 		else:
-			warning_Window("You must be connected to get your informations")
+			warning_Window(_("You must be connected to get your informations"))
 
 	def on_publish(self, widget):
 		if not self.plugin.connected[self.account]:
-			warning_Window("You must be connected to publish your informations")
+			warning_Window(_("You must be connected to publish your informations"))
 			return
 		vcard = self.make_vcard()
 		nick = ''
@@ -109,7 +113,7 @@ class vCard_Window:
 		self.plugin.send('VCARD', self.account, vcard)
 
 	def __init__(self, jid, plugin, account):
-		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'vcard')
+		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'vcard', APP)
 		self.jid = jid
 		self.plugin = plugin
 		self.account = account
@@ -235,7 +239,7 @@ class preference_Window:
 
 	def __init__(self, plugin):
 		"""Initialize Preference window"""
-		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Preferences')
+		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Preferences', APP)
 		self.plugin = plugin
 		self.da_in = self.xml.get_widget('drawing_in')
 		self.da_out = self.xml.get_widget('drawing_out')
@@ -379,20 +383,19 @@ class accountPreference_Window:
 		name = entryName.get_text()
 		jid = entryJid.get_text()
 		if (name == ''):
-			warning_Window('You must enter a name for this account')
+			warning_Window(_("You must enter a name for this account"))
 			return 0
 		if name.find(' ') != -1:
-			warning_Window('Spaces are not permited in account name')
+			warning_Window(_("Spaces are not permited in account name"))
 			return 0
 		if (jid == '') or (string.count(jid, '@') != 1):
-			warning_Window('You must enter a Jabber ID for this account\n\
-				For example : login@hostname')
+			warning_Window(_("You must enter a Jabber ID for this account\nFor example : login@hostname"))
 			return 0
 		if proxyPort != '':
 			try:
 				proxyPort = string.atoi(proxyPort)
 			except ValueError:
-				warning_Window('Proxy Port must be a port number')
+				warning_Window(_("Proxy Port must be a port number"))
 				return 0
 		(login, hostname) = string.split(jid, '@')
 		#if we are modifying an account
@@ -431,7 +434,7 @@ class accountPreference_Window:
 		#if it's a new account
 		else:
 			if name in self.plugin.accounts.keys():
-				warning_Window('An account already has this name')
+				warning_Window(_("An account already has this name"))
 				return
 			#if we neeed to register a new account
 			if check.get_active():
@@ -467,11 +470,11 @@ class accountPreference_Window:
 			if self.plugin.connected[self.account]:
 				self.plugin.send('ASK_VCARD', self.account, entryJid.get_text())
 			else:
-				warning_Window("You must be connected to get your informations")
+				warning_Window(_("You must be connected to get your informations"))
 	
 	#info must be a dictionnary
 	def __init__(self, plugin, infos = {}):
-		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Account')
+		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Account', APP)
 		self.plugin = plugin
 		self.account = ''
 		self.modify = False
@@ -526,8 +529,7 @@ class accounts_Window:
 		sel = self.treeview.get_selection()
 		(model, iter) = sel.get_selected()
 		account = model.get_value(iter, 0)
-		window = confirm_Window('Are you sure you want to remove this account (' \
-			+ account + ') ?')
+		window = confirm_Window(_("Are you sure you want to remove this account (%s) ?") % account)
 		if window.wait() == gtk.RESPONSE_OK:
 			if self.plugin.connected[account]:
 				self.plugin.send('STATUS', account, ('offline', 'offline'))
@@ -568,7 +570,7 @@ class accounts_Window:
 		
 	def __init__(self, plugin):
 		self.plugin = plugin
-		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Accounts')
+		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Accounts', APP)
 		self.treeview = self.xml.get_widget("treeview")
 		model = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
 		self.treeview.set_model(model)
@@ -622,12 +624,12 @@ class agentRegistration_Window:
 		widget.get_toplevel().destroy()
 	
 	def __init__(self, agent, infos, plugin, account):
-		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'agent_reg')
+		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'agent_reg', APP)
 		self.agent = agent
 		self.infos = infos
 		self.plugin = plugin
 		self.account = account
-		self.xml.get_widget('agent_reg').set_title('Register to ' + agent)
+		self.xml.get_widget('agent_reg').set_title(_("Register to %s") % agent)
 		self.xml.get_widget('label').set_text(infos['instructions'])
 		self.entries = {}
 		self.draw_table()
@@ -679,7 +681,7 @@ class browseAgent_Window:
 		widget.get_toplevel().destroy()
 		
 	def __init__(self, plugin, account):
-		xml = gtk.glade.XML(GTKGUI_GLADE, 'browser')
+		xml = gtk.glade.XML(GTKGUI_GLADE, 'browser', APP)
 		self.treeview = xml.get_widget('treeview')
 		self.plugin = plugin
 		self.account = account
@@ -701,4 +703,4 @@ class browseAgent_Window:
 		if self.plugin.connected[account]:
 			self.browse()
 		else:
-			warning_Window("You must be connected to view Agents")
+			warning_Window(_("You must be connected to view Agents"))
diff --git a/plugins/gtkgui/dialogs.py b/plugins/gtkgui/dialogs.py
index 28596a2e2..01d54574e 100644
--- a/plugins/gtkgui/dialogs.py
+++ b/plugins/gtkgui/dialogs.py
@@ -22,8 +22,11 @@ pygtk.require('2.0')
 import gtk
 from gtk import TRUE, FALSE
 import gtk.glade,gobject
-#import os,string,time,Queue
-#import common.optparser,common.sleepy
+from common import i18n
+_ = i18n._
+APP = i18n.APP
+gtk.glade.bindtextdomain (APP, i18n.DIR)
+gtk.glade.textdomain (APP)
 
 GTKGUI_GLADE='plugins/gtkgui/gtkgui.glade'
 
@@ -146,7 +149,7 @@ class infoUser_Window:
 		self.list2.append_column(column)
 
 	def __init__(self, user, plugin, account):
-		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Info_user')
+		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Info_user', APP)
 		self.plugin = plugin
 		self.user = user
 		self.account = account
@@ -193,7 +196,7 @@ class awayMsg_Window:
 		return msg
 	
 	def __init__(self):
-		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Away_msg')
+		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Away_msg', APP)
 		txt = self.xml.get_widget("textview")
 		self.txtBuffer = txt.get_buffer()
 
@@ -222,7 +225,7 @@ class addContact_Window:
 	def __init__(self, plugin, account, jid=None):
 		self.plugin = plugin
 		self.account = account
-		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Add')
+		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Add', APP)
 		if jid:
 			self.xml.get_widget('entry_who').set_text(jid)
 		self.xml.signal_connect('gtk_widget_destroy', self.delete_event)
@@ -236,7 +239,7 @@ class warning_Window:
 		widget.get_toplevel().destroy()
 
 	def __init__(self, txt):
-		xml = gtk.glade.XML(GTKGUI_GLADE, 'Warning')
+		xml = gtk.glade.XML(GTKGUI_GLADE, 'Warning', APP)
 		xml.get_widget('label').set_text(txt)
 		xml.signal_connect('on_close_clicked', self.on_close)
 
@@ -251,7 +254,7 @@ class about_Window:
 		widget.get_toplevel().destroy()
 
 	def __init__(self, plugin):
-		xml = gtk.glade.XML(GTKGUI_GLADE, 'About')
+		xml = gtk.glade.XML(GTKGUI_GLADE, 'About', APP)
 		self.plugin = plugin
 		xml.signal_connect('gtk_widget_destroy', self.delete_event)
 		xml.signal_connect('on_close_clicked', self.on_close)
@@ -265,7 +268,7 @@ class confirm_Window:
 		return out
 
 	def __init__(self, label):
-		xml = gtk.glade.XML(GTKGUI_GLADE, 'Confirm')
+		xml = gtk.glade.XML(GTKGUI_GLADE, 'Confirm', APP)
 		xml.get_widget('label_confirm').set_text(label)
 		self.win = xml.get_widget('Confirm')
 
@@ -289,11 +292,11 @@ class authorize_Window:
 		widget.get_toplevel().destroy()
 	
 	def __init__(self, plugin, jid, txt, account):
-		xml = gtk.glade.XML(GTKGUI_GLADE, 'Sub_req')
+		xml = gtk.glade.XML(GTKGUI_GLADE, 'Sub_req', APP)
 		self.plugin = plugin
 		self.jid = jid
 		self.account = account
-		xml.get_widget('label').set_text('Subscription request from ' + self.jid)
+		xml.get_widget('label').set_text(_("Subscription request from %s") % self.jid)
 		xml.get_widget("textview").get_buffer().set_text(txt)
 		xml.signal_connect('on_button_auth_clicked', self.auth)
 		xml.signal_connect('on_button_deny_clicked', self.deny)
diff --git a/plugins/gtkgui/gtkgui.py b/plugins/gtkgui/gtkgui.py
index da41c486e..bf0672693 100644
--- a/plugins/gtkgui/gtkgui.py
+++ b/plugins/gtkgui/gtkgui.py
@@ -24,6 +24,11 @@ from gtk import TRUE, FALSE
 import gtk.glade,gobject
 import os,string,time,Queue
 import common.optparser,common.sleepy
+from common import i18n
+_ = i18n._
+APP = i18n.APP
+gtk.glade.bindtextdomain (APP, i18n.DIR)
+gtk.glade.textdomain (APP)
 
 from config import *
 from dialogs import *
@@ -49,7 +54,7 @@ class user:
 			self.status = args[4]
 			self.sub = args[5]
 			self.resource = args[6]
-		else: raise TypeError, 'bad arguments'
+		else: raise TypeError, _('bad arguments')
 
 
 class message_Window:
@@ -131,7 +136,7 @@ class message_Window:
 		self.user = user
 		self.plugin = plugin
 		self.account = account
-		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Chat')
+		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Chat', APP)
 		self.window = self.xml.get_widget('Chat')
 #		hbox = xml.get_widget('hbox1')
 #		hbox.set_property('resize-mode', 2)
@@ -271,7 +276,7 @@ class log_Window:
 		else:
 			msg = string.join(infos[3][1:], ':')
 			msg = string.replace(msg, '\\n', '\n')
-			buffer.insert_with_tags_by_name(start_iter, 'Status is now : ' + \
+			buffer.insert_with_tags_by_name(start_iter, _('Status is now : ') + \
 				infos[3][0]+' : ' + msg, 'status')
 	
 	def set_nb_line(self, nb_line):
@@ -283,7 +288,7 @@ class log_Window:
 		self.jid = jid
 		self.nb_line = 0
 		self.num_begin = 0
-		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Log')
+		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Log', APP)
 		self.xml.signal_connect('gtk_widget_destroy', self.delete_event)
 		self.xml.signal_connect('on_close_clicked', self.on_close)
 		self.xml.signal_connect('on_earliest_clicked', self.on_earliest)
@@ -517,7 +522,7 @@ class roster_Window:
 			self.plugin.windows[account]['chats'][user.jid].\
 				img.set_from_pixbuf(self.pixbufs[show])
 			self.plugin.windows[account]['chats'][user.jid].print_conversation(\
-				"%s is now %s (%s)" % (user.name, show, status), 'status')
+				_("%s is now %s (%s)") % (user.name, show, status), 'status')
 
 	def on_info(self, widget, user, account):
 		"""Call infoUser_Window class to display user's information"""
@@ -545,39 +550,39 @@ class roster_Window:
 		user = self.contacts[account][jid]
 		
 		menu = gtk.Menu()
-		item = gtk.MenuItem("Start chat")
+		item = gtk.MenuItem(_("Start chat"))
 		menu.append(item)
 		item.connect("activate", self.on_row_activated, path)
-		item = gtk.MenuItem("Rename")
+		item = gtk.MenuItem(_("Rename"))
 		menu.append(item)
 		#item.connect("activate", self.on_rename, iter)
 		item = gtk.MenuItem()
 		menu.append(item)
-		item = gtk.MenuItem("Subscription")
+		item = gtk.MenuItem(_("Subscription"))
 		menu.append(item)
 		
 		menu_sub = gtk.Menu()
 		item.set_submenu(menu_sub)
-		item = gtk.MenuItem("Resend authorization to")
+		item = gtk.MenuItem(_("Resend authorization to"))
 		menu_sub.append(item)
 		item.connect("activate", self.authorize, jid, account)
-		item = gtk.MenuItem("Rerequest authorization from")
+		item = gtk.MenuItem(_("Rerequest authorization from"))
 		menu_sub.append(item)
 		item.connect("activate", self.req_sub, jid, \
-			'I would like to add you to my contact list, please.', account)
+			_('I would like to add you to my contact list, please.'), account)
 		
 		item = gtk.MenuItem()
 		menu.append(item)
-		item = gtk.MenuItem("Remove")
+		item = gtk.MenuItem(_("Remove"))
 		menu.append(item)
 		item.connect("activate", self.on_req_usub, user, account)
 
 		item = gtk.MenuItem()
 		menu.append(item)
-		item = gtk.MenuItem("Informations")
+		item = gtk.MenuItem(_("Informations"))
 		menu.append(item)
 		item.connect("activate", self.on_info, user, account)
-		item = gtk.MenuItem("History")
+		item = gtk.MenuItem(_("History"))
 		menu.append(item)
 		item.connect("activate", self.on_history, user)
 
@@ -587,11 +592,11 @@ class roster_Window:
 	def mk_menu_g(self, event):
 		"""Make group's popup menu"""
 		menu = gtk.Menu()
-		item = gtk.MenuItem("grp1")
+		item = gtk.MenuItem(_("grp1"))
 #		menu.append(item)
-		item = gtk.MenuItem("grp2")
+		item = gtk.MenuItem(_("grp2"))
 #		menu.append(item)
-		item = gtk.MenuItem("grp3")
+		item = gtk.MenuItem(_("grp3"))
 #		menu.append(item)
 		menu.popup(None, None, None, event.button, event.time)
 		menu.show_all()
@@ -604,13 +609,13 @@ class roster_Window:
 		acct_iter = model.get_iter((path[0]))
 		account = model.get_value(acct_iter, 3)
 		menu = gtk.Menu()
-		item = gtk.MenuItem("Log on")
+		item = gtk.MenuItem(_("Log on"))
 		if self.contacts[account][jid].show != 'offline':
 			item.set_sensitive(FALSE)
 		menu.append(item)
 		item.connect("activate", self.on_agent_logging, jid, 'available', account)
 
-		item = gtk.MenuItem("Log off")
+		item = gtk.MenuItem(_("Log off"))
 		if self.contacts[account][jid].show == 'offline':
 			item.set_sensitive(FALSE)
 		menu.append(item)
@@ -645,33 +650,33 @@ class roster_Window:
 		account = model.get_value(iter, 3)
 		
 		menu = gtk.Menu()
-		item = gtk.MenuItem("Status")
+		item = gtk.MenuItem(_("Status"))
 		menu.append(item)
 		
 		menu_sub = gtk.Menu()
 		item.set_submenu(menu_sub)
-		item = gtk.MenuItem("Online")
+		item = gtk.MenuItem(_("Online"))
 		menu_sub.append(item)
 		item.connect("activate", self.change_status, account, 'online')
-		item = gtk.MenuItem("Away")
+		item = gtk.MenuItem(_("Away"))
 		menu_sub.append(item)
 		item.connect("activate", self.change_status, account, 'away')
-		item = gtk.MenuItem("NA")
+		item = gtk.MenuItem(_("NA"))
 		menu_sub.append(item)
 		item.connect("activate", self.change_status, account, 'na')
-		item = gtk.MenuItem("DND")
+		item = gtk.MenuItem(_("DND"))
 		menu_sub.append(item)
 		item.connect("activate", self.change_status, account, 'dnd')
 		item = gtk.MenuItem()
 		menu_sub.append(item)
-		item = gtk.MenuItem("Offline")
+		item = gtk.MenuItem(_("Offline"))
 		menu_sub.append(item)
 		item.connect("activate", self.change_status, account, 'offline')
 		
 		item = gtk.MenuItem()
 		menu.append(item)
 
-		item = gtk.MenuItem("Edit account")
+		item = gtk.MenuItem(_("Edit account"))
 		menu.append(item)
 		item.connect("activate", self.on_edit_account, account)
 		
@@ -714,8 +719,7 @@ class roster_Window:
 
 	def on_req_usub(self, widget, user, account):
 		"""Remove a user"""
-		window = confirm_Window('Are you sure you want to remove ' + user.name + \
-			' (' + user.jid + ') from your roster ?')
+		window = confirm_Window(_("Are you sure you want to remove %s (%s) from your roster ?") % (user.name, user.jid))
 		if window.wait() == gtk.RESPONSE_OK:
 			self.plugin.send('UNSUB', account, user.jid)
 			self.remove_user(user, account)
@@ -746,7 +750,7 @@ class roster_Window:
 			txt = status
 		accounts = self.plugin.accounts.keys()
 		if len(accounts) == 0:
-			warning_Window("You must setup an account before connecting to jabber network.")
+			warning_Window(_("You must setup an account before connecting to jabber network."))
 			return
 		for acct in accounts:
 			self.plugin.send('STATUS', acct, (status, txt))
@@ -833,7 +837,7 @@ class roster_Window:
 		"""When we quit the gtk plugin :
 		tell that to the core and exit gtk"""
 		self.plugin.send('QUIT', None, '')
-		print "plugin gtkgui stopped"
+		print _("plugin gtkgui stopped")
 		gtk.mainquit()
 
 	def on_row_activated(self, widget, path, col=0):
@@ -1011,7 +1015,7 @@ class roster_Window:
 
 	def __init__(self, plugin):
 		# FIXME : handle no file ...
-		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Gajim')
+		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Gajim', APP)
 		self.tree = self.xml.get_widget('treeview')
 		self.plugin = plugin
 		self.groups = {}
@@ -1208,9 +1212,9 @@ class plugin:
 					user1 = user(ev[2][0], ev[2][0], ['general'], 'online', \
 						'online', 'to', ev[2][2])
 					self.roster.add_user(user1)
-				warning_Window("You are now authorized by " + ev[2][0])
+				warning_Window(_("You are now authorized by %s") % ev[2][0])
 			elif ev[0] == 'UNSUBSCRIBED':
-				warning_Window("You are now unsubscribed by " + ev[2])
+				warning_Window(_("You are now unsubscribed by %s") % ev[2])
 				#TODO: change icon
 			#('AGENTS', account, agents)
 			elif ev[0] == 'AGENTS':
@@ -1219,7 +1223,7 @@ class plugin:
 			#('AGENTS_INFO', account, (agent, infos))
 			elif ev[0] == 'AGENT_INFO':
 				if not ev[2][1].has_key('instructions'):
-					warning_Window('error contacting %s' % ev[2][0])
+					warning_Window(_("error contacting %s") % ev[2][0])
 				else:
 					agentRegistration_Window(ev[2][0], ev[2][1], self, ev[1])
 			#('ACC_OK', account, (hostname, login, pasword, name, ressource))
@@ -1325,4 +1329,4 @@ class plugin:
 if __name__ == "__main__":
 	plugin(None, None)
 
-print "plugin gtkgui loaded"
+print _("plugin gtkgui loaded")
diff --git a/plugins/logger/logger.py b/plugins/logger/logger.py
index 292cf80d5..d3597a4fe 100644
--- a/plugins/logger/logger.py
+++ b/plugins/logger/logger.py
@@ -21,7 +21,9 @@ import os
 import string
 import time
 import common.optparser
+from common import i18n
 LOGPATH = os.path.expanduser("~/.gajim/logs/")
+_ = i18n._
 
 class plugin:
 	def read_queue(self):
@@ -39,7 +41,7 @@ class plugin:
 				
 				ev = self.queueIN.get()
 				if ev[0] == 'QUIT':
-					print "plugin logger stopped"
+					print _("plugin logger stopped")
 					return
 				elif ev[0] == 'NOTIFY':
 					status = ev[2][2]
@@ -92,16 +94,16 @@ class plugin:
 			os.stat(os.path.expanduser("~/.gajim"))
 		except OSError:
 			os.mkdir(os.path.expanduser("~/.gajim"))
-			print "creating ~/.gajim/"
+			print _("creating ~/.gajim/")
 		try:
 			os.stat(LOGPATH)
 		except OSError:
 			os.mkdir(LOGPATH)
-			print "creating ~/.gajim/logs/"
+			print _("creating ~/.gajim/logs/")
 		self.read_queue()
 		
 
 if __name__ == "__main__":
 	plugin(None, None)
 
-print "plugin logger loaded"
+print _("plugin logger loaded")