Changeset 7841 for branches/gajim_0.11/src/advanced.py

Timestamp:

01/15/07 19:51:27 (23 months ago)

Author:

asterix

Message:

merge usefull diff from trunk

Files:

• branches/gajim_0.11/src/advanced.py (modified) (5 diffs)

branches/gajim_0.11/src/advanced.py

@@ -47 +47 @@
                 # value = array(oldval, newval)
                 self.changed_opts = {}
+                
+                # For i18n
+                self.right_true_dict = {True: _('Activated'), False: _('Deactivated')} 
+                self.types = {
+                        'boolean': _('Boolean'),
+                        'integer': _('Integer'),
+                        'string': _('Text'),
+                        'color': _('Color')} 
 
                 treeview = self.xml.get_widget('advanced_treeview')
@@ -92 +100 @@
                 optname = model[iter][C_PREFNAME]
                 opttype = model[iter][C_TYPE]
-                if opttype == 'boolean' or optname in ('password', 'gpgpassword'):
+                if opttype == self.types['boolean'] or optname in ('password', 
+                        'gpgpassword'):
                         cell.set_property('editable', False)
                 else:
@@ -138 +147 @@
                 modelrow = self.model[modelpath]
                 option = modelrow[0].decode('utf-8')
-                if modelrow[2] == 'boolean':
-                        newval = {'False': 'True', 'True': 'False'}[modelrow[1]]
+                if modelrow[2] == self.types['boolean']:
+                        for key in self.right_true_dict.keys():
+                                if self.right_true_dict[key] == modelrow[1]:
+                                        modelrow[1] = key
+                        newval = {'False': True, 'True': False}[modelrow[1]]
                         if len(modelpath) > 1:
                                 optnamerow = self.model[modelpath[0]]
@@ -153 +165 @@
                                 gajim.config.set(option, newval)
                         gajim.interface.save_config()
-                        modelrow[1] = newval
+                        modelrow[1] = self.right_true_dict[newval]
                         self.check_for_restart()
 
@@ -222 +234 @@
                 if val[OPT_TYPE]:
                         type = val[OPT_TYPE][0]
+                        type = self.types[type] # i18n
                 value = val[OPT_VAL]
                 if name in ('password', 'gpgpassword'):
                         #we talk about password
                         value = _('Hidden') # override passwords with this string
+                if value in self.right_true_dict:
+                        value = self.right_true_dict[value]
                 model.append(iter, [name, value, type])