Techsystech
/
social
mirror of https://github.com/OCA/social.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #429 into 11.0 

Signed-off-by Yajo
pull/434/head
OCA-git-bot 2019-08-30 12:40:12 +00:00
parent 1c1c7335ba 50ca79e49e
commit 2872040b6b
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail_tracking_mailgun/__manifest__.py
View File

@ -6,7 +6,7 @@
{ {
"name": "Mail tracking for Mailgun", "name": "Mail tracking for Mailgun",
"summary": "Mail tracking and Mailgun webhooks integration", "summary": "Mail tracking and Mailgun webhooks integration",
"version": "11.0.1.1.2", "version": "11.0.1.2.0",
"category": "Social Network", "category": "Social Network",
"website": "https://github.com/OCA/social", "website": "https://github.com/OCA/social",
"author": "Tecnativa, " "author": "Tecnativa, "

10
mail_tracking_mailgun/i18n/mail_tracking_mailgun.pot
View File

@ -32,7 +32,7 @@ msgid "%s is not a valid email address. Please check it in order to avoid sendin
msgstr "" msgstr ""
#. module: mail_tracking_mailgun #. module: mail_tracking_mailgun
#: code:addons/mail_tracking_mailgun/models/mail_tracking_email.py:76 #: code:addons/mail_tracking_mailgun/models/mail_tracking_email.py:78
#, python-format #, python-format
msgid "A Mailgun domain value is needed!" msgid "A Mailgun domain value is needed!"
msgstr "" msgstr ""
@ -53,7 +53,7 @@ msgid "Contact"
msgstr "" msgstr ""
#. module: mail_tracking_mailgun #. module: mail_tracking_mailgun
#: code:addons/mail_tracking_mailgun/models/mail_tracking_email.py:240 #: code:addons/mail_tracking_mailgun/models/mail_tracking_email.py:242
#, python-format #, python-format
msgid "Couldn't retrieve Mailgun information" msgid "Couldn't retrieve Mailgun information"
msgstr "" msgstr ""
@ -73,7 +73,7 @@ msgid "Error %s trying to check mailof connection"
msgstr "" msgstr ""
#. module: mail_tracking_mailgun #. module: mail_tracking_mailgun
#: code:addons/mail_tracking_mailgun/models/mail_tracking_email.py:244 #: code:addons/mail_tracking_mailgun/models/mail_tracking_email.py:246
#, python-format #, python-format
msgid "Event information not longer stored" msgid "Event information not longer stored"
msgstr "" msgstr ""
@ -115,13 +115,13 @@ msgid "Set Bounced"
msgstr "" msgstr ""
#. module: mail_tracking_mailgun #. module: mail_tracking_mailgun
#: code:addons/mail_tracking_mailgun/models/mail_tracking_email.py:70 #: code:addons/mail_tracking_mailgun/models/mail_tracking_email.py:72
#, python-format #, python-format
msgid "There is no Mailgun API key!" msgid "There is no Mailgun API key!"
msgstr "" msgstr ""
#. module: mail_tracking_mailgun #. module: mail_tracking_mailgun
#: code:addons/mail_tracking_mailgun/models/mail_tracking_email.py:227 #: code:addons/mail_tracking_mailgun/models/mail_tracking_email.py:229
#, python-format #, python-format
msgid "There is no tracked message!" msgid "There is no tracked message!"
msgstr "" msgstr ""

2
mail_tracking_mailgun/models/mail_tracking_email.py
View File

@ -45,6 +45,8 @@ class MailTrackingEmail(models.Model):
'bounced': 'hard_bounce', 'bounced': 'hard_bounce',
'dropped': 'reject', 'dropped': 'reject',
'accepted': 'sent', 'accepted': 'sent',
'failed': 'error',
'rejected': 'error',
} }
def _mailgun_event_type_verify(self, event): def _mailgun_event_type_verify(self, event):