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

Improved translation controller to be more flexible 

bzr revid: nicolas.vanhoren@openerp.com-20130805144431-ycv6gwv99c5bh1p1
This commit is contained in:
niv-openerp 2013-08-05 16:44:31 +02:00
parent ab4d080450
commit b3c4d02590
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
addons/web/controllers/main.py
View File

@ -599,7 +599,7 @@ class WebClient(http.Controller):
data = re.sub(
rx_url,
r"""url(\1%s/""" % (web_dir,),
r"url(\1%s/" % (web_dir,),
data,
)
return data.encode('utf-8')
@ -671,20 +671,24 @@ class WebClient(http.Controller):
return {"modules": translations_per_module,
"lang_parameters": None}
@http.route('/web/webclient/translations', type='json', auth="user")
def translations(self, mods, lang):
res_lang = request.session.model('res.lang')
ids = res_lang.search([("code", "=", lang)])
@http.route('/web/webclient/translations', type='json', auth="admin")
def translations(self, mods=None, lang="en"):
if mods is None:
m = request.registry.get('ir.module.module')
mods = [x['name'] for x in m.search_read(request.cr, request.uid,
[('state','=','installed')], ['name'])]
res_lang = request.registry.get('res.lang')
ids = res_lang.search(request.cr, request.uid, [("code", "=", lang)])
lang_params = None
if ids:
lang_params = res_lang.read(ids[0], ["direction", "date_format", "time_format",
lang_params = res_lang.read(request.cr, request.uid, ids[0], ["direction", "date_format", "time_format",
"grouping", "decimal_point", "thousands_sep"])
# Regional languages (ll_CC) must inherit/override their parent lang (ll), but this is
# done server-side when the language is loaded, so we only need to load the user's lang.
ir_translation = request.session.model('ir.translation')
ir_translation = request.registry.get('ir.translation')
translations_per_module = {}
messages = ir_translation.search_read([('module','in',mods),('lang','=',lang),
messages = ir_translation.search_read(request.cr, request.uid, [('module','in',mods),('lang','=',lang),
('comments','like','openerp-web'),('value','!=',False),
('value','!=','')],
['module','src','value','lang'], order='module')

1
addons/web/static/src/js/coresetup.js
View File

@ -513,7 +513,6 @@ instance.session = new instance.web.Session();
/** Configure default qweb */
instance.web._t = new instance.web.TranslationDataBase().build_translation_function();
instance.web._t = new instance.web.TranslationDataBase().build_translation_function();
/**
* Lazy translation function, only performs the translation when actually
* printed (e.g. inserted into a template)