From 0e880f6523587f46a9b85a6eab0c36716f711b45 Mon Sep 17 00:00:00 2001 From: oca-git-bot Date: Mon, 13 Mar 2023 13:27:47 +0100 Subject: [PATCH 1/3] [IMP] update dotfiles --- .copier-answers.yml | 3 ++- .github/workflows/pre-commit.yml | 2 +- .github/workflows/test.yml | 2 +- .pre-commit-config.yaml | 7 ++++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 0f54beede..c989b4d71 100644 --- a/.copier-answers.yml +++ b/.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 diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index aafa13887..0083b5c1b 100644 --- a/.github/workflows/pre-commit.yml +++ b/.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 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f084dc749..984bd902b 100644 --- a/.github/workflows/test.yml +++ b/.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: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ba0720e4f..9823349f0 100644 --- a/.pre-commit-config.yaml +++ b/.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: From 428b30fc67d37f2c10fe4f38efc7957f6631c117 Mon Sep 17 00:00:00 2001 From: hunki Date: Mon, 13 Mar 2023 14:35:46 +0100 Subject: [PATCH 2/3] [FIX] add demo file to manifest --- mail_chatter_thread_colour/__manifest__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mail_chatter_thread_colour/__manifest__.py b/mail_chatter_thread_colour/__manifest__.py index 27abc65a3..a92c7422b 100644 --- a/mail_chatter_thread_colour/__manifest__.py +++ b/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"], } From a8f99a32ccf1480b92bcd2b6759ebce2695302ad Mon Sep 17 00:00:00 2001 From: hunki Date: Mon, 13 Mar 2023 14:49:35 +0100 Subject: [PATCH 3/3] [DEL] en.po files --- email_template_qweb/i18n/en.po | 69 ------------------- .../i18n/en.po | 55 --------------- mail_restrict_follower_selection/i18n/en.po | 39 ----------- 3 files changed, 163 deletions(-) delete mode 100644 email_template_qweb/i18n/en.po delete mode 100644 mail_optional_follower_notification/i18n/en.po delete mode 100644 mail_restrict_follower_selection/i18n/en.po diff --git a/email_template_qweb/i18n/en.po b/email_template_qweb/i18n/en.po deleted file mode 100644 index e4ff6bd44..000000000 --- a/email_template_qweb/i18n/en.po +++ /dev/null @@ -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 \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" diff --git a/mail_optional_follower_notification/i18n/en.po b/mail_optional_follower_notification/i18n/en.po deleted file mode 100644 index fd79215ea..000000000 --- a/mail_optional_follower_notification/i18n/en.po +++ /dev/null @@ -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 \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 "" -"