odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] change the warning string's pattern to something more familiar to translators 

bzr revid: abo@openerp.com-20130122143156-ffp79tdg1ryvr5y2
This commit is contained in:
Antonin Bourguignon 2013-01-22 15:31:56 +01:00
parent aab0dd122a
commit 9419e59fef
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
openerp/addons/base/res/res_config.py
View File

@ -604,25 +604,23 @@ class res_config_settings(osv.osv_memory):
def get_warning_config(cr, msg, context=None):
res_config_obj = pooler.get_pool(cr.dbname).get('res.config.settings')
regex_path = r'%\(((?:path|field):[a-z_\.]*)\)s'
# Process the msg
# 1/ find the path and field references, put them in a list
references = re.findall(r'\[((?:path|field):[a-z_\.]*)\]', msg, flags=re.I)
# Process the message
# 1/ find the path and/or field references, put them in a list
references = re.findall(regex_path, msg, flags=re.I)
# 2/ fetch the path and field replacement values
# 2/ fetch the path and/or field replacement values
# (full path and human readable field's name)
values = []
values = {}
for item in references:
ref_type, ref = item.split(':')
if ref_type == 'path':
values.append(res_config_obj.get_option_path(cr, SUPERUSER_ID, ref, context))
values[item] = res_config_obj.get_option_path(cr, SUPERUSER_ID, ref, context)
elif ref_type == 'field':
values.append(res_config_obj.get_option_name(cr, SUPERUSER_ID, ref, context))
# 3/ replace the text references by the %s conversion symbol
msg = re.sub(r'\[((?:path|field):[a-z_\.]*)\]', '%s', msg, flags=re.I)
values[item] = res_config_obj.get_option_name(cr, SUPERUSER_ID, ref, context)
# 4/ substitute and return the result
return exceptions.WarningConfig(msg % tuple(values))
return exceptions.WarningConfig(msg % values)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: