Merge pull request #170 from odoo-dev/master-fix-languages-thingy-tde

[FIX] website: fixed languages errors
- ir_http: added a missing ? when a route using the default language was re-rerouted to remove the language part of the path, leading to a wrong url
- website layout: fixed use of a languages variable not always defined depending on the working conditions

addons/website/models/ir_http.py

@@ -72,7 +72,7 @@ class ir_http(orm.AbstractModel):
                     if request.lang == request.website.default_lang_code:
                         # If language is in the url and it is the default language, redirect
                         # to url without language so google doesn't see duplicate content
-                        return request.redirect(path + request.httprequest.query_string)
+                        return request.redirect(path + '?' + request.httprequest.query_string)
                     return self.reroute(path)
                 return self._handle_exception(code=404)
         return super(ir_http, self)._dispatch()

addons/website/views/website_templates.xml

@@ -80,8 +80,8 @@
                 and main_object.website_meta_keywords or website_meta_keywords"/>
             <title><t t-esc="title"/></title>
 
+            <t t-set="languages" t-value="website.get_languages()"/>
             <t t-if="request.website_multilang">
-                <t t-set="languages" t-value="website.get_languages()"/>
                 <t t-foreach="languages" t-as="lg">
                     <t t-set="force_lang" t-value="lg[0] if lg[0] != website.default_lang_code else None"/>
                     <link rel="alternate" t-att-href="url_for(request.httprequest.path + '?' + keep_query(), lang=force_lang)" t-att-hreflang="lg[0].replace('_', '-').lower()" />