Context Navigation

← Previous Changeset
Next Changeset →

Changeset 140

Timestamp:

05/17/04 01:47:14 (5 years ago)

Author:

asterix

Message:

i18n support for internationalisation

Location:

Files:

: 6 added
: 6 modified

common/i18n.py (added)
core/core.py (modified) (9 diffs)
Messages (added)
Messages/fr (added)
Messages/fr/LC_MESSAGES (added)
Messages/fr/LC_MESSAGES/gajim.mo (added)
Messages/fr/LC_MESSAGES/gajim.po (added)
plugins/gtkgui/config.py (modified) (13 diffs)
plugins/gtkgui/dialogs.py (modified) (8 diffs)
plugins/gtkgui/gtkgui.py (modified) (20 diffs)
plugins/logger/logger.py (modified) (4 diffs)
runCore.py (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/core/core.py

r135	r140
28	28	import common.jabber
29	29	import common.optparser
	30
	31	from common import i18n
	32	_ = i18n._
30	33
31	34	log = logging.getLogger('core.core')
…	…
70	73	os.mkdir(os.path.expanduser(path))
71	74	except:
72		print ~~"Can't create %s"~~ % path
	75	print _("Can't create %s") % path
73	76	sys.exit
74	77	try:
75	78	os.stat(fname)
76	79	except:
77		print ~~"creating %s"~~ % fname
	80	print _("creating %s") % fname
78	81	fic = open(fname, "w")
79	82	fic.write("[Profile]\naccounts = \nlog = 0\n\n[Core]\ndelauth = 1\nalwaysauth = 0\nmodules = logger gtkgui\ndelroster = 1\n")
…	…
149	152	txt = prs.getStatus()
150	153	if not txt:
151		txt = ~~"I would like to add you to my roster."~~
	154	txt = _("I would like to add you to my roster.")
152	155	self.hub.sendPlugin('SUBSCRIBE', self.connexions[con], (who, 'txt'))
153	156	elif type == 'subscribed':
…	…
206	209	log.debug("Couldn't connect to %s %s" % (hostname, e))
207	210	self.hub.sendPlugin('STATUS', account, 'offline')
208		self.hub.sendPlugin('WARNING', None, ~~"Couldn't connect to %s"~~ \
	211	self.hub.sendPlugin('WARNING', None, _("Couldn't connect to %s") \
209	212	% hostname)
210	213	return 0
…	…
212	215	log.debug("Couldn't connect to %s %s" % (hostname, e))
213	216	self.hub.sendPlugin('STATUS', account, 'offline')
214		self.hub.sendPlugin('WARNING', None, ~~"Couldn't connect to %s : %s"~~ \
	217	self.hub.sendPlugin('WARNING', None, _("Couldn't connect to %s : %s") \
215	218	% (hostname, e))
216	219	return 0
…	…
244	247	self.hub.sendPlugin('STATUS', account, 'offline')
245	248	self.hub.sendPlugin('WARNING', None, \
246		'Authentification failed with %s, check your login and password'\
247		% hostname)
	249	_("Authentification failed with %s, check your login and password") % hostname)
248	250	return 0
249	251	# END connect
…	…
330	332	pres.setStatus(ev[2][1])
331	333	else:
332		pres.setStatus(~~"I would like to add you to my roster."~~)
	334	pres.setStatus(_("I would like to add you to my roster."))
333	335	con.send(pres)
334	336	#('REQ', account, jid)
…	…
450	452	fic.close()
451	453	else:
452		log.debug(~~"Unknown Command %s"~~ % ev[0])
	454	log.debug(_("Unknown Command %s") % ev[0])
453	455	else:
454	456	for con in self.connexions:
…	…
504	506	gc.mainLoop()
505	507	except KeyboardInterrupt:
506		print ~~"Keyboard Interrupt : Bye!"~~
	508	print _("Keyboard Interrupt : Bye!")
507	509	gc.hub.sendPlugin('QUIT', None, ())
508	510	return 0

trunk/plugins/gtkgui/config.py

r139	r140
23	23	from gtk import TRUE, FALSE
24	24	import gtk.glade,gobject
25		import os,string#,time,Queue
26		#import common.optparser,common.sleepy
	25	import os,string
	26	from common import i18n
	27	_ = i18n._
	28	APP = i18n.APP
	29	gtk.glade.bindtextdomain (APP, i18n.DIR)
	30	gtk.glade.textdomain (APP)
27	31
28	32	from dialogs import *
…	…
94	98	self.plugin.send('ASK_VCARD', self.account, self.jid)
95	99	else:
96		warning_Window(~~"You must be connected to get your informations"~~)
	100	warning_Window(_("You must be connected to get your informations"))
97	101
98	102	def on_publish(self, widget):
99	103	if not self.plugin.connected[self.account]:
100		warning_Window(~~"You must be connected to publish your informations"~~)
	104	warning_Window(_("You must be connected to publish your informations"))
101	105	return
102	106	vcard = self.make_vcard()
…	…
110	114
111	115	def __init__(self, jid, plugin, account):
112		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'vcard')
	116	self.xml = gtk.glade.XML(GTKGUI_GLADE, 'vcard', APP)
113	117	self.jid = jid
114	118	self.plugin = plugin
…	…
236	240	def __init__(self, plugin):
237	241	"""Initialize Preference window"""
238		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Preferences')
	242	self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Preferences', APP)
239	243	self.plugin = plugin
240	244	self.da_in = self.xml.get_widget('drawing_in')
…	…
380	384	jid = entryJid.get_text()
381	385	if (name == ''):
382		warning_Window(~~'You must enter a name for this account'~~)
	386	warning_Window(_("You must enter a name for this account"))
383	387	return 0
384	388	if name.find(' ') != -1:
385		warning_Window(~~'Spaces are not permited in account name'~~)
	389	warning_Window(_("Spaces are not permited in account name"))
386	390	return 0
387	391	if (jid == '') or (string.count(jid, '@') != 1):
388		warning_Window('You must enter a Jabber ID for this account\n\
389		For example : login@hostname')
	392	warning_Window(_("You must enter a Jabber ID for this account\nFor example : login@hostname"))
390	393	return 0
391	394	if proxyPort != '':
…	…
393	396	proxyPort = string.atoi(proxyPort)
394	397	except ValueError:
395		warning_Window(~~'Proxy Port must be a port number'~~)
	398	warning_Window(_("Proxy Port must be a port number"))
396	399	return 0
397	400	(login, hostname) = string.split(jid, '@')
…	…
432	435	else:
433	436	if name in self.plugin.accounts.keys():
434		warning_Window(~~'An account already has this name'~~)
	437	warning_Window(_("An account already has this name"))
435	438	return
436	439	#if we neeed to register a new account
…	…
468	471	self.plugin.send('ASK_VCARD', self.account, entryJid.get_text())
469	472	else:
470		warning_Window(~~"You must be connected to get your informations"~~)
	473	warning_Window(_("You must be connected to get your informations"))
471	474
472	475	#info must be a dictionnary
473	476	def __init__(self, plugin, infos = {}):
474		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Account')
	477	self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Account', APP)
475	478	self.plugin = plugin
476	479	self.account = ''
…	…
527	530	(model, iter) = sel.get_selected()
528	531	account = model.get_value(iter, 0)
529		window = confirm_Window('Are you sure you want to remove this account (' \
530		+ account + ') ?')
	532	window = confirm_Window(_("Are you sure you want to remove this account (%s) ?") % account)
531	533	if window.wait() == gtk.RESPONSE_OK:
532	534	if self.plugin.connected[account]:
…	…
569	571	def __init__(self, plugin):
570	572	self.plugin = plugin
571		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Accounts')
	573	self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Accounts', APP)
572	574	self.treeview = self.xml.get_widget("treeview")
573	575	model = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
…	…
623	625
624	626	def __init__(self, agent, infos, plugin, account):
625		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'agent_reg')
	627	self.xml = gtk.glade.XML(GTKGUI_GLADE, 'agent_reg', APP)
626	628	self.agent = agent
627	629	self.infos = infos
628	630	self.plugin = plugin
629	631	self.account = account
630		self.xml.get_widget('agent_reg').set_title(~~'Register to ' +~~ agent)
	632	self.xml.get_widget('agent_reg').set_title(_("Register to %s") % agent)
631	633	self.xml.get_widget('label').set_text(infos['instructions'])
632	634	self.entries = {}
…	…
680	682
681	683	def __init__(self, plugin, account):
682		xml = gtk.glade.XML(GTKGUI_GLADE, 'browser')
	684	xml = gtk.glade.XML(GTKGUI_GLADE, 'browser', APP)
683	685	self.treeview = xml.get_widget('treeview')
684	686	self.plugin = plugin
…	…
702	704	self.browse()
703	705	else:
704		warning_Window(~~"You must be connected to view Agents"~~)
	706	warning_Window(_("You must be connected to view Agents"))

trunk/plugins/gtkgui/dialogs.py

r139	r140
23	23	from gtk import TRUE, FALSE
24	24	import gtk.glade,gobject
25		#import os,string,time,Queue
26		#import common.optparser,common.sleepy
	25	from common import i18n
	26	_ = i18n._
	27	APP = i18n.APP
	28	gtk.glade.bindtextdomain (APP, i18n.DIR)
	29	gtk.glade.textdomain (APP)
27	30
28	31	GTKGUI_GLADE='plugins/gtkgui/gtkgui.glade'
…	…
147	150
148	151	def __init__(self, user, plugin, account):
149		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Info_user')
	152	self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Info_user', APP)
150	153	self.plugin = plugin
151	154	self.user = user
…	…
194	197
195	198	def __init__(self):
196		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Away_msg')
	199	self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Away_msg', APP)
197	200	txt = self.xml.get_widget("textview")
198	201	self.txtBuffer = txt.get_buffer()
…	…
223	226	self.plugin = plugin
224	227	self.account = account
225		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Add')
	228	self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Add', APP)
226	229	if jid:
227	230	self.xml.get_widget('entry_who').set_text(jid)
…	…
237	240
238	241	def __init__(self, txt):
239		xml = gtk.glade.XML(GTKGUI_GLADE, 'Warning')
	242	xml = gtk.glade.XML(GTKGUI_GLADE, 'Warning', APP)
240	243	xml.get_widget('label').set_text(txt)
241	244	xml.signal_connect('on_close_clicked', self.on_close)
…	…
252	255
253	256	def __init__(self, plugin):
254		xml = gtk.glade.XML(GTKGUI_GLADE, 'About')
	257	xml = gtk.glade.XML(GTKGUI_GLADE, 'About', APP)
255	258	self.plugin = plugin
256	259	xml.signal_connect('gtk_widget_destroy', self.delete_event)
…	…
266	269
267	270	def __init__(self, label):
268		xml = gtk.glade.XML(GTKGUI_GLADE, 'Confirm')
	271	xml = gtk.glade.XML(GTKGUI_GLADE, 'Confirm', APP)
269	272	xml.get_widget('label_confirm').set_text(label)
270	273	self.win = xml.get_widget('Confirm')
…	…
290	293
291	294	def __init__(self, plugin, jid, txt, account):
292		xml = gtk.glade.XML(GTKGUI_GLADE, 'Sub_req')
	295	xml = gtk.glade.XML(GTKGUI_GLADE, 'Sub_req', APP)
293	296	self.plugin = plugin
294	297	self.jid = jid
295	298	self.account = account
296		xml.get_widget('label').set_text(~~'Subscription request from ' +~~ self.jid)
	299	xml.get_widget('label').set_text(_("Subscription request from %s") % self.jid)
297	300	xml.get_widget("textview").get_buffer().set_text(txt)
298	301	xml.signal_connect('on_button_auth_clicked', self.auth)

trunk/plugins/gtkgui/gtkgui.py

r138	r140
25	25	import os,string,time,Queue
26	26	import common.optparser,common.sleepy
	27	from common import i18n
	28	_ = i18n._
	29	APP = i18n.APP
	30	gtk.glade.bindtextdomain (APP, i18n.DIR)
	31	gtk.glade.textdomain (APP)
27	32
28	33	from config import *
…	…
50	55	self.sub = args[5]
51	56	self.resource = args[6]
52		else: raise TypeError, ~~'bad arguments'~~
	57	else: raise TypeError, _('bad arguments')
53	58
54	59
…	…
132	137	self.plugin = plugin
133	138	self.account = account
134		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Chat')
	139	self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Chat', APP)
135	140	self.window = self.xml.get_widget('Chat')
136	141	# hbox = xml.get_widget('hbox1')
…	…
272	277	msg = string.join(infos[3][1:], ':')
273	278	msg = string.replace(msg, '\\n', '\n')
274		buffer.insert_with_tags_by_name(start_iter, ~~'Status is now : '~~ + \
	279	buffer.insert_with_tags_by_name(start_iter, _('Status is now : ') + \
275	280	infos[3][0]+' : ' + msg, 'status')
276	281
…	…
284	289	self.nb_line = 0
285	290	self.num_begin = 0
286		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Log')
	291	self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Log', APP)
287	292	self.xml.signal_connect('gtk_widget_destroy', self.delete_event)
288	293	self.xml.signal_connect('on_close_clicked', self.on_close)
…	…
518	523	img.set_from_pixbuf(self.pixbufs[show])
519	524	self.plugin.windows[account]['chats'][user.jid].print_conversation(\
520		~~"%s is now %s (%s)"~~ % (user.name, show, status), 'status')
	525	_("%s is now %s (%s)") % (user.name, show, status), 'status')
521	526
522	527	def on_info(self, widget, user, account):
…	…
546	551
547	552	menu = gtk.Menu()
548		item = gtk.MenuItem(~~"Start chat"~~)
	553	item = gtk.MenuItem(_("Start chat"))
549	554	menu.append(item)
550	555	item.connect("activate", self.on_row_activated, path)
551		item = gtk.MenuItem(~~"Rename"~~)
	556	item = gtk.MenuItem(_("Rename"))
552	557	menu.append(item)
553	558	#item.connect("activate", self.on_rename, iter)
554	559	item = gtk.MenuItem()
555	560	menu.append(item)
556		item = gtk.MenuItem(~~"Subscription"~~)
	561	item = gtk.MenuItem(_("Subscription"))
557	562	menu.append(item)
558	563
559	564	menu_sub = gtk.Menu()
560	565	item.set_submenu(menu_sub)
561		item = gtk.MenuItem(~~"Resend authorization to"~~)
	566	item = gtk.MenuItem(_("Resend authorization to"))
562	567	menu_sub.append(item)
563	568	item.connect("activate", self.authorize, jid, account)
564		item = gtk.MenuItem(~~"Rerequest authorization from"~~)
	569	item = gtk.MenuItem(_("Rerequest authorization from"))
565	570	menu_sub.append(item)
566	571	item.connect("activate", self.req_sub, jid, \
567		~~'I would like to add you to my contact list, please.'~~, account)
	572	_('I would like to add you to my contact list, please.'), account)
568	573
569	574	item = gtk.MenuItem()
570	575	menu.append(item)
571		item = gtk.MenuItem(~~"Remove"~~)
	576	item = gtk.MenuItem(_("Remove"))
572	577	menu.append(item)
573	578	item.connect("activate", self.on_req_usub, user, account)
…	…
575	580	item = gtk.MenuItem()
576	581	menu.append(item)
577		item = gtk.MenuItem(~~"Informations"~~)
	582	item = gtk.MenuItem(_("Informations"))
578	583	menu.append(item)
579	584	item.connect("activate", self.on_info, user, account)
580		item = gtk.MenuItem(~~"History"~~)
	585	item = gtk.MenuItem(_("History"))
581	586	menu.append(item)
582	587	item.connect("activate", self.on_history, user)
…	…
588	593	"""Make group's popup menu"""
589	594	menu = gtk.Menu()
590		item = gtk.MenuItem(~~"grp1"~~)
	595	item = gtk.MenuItem(_("grp1"))
591	596	# menu.append(item)
592		item = gtk.MenuItem(~~"grp2"~~)
	597	item = gtk.MenuItem(_("grp2"))
593	598	# menu.append(item)
594		item = gtk.MenuItem(~~"grp3"~~)
	599	item = gtk.MenuItem(_("grp3"))
595	600	# menu.append(item)
596	601	menu.popup(None, None, None, event.button, event.time)
…	…
605	610	account = model.get_value(acct_iter, 3)
606	611	menu = gtk.Menu()
607		item = gtk.MenuItem(~~"Log on"~~)
	612	item = gtk.MenuItem(_("Log on"))
608	613	if self.contacts[account][jid].show != 'offline':
609	614	item.set_sensitive(FALSE)
…	…
611	616	item.connect("activate", self.on_agent_logging, jid, 'available', account)
612	617
613		item = gtk.MenuItem(~~"Log off"~~)
	618	item = gtk.MenuItem(_("Log off"))
614	619	if self.contacts[account][jid].show == 'offline':
615	620	item.set_sensitive(FALSE)
…	…
646	651
647	652	menu = gtk.Menu()
648		item = gtk.MenuItem(~~"Status"~~)
	653	item = gtk.MenuItem(_("Status"))
649	654	menu.append(item)
650	655
651	656	menu_sub = gtk.Menu()
652	657	item.set_submenu(menu_sub)
653		item = gtk.MenuItem(~~"Online"~~)
	658	item = gtk.MenuItem(_("Online"))
654	659	menu_sub.append(item)
655	660	item.connect("activate", self.change_status, account, 'online')
656		item = gtk.MenuItem(~~"Away"~~)
	661	item = gtk.MenuItem(_("Away"))
657	662	menu_sub.append(item)
658	663	item.connect("activate", self.change_status, account, 'away')
659		item = gtk.MenuItem(~~"NA"~~)
	664	item = gtk.MenuItem(_("NA"))
660	665	menu_sub.append(item)
661	666	item.connect("activate", self.change_status, account, 'na')
662		item = gtk.MenuItem(~~"DND"~~)
	667	item = gtk.MenuItem(_("DND"))
663	668	menu_sub.append(item)
664	669	item.connect("activate", self.change_status, account, 'dnd')
665	670	item = gtk.MenuItem()
666	671	menu_sub.append(item)
667		item = gtk.MenuItem(~~"Offline"~~)
	672	item = gtk.MenuItem(_("Offline"))
668	673	menu_sub.append(item)
669	674	item.connect("activate", self.change_status, account, 'offline')
…	…
672	677	menu.append(item)
673	678
674		item = gtk.MenuItem(~~"Edit account"~~)
	679	item = gtk.MenuItem(_("Edit account"))
675	680	menu.append(item)
676	681	item.connect("activate", self.on_edit_account, account)
…	…
715	720	def on_req_usub(self, widget, user, account):
716	721	"""Remove a user"""
717		window = confirm_Window('Are you sure you want to remove ' + user.name + \
718		' (' + user.jid + ') from your roster ?')
	722	window = confirm_Window(_("Are you sure you want to remove %s (%s) from your roster ?") % (user.name, user.jid))
719	723	if window.wait() == gtk.RESPONSE_OK:
720	724	self.plugin.send('UNSUB', account, user.jid)
…	…
747	751	accounts = self.plugin.accounts.keys()
748	752	if len(accounts) == 0:
749		warning_Window(~~"You must setup an account before connecting to jabber network."~~)
	753	warning_Window(_("You must setup an account before connecting to jabber network."))
750	754	return
751	755	for acct in accounts:
…	…
834	838	tell that to the core and exit gtk"""
835	839	self.plugin.send('QUIT', None, '')
836		print ~~"plugin gtkgui stopped"~~
	840	print _("plugin gtkgui stopped")
837	841	gtk.mainquit()
838	842
…	…
1012	1016	def __init__(self, plugin):
1013	1017	# FIXME : handle no file ...
1014		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Gajim')
	1018	self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Gajim', APP)
1015	1019	self.tree = self.xml.get_widget('treeview')
1016	1020	self.plugin = plugin
…	…
1209	1213	'online', 'to', ev[2][2])
1210	1214	self.roster.add_user(user1)
1211		warning_Window(~~"You are now authorized by " +~~ ev[2][0])
	1215	warning_Window(_("You are now authorized by %s") % ev[2][0])
1212	1216	elif ev[0] == 'UNSUBSCRIBED':
1213		warning_Window(~~"You are now unsubscribed by " +~~ ev[2])
	1217	warning_Window(_("You are now unsubscribed by %s") % ev[2])
1214	1218	#TODO: change icon
1215	1219	#('AGENTS', account, agents)
…	…
1220	1224	elif ev[0] == 'AGENT_INFO':
1221	1225	if not ev[2][1].has_key('instructions'):
1222		warning_Window(~~'error contacting %s'~~ % ev[2][0])
	1226	warning_Window(_("error contacting %s") % ev[2][0])
1223	1227	else:
1224	1228	&nbs