Merge PR #1098 into 13.0

Signed-off-by hbrunn

.copier-answers.yml

@@ -1,10 +1,11 @@
 # Do NOT update manually; changes here will be overwritten by Copier
-_commit: v1.11.1
+_commit: v1.14.2
 _src_path: https://github.com/OCA/oca-addons-repo-template.git
 ci: GitHub
 dependency_installation_mode: PIP
 generate_requirements_txt: true
 github_check_license: true
+github_ci_extra_env: {}
 github_enable_codecov: true
 github_enable_makepot: true
 github_enable_stale_action: true

.github/workflows/pre-commit.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   pre-commit:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2

.github/workflows/test.yml

@@ -28,7 +28,7 @@ jobs:
               fi
           done
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     container: ${{ matrix.container }}
     name: ${{ matrix.name }}
     strategy:

.pre-commit-config.yaml

@@ -15,7 +15,7 @@ exclude: |
   # You don't usually want a bot to modify your legal texts
   (LICENSE.*|COPYING.*)
 default_language_version:
-  python: python3
+  python: python3.8
   node: "14.13.0"
 repos:
   - repo: local
@@ -27,6 +27,11 @@ repos:
         entry: found forbidden files; remove them
         language: fail
         files: "\\.rej$"
+      - id: en-po-files
+        name: en.po files cannot exist
+        entry: found a en.po file
+        language: fail
+        files: '[a-zA-Z0-9_]*/i18n/en\.po$'
   - repo: https://github.com/oca/maintainer-tools
     rev: ab1d7f6
     hooks:

email_template_qweb/i18n/en.po

@@ -1,69 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# * email_template_qweb
-#
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: social (9.0)\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-19 02:50+0000\n"
-"PO-Revision-Date: 2016-05-18 14:54+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
-"Language-Team: English (http://www.transifex.com/oca/OCA-social-9-0/language/"
-"en/)\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. module: email_template_qweb
-#: model:ir.model.fields,field_description:email_template_qweb.field_email_template_preview__body_type
-#: model:ir.model.fields,field_description:email_template_qweb.field_mail_template__body_type
-msgid "Body templating engine"
-msgstr "Body templating engine"
-
-#. module: email_template_qweb
-#: model:ir.model.fields,field_description:email_template_qweb.field_email_template_preview__body_view_id
-#: model:ir.model.fields,field_description:email_template_qweb.field_mail_template__body_view_id
-msgid "Body view"
-msgstr "Body view"
-
-#. module: email_template_qweb
-#: model_terms:ir.ui.view,arch_db:email_template_qweb.view_email_template_demo1
-msgid "Dear"
-msgstr "Dear"
-
-#. module: email_template_qweb
-#: model:ir.model,name:email_template_qweb.model_mail_template
-msgid "Email Templates"
-msgstr "Email Templates"
-
-#. module: email_template_qweb
-#: selection:email_template.preview,body_type:0
-#: selection:mail.template,body_type:0
-msgid "Jinja2"
-msgstr "Jinja2"
-
-#. module: email_template_qweb
-#: selection:email_template.preview,body_type:0
-#: selection:mail.template,body_type:0
-msgid "QWeb"
-msgstr "QWeb"
-
-#. module: email_template_qweb
-#: model:mail.template,subject:email_template_qweb.email_template_demo1
-msgid "QWeb demo email"
-msgstr "QWeb demo email"
-
-#. module: email_template_qweb
-#: model_terms:ir.ui.view,arch_db:email_template_qweb.view_email_template_demo1
-msgid "This is an email template using qweb."
-msgstr "This is an email template using qweb."
-
-#. module: email_template_qweb
-#: model:ir.model.fields,field_description:email_template_qweb.field_email_template_preview__body_view_arch
-#: model:ir.model.fields,field_description:email_template_qweb.field_mail_template__body_view_arch
-msgid "View Architecture"
-msgstr "View Architecture"

mail_chatter_thread_colour/__manifest__.py

@@ -16,5 +16,6 @@
         "views/ir_model.xml",
         "templates/assets.xml",
     ],
+    "demo": ["demo/ir_model.xml"],
     "qweb": ["static/src/xml/thread.xml"],
 }

mail_optional_follower_notification/i18n/en.po

@@ -1,55 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# * mail_optional_follower_notification
-#
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: social (8.0)\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-26 02:42+0000\n"
-"PO-Revision-Date: 2016-05-25 14:10+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
-"Language-Team: English (http://www.transifex.com/oca/OCA-social-8-0/language/"
-"en/)\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
-#, fuzzy
-msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
-msgstr ""
-"- Warning : Followers will not be notified but they can access the "
-"notification directly from the document (if they are allowed to)"
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr "Email composition wizard"
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
-msgstr "Message"
-
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr "Notify followers"
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr ""
-
-#~ msgid "Notifications"
-#~ msgstr "Notifications"

mail_restrict_follower_selection/i18n/en.po

@@ -1,39 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# * mail_restrict_follower_selection
-#
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: social (8.0)\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-30 16:56+0000\n"
-"PO-Revision-Date: 2015-09-30 16:56+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
-"Language-Team: English (http://www.transifex.com/oca/OCA-social-8-0/language/"
-"en/)\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. module: mail_restrict_follower_selection
-#: model:ir.actions.act_window,name:mail_restrict_follower_selection.action_setup
-msgid "Configure the restriction on followers"
-msgstr "Configure the restriction on followers"
-
-#. module: mail_restrict_follower_selection
-#: model:ir.model,name:mail_restrict_follower_selection.model_mail_followers
-msgid "Document Followers"
-msgstr ""
-
-#. module: mail_restrict_follower_selection
-#: model:ir.model,name:mail_restrict_follower_selection.model_mail_thread
-msgid "Email Thread"
-msgstr ""
-
-#. module: mail_restrict_follower_selection
-#: model:ir.model,name:mail_restrict_follower_selection.model_mail_wizard_invite
-msgid "Invite wizard"
-msgstr "Invite wizard"