From 172ca5f213f50e2f0910c256508a54bb2c38725d Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 25 Sep 2013 11:31:57 +0200 Subject: [PATCH] [FIX] url_for on single language bzr revid: fme@openerp.com-20130925093157-2rhvvhe2qsy9e68s --- addons/website/website.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/addons/website/website.py b/addons/website/website.py index 3530b8b77e2..a957117e15b 100644 --- a/addons/website/website.py +++ b/addons/website/website.py @@ -51,13 +51,15 @@ http.auth_methods['public'] = auth_method_public def url_for(path, lang=None): if request: path = urljoin(request.httprequest.path, path) - ps = path.split('/') - lang = lang or request.context.get('lang') - if ps[1] in request.context.get('langs'): - ps[1] = lang - if ps[1] not in request.context.get('langs'): - ps.insert(1, lang) - path = '/'.join(ps) + langs = request.context.get('langs') + if path[0] == '/' and len(langs) > 1: + ps = path.split('/') + lang = lang or request.context.get('lang') + if ps[1] in langs: + ps[1] = lang + else: + ps.insert(1, lang) + path = '/'.join(ps) return path def urlplus(url, params):