From 7d9d420506c5f06f0f32c84cd969040f0fd1d014 Mon Sep 17 00:00:00 2001 From: barbara oliveira Date: Tue, 23 Apr 2024 17:23:26 +0200 Subject: [PATCH 1/2] fix: add missing translation keys --- config/i18n-tasks.yml | 1 + config/locales/en.yml | 3 +++ config/locales/fr.yml | 3 +++ 3 files changed, 7 insertions(+) diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index 4fa0b91..e556aeb 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -118,3 +118,4 @@ ignore_unused: - decidim.system.organizations.omniauth_settings.* - decidim.newsletter_templates.* - decidim.proposals.proposals.form_view.cancel + - decidim.proposals.admin.exports.private_proposals diff --git a/config/locales/en.yml b/config/locales/en.yml index df69d90..bd05f57 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -93,6 +93,9 @@ en: forgot_password: ok_text: Warning, this password is the one of your local account and in no case the one of the account you use through FranceConnect. It will only be used when you log in with your email address rather than via FranceConnect. proposals: + admin: + exports: + private_proposals: Proposals with private data proposals: edit: add_documents: Add documents diff --git a/config/locales/fr.yml b/config/locales/fr.yml index f309c98..b7e6374 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -93,6 +93,9 @@ fr: forgot_password: ok_text: Attention, ce mot de passe est celui de votre compte local et en aucun cas celui du compte que vous utilisez au travers de FranceConnect. Il vous servira uniquement lorsque vous vous connecterez avec votre adresse mail plutôt que via FranceConnect. proposals: + admin: + exports: + private_proposals: Propositions avec données privées proposals: edit: add_documents: Ajouter des documents From bcb2e5fc1f4355d105fbd2d473c161baa4c0f876 Mon Sep 17 00:00:00 2001 From: barbara oliveira Date: Tue, 23 Apr 2024 17:27:22 +0200 Subject: [PATCH 2/2] fix: add ruby plateform in gemfile.lock --- Gemfile.lock | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index 8eda936..4d9f464 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -584,6 +584,7 @@ GEM mime-types-data (3.2022.0105) mini_magick (4.11.0) mini_mime (1.1.2) + mini_portile2 (2.8.6) minitest (5.16.3) mixlib-cli (2.1.8) mixlib-config (3.0.27) @@ -595,6 +596,9 @@ GEM multi_xml (0.6.0) mustache (1.1.1) nio4r (2.5.8) + nokogiri (1.13.4) + mini_portile2 (~> 2.8.0) + racc (~> 1.4) nokogiri (1.13.4-arm64-darwin) racc (~> 1.4) nokogiri (1.13.4-x86_64-darwin) @@ -945,6 +949,7 @@ GEM PLATFORMS arm64-darwin-21 arm64-darwin-22 + ruby x86_64-darwin-21 x86_64-linux