pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] website_mass_mailing: remove 10.0 terms from 12.0 pot

Browse Source 
Was forward-ported
This is problematic as it has the old translation syntax, trying to import a
model:ir.ui.view entry can crash (should be model_terms)

Export mass_mailing where the string "Update my subscriptions" is now present
(no longer in website_mass_mailing as in 10.0)

closes odoo/odoo#31868

Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
This commit is contained in:
Martin Trigaux
2019-03-15 10:05:04 +00:00
parent c41d1d2ca8
commit 69159b27a8
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mass_mailing/i18n/mass_mailing.pot
+14 -4
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 12.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-15 10:48+0000\n"
"PO-Revision-Date: 2019-01-15 10:48+0000\n"
"POT-Creation-Date: 2019-03-15 10:04+0000\n"
"PO-Revision-Date: 2019-03-15 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -780,6 +780,11 @@ msgstr ""
msgid "Email Statistics"
msgstr ""
#. module: mass_mailing
#: model:ir.model,name:mass_mailing.model_mail_template
msgid "Email Templates"
msgstr ""
#. module: mass_mailing
#: model:ir.model,name:mass_mailing.model_mail_thread
msgid "Email Thread"
@@ -2159,9 +2164,14 @@ msgid "Unsubscription Date"
msgstr ""
#. module: mass_mailing
#: code:addons/mass_mailing/models/mass_mailing.py:806
#: code:addons/mass_mailing/models/mass_mailing.py:880
#, python-format
msgid "Unsupported mass mailing model %r"
msgid "Unsupported mass mailing model %s"
msgstr ""
#. module: mass_mailing
#: model_terms:ir.ui.view,arch_db:mass_mailing.unsubscribe
msgid "Update my subscriptions"
msgstr ""
#. module: mass_mailing
addons/website_mass_mailing/i18n/website_mass_mailing.pot
+4 -8
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server saas~11.5\n"
"Project-Id-Version: Odoo Server 12.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-09-21 13:18+0000\n"
"PO-Revision-Date: 2018-09-21 13:18+0000\n"
"POT-Creation-Date: 2019-03-15 10:00+0000\n"
"PO-Revision-Date: 2019-03-15 10:00+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -90,11 +90,6 @@ msgstr ""
msgid "Mailing List"
msgstr ""
#. module: website_mass_mailing
#: model:ir.ui.view,arch_db:website_mass_mailing.unsubscribe
msgid "Update my subscriptions"
msgstr ""
#. module: website_mass_mailing
#. openerp-web
#: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.editor.js:21
@@ -165,3 +160,4 @@ msgstr ""
#: model_terms:ir.ui.view,arch_db:website_mass_mailing.s_newsletter_subscribe_popup
msgid "your email..."
msgstr ""