diff options
| author | P. Christeas <p_christ@hol.gr> | 2009-01-31 12:08:04 +0200 |
|---|---|---|
| committer | P. Christeas <p_christ@hol.gr> | 2009-01-31 12:08:04 +0200 |
| commit | b69c19fbb2a56de017f466c76d06addd968c96ce (patch) | |
| tree | 18fd5664613588c2901a5ede849592ddba2b3e9d /bin/wizard | |
| parent | f84b1e90e73969887f9e1ae6e43548c3d853c7e8 (diff) | |
| parent | 27240361ca5ead2597ae8f0c63043bab0e969001 (diff) | |
Merge branch 'master' of openobject-server into mdv-gpl3-py26
Conflicts:
bin/netsvc.py
bin/tools/translate.py
bzr revid: p_christ@hol.gr-20090131100804-pu97gelwjh1flk3h
Diffstat (limited to 'bin/wizard')
| -rw-r--r-- | bin/wizard/__init__.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/wizard/__init__.py b/bin/wizard/__init__.py index 5635b1169dd..3a576c9caa4 100644 --- a/bin/wizard/__init__.py +++ b/bin/wizard/__init__.py @@ -21,7 +21,7 @@ ############################################################################## import netsvc -import copy +from tools import copy from tools.misc import UpdateableStr, UpdateableDict from tools.translate import translate from xml import dom @@ -110,6 +110,11 @@ class interface(netsvc.Service): if not isinstance(fields[val]['selection'], (tuple, list)): fields[val] = copy.copy(fields[val]) fields[val]['selection'] = fields[val]['selection'](self, cr, uid, context) + elif lang: + res_name = "%s,%s,%s" % (self.wiz_name, state, val) + trans = lambda x: translate(cr, res_name, 'selection', lang, x) or x + for idx, (key, val2) in enumerate(fields[val]['selection']): + fields[val]['selection'][idx] = (key, trans(val2)) if lang: # translate fields @@ -119,11 +124,6 @@ class interface(netsvc.Service): trans = translate(cr, res_name, 'wizard_field', lang) if trans: fields[field]['string'] = trans - - if 'selection' in fields[field]: - trans = lambda x: translate(cr, res_name, 'selection', lang, x) or x - for idx, (key, val) in enumerate(fields[field]['selection']): - fields[field]['selection'][idx] = (key, trans(val)) if 'help' in fields[field]: t = translate(cr, res_name, 'help', lang, fields[field]['help']) |