From 961bc2fdb94fbd0f0d5f01bd7d019a85fdf9ead0 Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sbx.pm>
Date: Wed, 1 Jun 2022 08:49:28 +0200
Subject: [PATCH 01/13] New translations mails.en.yml (French)
---
config/locales/mails.fr.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config/locales/mails.fr.yml b/config/locales/mails.fr.yml
index dbed8f553..8c3a439a7 100644
--- a/config/locales/mails.fr.yml
+++ b/config/locales/mails.fr.yml
@@ -346,7 +346,7 @@ fr:
date: "Ceci est un rappel pour vérifier que le prélèvement bancaire a bien été effectué."
confirm: "Veuillez confirmer la réception des fonds dans votre interface de gestion des échéanciers de paiement, afin que la facture correspondante soit générée."
notify_admin_user_proof_of_identity_files_created:
- subject: "Justufucatif téléversé par un membre"
+ subject: "Justificatif téléversé par un membre"
body:
proof_of_identity_files_uploaded_below: "Le membre %{NAME} a téléversé le justificatif suivant :"
validate_user: "Veuillez valider ce compte"
From 73eed673fbed2168493a47331347be74f34a2c0c Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sbx.pm>
Date: Wed, 1 Jun 2022 09:00:15 +0200
Subject: [PATCH 02/13] New translations app.admin.en.yml (French)
---
config/locales/app.admin.fr.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml
index 001eb070b..00ee27ef7 100644
--- a/config/locales/app.admin.fr.yml
+++ b/config/locales/app.admin.fr.yml
@@ -995,7 +995,7 @@ fr:
my_documents: "Mes documents"
my_documents_info: "Suite à la déclaration de votre profil, vous devez déclarer des justificatifs. Une fois déposés, ces documents vont être vérifiés par l'administrateur."
proof_of_identity_file_size_error: "La limite de poids est de {SIZE} Mo max"
- my_documents_alert: "Attention !</br>Vous pouvez déposer vos documents en pdf ou en image (jpg) sous une limit de poids de {SIZE} Mo max"
+ my_documents_alert: "Attention !</br>Vous pouvez déposer vos documents en pdf ou en image (.jpg) sous une limite de poids de {SIZE} Mo max"
proof_of_identity_files: "Justificatifs"
find_below_the_proof_of_identity_files: "Retrouvez ci-dessous, les justificatifs déposés par le membre."
save: "Enregistrer"
From 4a723806266718b77a5b7d1e7cc264b305ffb282 Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sbx.pm>
Date: Wed, 1 Jun 2022 12:51:42 +0200
Subject: [PATCH 03/13] New translations app.shared.en.yml (French)
---
config/locales/app.shared.fr.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml
index a10fc465a..412b41b4c 100644
--- a/config/locales/app.shared.fr.yml
+++ b/config/locales/app.shared.fr.yml
@@ -527,3 +527,5 @@ fr:
payzen_card_update_modal:
update_card: "Mettre à jour la carte"
validate_button: "Valider la nouvelle carte"
+ form_multi_select:
+ create_label: "Add {VALUE}"
From 9bca485054f13d29639a1065d388272cbd4c1dbc Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sbx.pm>
Date: Wed, 1 Jun 2022 12:51:43 +0200
Subject: [PATCH 04/13] New translations app.shared.en.yml (Spanish)
---
config/locales/app.shared.es.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/config/locales/app.shared.es.yml b/config/locales/app.shared.es.yml
index e82b45747..8b871d2ce 100644
--- a/config/locales/app.shared.es.yml
+++ b/config/locales/app.shared.es.yml
@@ -527,3 +527,5 @@ es:
payzen_card_update_modal:
update_card: "Update the card"
validate_button: "Validate the new card"
+ form_multi_select:
+ create_label: "Add {VALUE}"
From 02aeea7b5e7cb02f5b2586f45d91e58f8b80120d Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sbx.pm>
Date: Wed, 1 Jun 2022 12:51:45 +0200
Subject: [PATCH 05/13] New translations app.shared.en.yml (German)
---
config/locales/app.shared.de.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/config/locales/app.shared.de.yml b/config/locales/app.shared.de.yml
index 38e631c94..526122032 100644
--- a/config/locales/app.shared.de.yml
+++ b/config/locales/app.shared.de.yml
@@ -527,3 +527,5 @@ de:
payzen_card_update_modal:
update_card: "Karte aktualisieren"
validate_button: "Neue Karte validieren"
+ form_multi_select:
+ create_label: "Add {VALUE}"
From 30977567ad7737a0cd7052673822ab91ea6784f9 Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sbx.pm>
Date: Wed, 1 Jun 2022 12:51:46 +0200
Subject: [PATCH 06/13] New translations app.shared.en.yml (Norwegian)
---
config/locales/app.shared.no.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/config/locales/app.shared.no.yml b/config/locales/app.shared.no.yml
index efa0eeb20..ec0e52aaa 100644
--- a/config/locales/app.shared.no.yml
+++ b/config/locales/app.shared.no.yml
@@ -527,3 +527,5 @@
payzen_card_update_modal:
update_card: "Oppdater kortet"
validate_button: "Valider det nye kortet"
+ form_multi_select:
+ create_label: "Add {VALUE}"
From 34b40f751f10fd6c5c5dc2e536ba0d484f4cc14b Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sbx.pm>
Date: Wed, 1 Jun 2022 12:51:47 +0200
Subject: [PATCH 07/13] New translations app.shared.en.yml (Portuguese)
---
config/locales/app.shared.pt.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/config/locales/app.shared.pt.yml b/config/locales/app.shared.pt.yml
index b90c81b52..80db21663 100755
--- a/config/locales/app.shared.pt.yml
+++ b/config/locales/app.shared.pt.yml
@@ -527,3 +527,5 @@ pt:
payzen_card_update_modal:
update_card: "Atualizar o cartão"
validate_button: "Verificar o novo cartão"
+ form_multi_select:
+ create_label: "Add {VALUE}"
From b89707cf52d58cea420378dab37ef65ac2c358a9 Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sbx.pm>
Date: Wed, 1 Jun 2022 12:52:15 +0200
Subject: [PATCH 08/13] New translations app.shared.en.yml (Zulu)
---
config/locales/app.shared.zu.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/config/locales/app.shared.zu.yml b/config/locales/app.shared.zu.yml
index ed57eba7d..0b1115987 100644
--- a/config/locales/app.shared.zu.yml
+++ b/config/locales/app.shared.zu.yml
@@ -527,3 +527,5 @@ zu:
payzen_card_update_modal:
update_card: "crwdns21512:0crwdne21512:0"
validate_button: "crwdns21514:0crwdne21514:0"
+ form_multi_select:
+ create_label: "crwdns23124:0{VALUE}crwdne23124:0"
From 7f2e14073857f47fbc154a33db0f6cc6b95ad929 Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sbx.pm>
Date: Wed, 1 Jun 2022 12:59:13 +0200
Subject: [PATCH 09/13] New translations app.shared.en.yml (French)
---
config/locales/app.shared.fr.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml
index 412b41b4c..3cbe44518 100644
--- a/config/locales/app.shared.fr.yml
+++ b/config/locales/app.shared.fr.yml
@@ -528,4 +528,4 @@ fr:
update_card: "Mettre à jour la carte"
validate_button: "Valider la nouvelle carte"
form_multi_select:
- create_label: "Add {VALUE}"
+ create_label: "Ajouter {VALUE}"
From 0e16374956f31e609419bf8236c94e3a86de7421 Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sleede.com>
Date: Mon, 6 Jun 2022 10:15:19 +0200
Subject: [PATCH 10/13] (bug) unable to compile the assets when OIDC is enabled
but the scopes were not set
---
CHANGELOG.md | 2 ++
app/models/open_id_connect_provider.rb | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d263c9af9..b9cf61c99 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
## next deploy
+- Fix a bug: unable to compile the assets when OIDC is enabled but the scopes were not set
+
## v5.4.2 2022 June 1
- Updated react-select to 5.3.2
diff --git a/app/models/open_id_connect_provider.rb b/app/models/open_id_connect_provider.rb
index c9db5020e..3243a5bf8 100644
--- a/app/models/open_id_connect_provider.rb
+++ b/app/models/open_id_connect_provider.rb
@@ -18,7 +18,7 @@ class OpenIdConnectProvider < ApplicationRecord
validates :client_auth_method, inclusion: { in: %w[basic jwks] }
def scope
- self[:scope].join(' ')
+ self[:scope]&.join(' ')
end
def config
From 6939696aac5ff349c37fcc4d7a8e19a8ee915d1c Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sleede.com>
Date: Mon, 6 Jun 2022 10:23:43 +0200
Subject: [PATCH 11/13] (bug) deprecated bundler arguments (#362)
---
CHANGELOG.md | 1 +
Dockerfile | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9cf61c99..674e48c9a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
## next deploy
+- Fix a bug: deprecated bundler arguments (#362)
- Fix a bug: unable to compile the assets when OIDC is enabled but the scopes were not set
## v5.4.2 2022 June 1
diff --git a/Dockerfile b/Dockerfile
index 941a8f4aa..ca5e313be 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,7 +46,7 @@ RUN bundle config --global frozen 1
WORKDIR /tmp
COPY Gemfile /tmp/
COPY Gemfile.lock /tmp/
-RUN bundle install --binstubs --without development test doc
+RUN bundle config set --local without 'development test doc' && bundle install && bundle binstubs --all
# Install Javascript packages
WORKDIR /usr/src/app
From 5add9a5c11d59a2fff10ecda1cd26ac106c8c12a Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sleede.com>
Date: Mon, 6 Jun 2022 10:24:11 +0200
Subject: [PATCH 12/13] upated changelog
---
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 674e48c9a..5ab06a739 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
## next deploy
+- Updated translations
- Fix a bug: deprecated bundler arguments (#362)
- Fix a bug: unable to compile the assets when OIDC is enabled but the scopes were not set
From 7e7acd40f9ec6def38660a96c7a1f15c96353a8b Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sleede.com>
Date: Mon, 6 Jun 2022 10:42:47 +0200
Subject: [PATCH 13/13] Version 5.4.3
---
CHANGELOG.md | 2 ++
package.json | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ab06a739..91bfe7ef4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
## next deploy
+## v5.4.3 2022 June 6
+
- Updated translations
- Fix a bug: deprecated bundler arguments (#362)
- Fix a bug: unable to compile the assets when OIDC is enabled but the scopes were not set
diff --git a/package.json b/package.json
index 9953a6f6e..c7fcdfc08 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "fab-manager",
- "version": "5.4.2",
+ "version": "5.4.3",
"description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.",
"keywords": [
"fablab",