[MERGE] forward port branch saas-11.1 up to 7e469eb77aa

4 files changed, 9 insertions, 6 deletions

diff --git a/addons/mail/i18n/nl.po b/addons/mail/i18n/nl.po
index 59fe917232c..47e7ed6123e 100644
--- a/addons/mail/i18n/nl.po
+++ b/addons/mail/i18n/nl.po
@@ -6,7 +6,7 @@
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
 # Stephan Van Dyck <stephan.vandyck@vanroey.be>, 2016
 # Cas Vissers <casvissers@brahoo.nl>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Volluta <volluta@tutanota.com>, 2016
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
 # Eric Geens <ericgeens@yahoo.com>, 2016
@@ -5553,6 +5553,9 @@ msgid ""
 "and Enterprise versions. Online users already benefit from a ready-to-use "
 "email server (@mycompany.odoo.com)."
 msgstr ""
+"Het gebruik van uw eigen e-mailserver is vereist voor het verzenden / "
+"ontvangen van e-mails in Community- en Enterprise-versies. Online gebruikers"
+" profiteren van een kant-en-klare e-mailserver (@ mijnbedrijf.odoo.com)."
 
 #. module: mail
 #: code:addons/mail/models/mail_thread.py:670
diff --git a/addons/mail/i18n/zh_CN.po b/addons/mail/i18n/zh_CN.po
index 05b4f0ea1d4..7853c0ce679 100644
--- a/addons/mail/i18n/zh_CN.po
+++ b/addons/mail/i18n/zh_CN.po
@@ -8,7 +8,7 @@
 # liAnGjiA <liangjia@qq.com>, 2017
 # liulixia <liu.lixia@elico-corp.com>, 2017
 # waveyeung <waveyeung@qq.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Rona Lin <ssauapw@qq.com>, 2017
 # xiaobin wu <bd5dml@gmail.com>, 2017
 # Michael Chong <michaelchong2005@gmail.com>, 2017
@@ -183,7 +183,7 @@ msgstr "%s 加入到 %s 网络."
 #: code:addons/mail/static/src/xml/client_action.xml:211
 #, python-format
 msgid "&nbsp;("
-msgstr ""
+msgstr "&nbsp;("
 
 #. module: mail
 #. openerp-web
@@ -5553,7 +5553,7 @@ msgstr "一般"
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.message_origin_link
 msgid "has been"
-msgstr ""
+msgstr "已经"
 
 #. module: mail
 #: code:addons/mail/models/mail_alias.py:282
diff --git a/addons/mail/models/mail_template.py b/addons/mail/models/mail_template.py
index 5dfaf162573..586c5e9c281 100644
--- a/addons/mail/models/mail_template.py
+++ b/addons/mail/models/mail_template.py
@@ -331,7 +331,7 @@ class MailTemplate(models.Model):
 
         def _process_link(url):
             new_url = urls.url_parse(url)
-            if new_url.scheme and new_url.netloc:
+            if new_url.scheme and (new_url.netloc or new_url.scheme == 'mailto'):
                 return url
             return new_url.replace(scheme=base.scheme, netloc=base.netloc).to_url()
 
diff --git a/addons/mail/static/src/js/discuss.js b/addons/mail/static/src/js/discuss.js
index 4de7e637e8b..52bf2b75822 100644
--- a/addons/mail/static/src/js/discuss.js
+++ b/addons/mail/static/src/js/discuss.js
@@ -905,7 +905,7 @@ var Discuss = Widget.extend(ControlPanelMixin, {
         var def = window.Notification && window.Notification.requestPermission();
         if (def) {
             def.then(function (value) {
-                if (value === 'denied') {
+                if (value !== 'granted') {
                     self._sendNotification(self, _t('Permission denied'),
                         _t('Odoo will not have the permission to send native notifications on this device.'));
                 } else {