Skip to content

Commit

Permalink
Merge pull request #377 from OCA/16.0
Browse files Browse the repository at this point in the history
Syncing from upstream OCA/queue (16.0)
  • Loading branch information
bt-admin authored May 2, 2024
2 parents bbc135c + e6ab3cb commit 7c51697
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Do NOT update manually; changes here will be overwritten by Copier
_commit: v1.19.2
_commit: v1.21.1
_src_path: gh:oca/oca-addons-repo-template
ci: GitHub
convert_readme_fragments_to_markdown: false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Stale PRs and issues policy
uses: actions/stale@v4
uses: actions/stale@v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
# General settings.
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
# * Issues that are pending more information
# * Except Issues marked as "no stale"
- name: Needs more information stale issues policy
uses: actions/stale@v4
uses: actions/stale@v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
ascending: true
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ jobs:
run: oca_init_test_database
- name: Run tests
run: oca_run_tests
- uses: codecov/codecov-action@v1
- uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
- name: Update .pot files
run: oca_export_and_push_pot https://x-access-token:${{ secrets.GIT_PUSH_TOKEN }}@github.com/${{ github.repository }}
if: ${{ matrix.makepot == 'true' && github.event_name == 'push' && github.repository_owner == 'OCA' }}
4 changes: 3 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ exclude: |
readme/.*\.(rst|md)$|
# Ignore build and dist directories in addons
/build/|/dist/|
# Ignore test files in addons
/tests/samples/.*|
# You don't usually want a bot to modify your legal texts
(LICENSE.*|COPYING.*)
default_language_version:
Expand All @@ -38,7 +40,7 @@ repos:
language: fail
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
- repo: https://github.com/oca/maintainer-tools
rev: f71041f22b8cd68cf7c77b73a14ca8d8cd190a60
rev: 9a170331575a265c092ee6b24b845ec508e8ef75
hooks:
# update the NOT INSTALLABLE ADDONS section above
- id: oca-update-pre-commit-excluded-addons
Expand Down
27 changes: 19 additions & 8 deletions base_export_async/i18n/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 12.0\n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: 2020-11-20 16:54+0000\n"
"Last-Translator: Yann Papouin <y.papouin@dec-industrie.com>\n"
"PO-Revision-Date: 2024-05-01 15:36+0000\n"
"Last-Translator: c2cdidier <didier.donze@camptocamp.com>\n"
"Language-Team: none\n"
"Language: fr\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"
"X-Generator: Weblate 3.10\n"
"X-Generator: Weblate 4.17\n"

#. module: base_export_async
#. odoo-javascript
Expand All @@ -37,6 +37,16 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p>Votre export est disponible<a t-attf-href=\"{{ object.url }}\" target="
"\"_blank\">ici</a>.</p>\n"
" <p>Il sera automatiquement supprimé le<t t-out=\"object."
"expiration_date\"></t>.</p>\n"
" <br>\n"
" <p>\n"
" <span style=\"color : #808080 ;\">Ce message est "
"automatique, merci de ne pas y répondre.</span>\n"
" </p>\n"
" "

#. module: base_export_async
#: model:ir.model,name:base_export_async.model_delay_export
Expand All @@ -63,7 +73,7 @@ msgstr "Créé le"
#. module: base_export_async
#: model:mail.template,name:base_export_async.delay_export_mail_template
msgid "Delay Export"
msgstr ""
msgstr "Retarder l'exportation"

#. module: base_export_async
#: model:ir.actions.server,name:base_export_async.to_delete_attachment_ir_actions_server
Expand All @@ -79,12 +89,12 @@ msgstr "Nom affiché"
#. module: base_export_async
#: model:ir.model.fields,field_description:base_export_async.field_delay_export__expiration_date
msgid "Expiration Date"
msgstr ""
msgstr "Date d'expiration"

#. module: base_export_async
#: model:mail.template,subject:base_export_async.delay_export_mail_template
msgid "Export {{ object.model_description }} {{ datetime.date.today() }}"
msgstr ""
msgstr "Exportation {{ object.model_description }} {{ datetime.date.today() }}"

#. module: base_export_async
#. odoo-javascript
Expand Down Expand Up @@ -116,19 +126,20 @@ msgstr "Dernière mise à jour le"
#. module: base_export_async
#: model:ir.model.fields,field_description:base_export_async.field_delay_export__model_description
msgid "Model Description"
msgstr ""
msgstr "Description du modèle"

#. module: base_export_async
#. odoo-javascript
#: code:addons/base_export_async/static/src/js/data_export.esm.js:0
#, python-format
msgid "Please select fields to save export list..."
msgstr ""
"Veuillez sélectionner les champs pour enregistrer la liste d'exportation..."

#. module: base_export_async
#: model:ir.model.fields,field_description:base_export_async.field_delay_export__url
msgid "Url"
msgstr ""
msgstr "Url"

#. module: base_export_async
#: model:ir.model.fields,field_description:base_export_async.field_delay_export__user_ids
Expand Down

0 comments on commit 7c51697

Please sign in to comment.