[MERGE] forward port of branch 9.0 up to 9bd223f5

addons/im_livechat/i18n/im_livechat.pot

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 9.0c\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-26 11:19+0000\n"
-"PO-Revision-Date: 2016-05-26 11:19+0000\n"
+"POT-Creation-Date: 2016-05-26 12:06+0000\n"
+"PO-Revision-Date: 2016-05-26 12:06+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -419,6 +419,11 @@ msgstr ""
 msgid "Livechat Support Channel Statistics allows you to easily check and analyse your company livechat session performance. Extract informations about the missed sessions, the audiance, the duration of a session, etc."
 msgstr ""
 
+#. module: im_livechat
+#: model:ir.ui.view,arch_db:im_livechat.support_page
+msgid "Livechat Support Page"
+msgstr ""
+
 #. module: im_livechat
 #: model:ir.model,name:im_livechat.model_im_livechat_report_channel
 #: model:ir.model,name:im_livechat.model_im_livechat_report_operator

addons/website/models/ir_qweb.py

@@ -31,18 +31,18 @@ class QWeb(orm.AbstractModel):
         if not context.get('rendering_bundle'):
             if name == self.URL_ATTRS.get(element.tag) and qwebcontext.get('url_for'):
                 value = qwebcontext.get('url_for')(value)
-            elif request and request.website and request.website.cdn_activated and (name == self.URL_ATTRS.get(element.tag) or name == self.CDN_TRIGGERS.get(element.tag)):
+            elif request and getattr(request, 'website', None) and request.website.cdn_activated and (name == self.URL_ATTRS.get(element.tag) or name == self.CDN_TRIGGERS.get(element.tag)):
                 value = request.website.get_cdn_url(value)
         return super(QWeb, self).render_attribute(element, name, value, qwebcontext)
 
     def render_text(self, text, element, qwebcontext):
-        compress = request and not request.debug and request.website and request.website.compress_html
+        compress = request and not request.debug and getattr(request, 'website', None) and request.website.compress_html
         if compress and element.tag not in self.PRESERVE_WHITESPACE:
             text = self.re_remove_spaces.sub(' ', text)
         return super(QWeb, self).render_text(text, element, qwebcontext)
 
     def render_tail(self, tail, element, qwebcontext):
-        compress = request and not request.debug and request.website and request.website.compress_html
+        compress = request and not request.debug and getattr(request, 'website', None) and request.website.compress_html
         if compress and element.getparent().tag not in self.PRESERVE_WHITESPACE:
             # No need to recurse because those tags children are not html5 parser friendly
             tail = self.re_remove_spaces.sub(' ', tail.rstrip())

openerp/tools/translate.py

@@ -32,7 +32,7 @@ _logger = logging.getLogger(__name__)
 # used to notify web client that these translations should be loaded in the UI
 WEB_TRANSLATION_COMMENT = "openerp-web"
 
-SKIPPED_ELEMENTS = ('script', 'style', 'title')
+SKIPPED_ELEMENTS = ('script', 'style')
 
 _LOCALE2WIN32 = {
     'af_ZA': 'Afrikaans_South Africa',
@@ -231,8 +231,7 @@ class XMLTranslator(object):
             isinstance(node, SKIPPED_ELEMENT_TYPES) or
             node.tag in SKIPPED_ELEMENTS or
             node.get("t-translation", "").strip() == "off" or
-            node.tag == "attribute" and node.get("name") not in TRANSLATED_ATTRS or
-            not node.getparent() and node.text and '<!DOCTYPE' in node.text
+            node.tag == "attribute" and node.get("name") not in TRANSLATED_ATTRS
         ):
             # do not translate the contents of the node
             tail, node.tail = node.tail, None