Author: jim++ Date: 2006-05-08 23:25:41 +0200 (Mon, 08 May 2006) New Revision: 6298

Modified: trunk/src/config.py Log: Make 'None' translatable for proxy(connection proxy).

Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2006-05-08 21:16:38 UTC (rev 6297) +++ trunk/src/config.py 2006-05-08 21:25:41 UTC (rev 6298) @@ -1028,12 +1028,12 @@ else: our_proxy = '' if not our_proxy: - our_proxy = 'None' + our_proxy = _('None') self.proxy_combobox = self.xml.get_widget('proxies_combobox') model = gtk.ListStore(str) self.proxy_combobox.set_model(model) l = gajim.config.get_per('proxies') - l.insert(0, 'None') + l.insert(0, _('None')) for i in xrange(len(l)): model.append([l[i]]) if our_proxy == l[i]: @@ -1205,7 +1205,7 @@

active = self.proxy_combobox.get_active() proxy = self.proxy_combobox.get_model()[active][0].decode('utf-8') - if proxy == 'None': + if proxy == _('None'): proxy = '' config['proxy'] = proxy

@@ -1485,7 +1485,7 @@ model = self.proxies_treeview.get_model() model.clear() iter = model.append() - model.set(iter, 0, 'None') + model.set(iter, 0, _('None')) for p in gajim.config.get_per('proxies'): iter = model.append() model.set(iter, 0, p) @@ -1558,7 +1558,7 @@ proxypass_entry.set_text('') useauth_checkbutton.set_active(False) self.on_useauth_checkbutton_toggled(useauth_checkbutton) - if proxy == 'None': # special proxy None + if proxy == _('None'): # special proxy None self.proxyname_entry.set_editable(False) self.xml.get_widget('remove_proxy_button').set_sensitive(False) self.xml.get_widget('proxytype_combobox').set_sensitive(False)