From ecb34024872cb76e9ac668c12e992d44230adc88 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 15:49:22 +0100 Subject: [PATCH 01/30] New translations en.yml (French) --- config/locales/fr.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 57109729c..f6ffa92dc 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -367,10 +367,18 @@ fr: all_objects_sync: "Toutes les données ont été synchronisés avec succès sur Stripe." notify_user_when_payment_schedule_ready: your_schedule_is_ready_html: "Votre échéancier n°%{REFERENCE}, d'un montant de %{AMOUNT}, est prêt. Cliquez ici pour le télécharger." + notify_admin_payment_schedule_error: + schedule_error: "An error occurred for the card debit of the %{DATE} deadline, for schedule %{REFERENCE}" + notify_member_payment_schedule_error: + schedule_error: "An error occurred for the card debit of the %{DATE} deadline, for your schedule %{REFERENCE}" notify_admin_payment_schedule_failed: schedule_failed: "Échec du prélèvement par carte de l'échéance du %{DATE}, pour l'échéancier %{REFERENCE}" notify_member_payment_schedule_failed: schedule_failed: "Échec du prélèvement par carte de l'échéance du %{DATE}, pour votre échéancier %{REFERENCE}" + notify_admin_payment_schedule_gateway_canceled: + schedule_canceled: "The payment schedule %{REFERENCE} was canceled by the gateway. An action is required." + notify_member_payment_schedule_gateway_canceled: + schedule_canceled: "Your payment schedule %{REFERENCE} was canceled by the gateway." notify_admin_payment_schedule_check_deadline: schedule_deadline: "Vous devez encaisser le chèque de l'échéance du %{DATE}, pour l'échéancier %{REFERENCE}" notify_admin_payment_schedule_transfer_deadline: From 965f9c11b88616556da0805850677b497675c8c0 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 15:49:31 +0100 Subject: [PATCH 02/30] New translations mails.en.yml (Portuguese) --- config/locales/mails.pt.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/config/locales/mails.pt.yml b/config/locales/mails.pt.yml index 2c554407a..fcc81dda8 100755 --- a/config/locales/mails.pt.yml +++ b/config/locales/mails.pt.yml @@ -296,6 +296,18 @@ pt: please_find_attached_html: "Por favor, anexe a sua agenda de pagamento, emitida em {DATE}, com um valor de {AMOUNT} relativo à sua reserva {TYPE, select, Reservation{reserva} other{assinatura}}." #messageFormat interpolation schedule_in_your_dashboard_html: "Você pode encontrar a agenda de pagamento a qualquer momento a partir de %{DASHBOARD} no site do Fab Lab." your_dashboard: "seu dashboard" + notify_admin_payment_schedule_error: + subject: "[URGENT] Card debit error" + body: + remember: "In accordance with the %{REFERENCE} payment schedule, a debit by card of %{AMOUNT} was scheduled on %{DATE}." + error: "Unfortunately, an error occurred and this card debit was unable to complete successfully." + action: "Please then consult the %{GATEWAY} dashboard and contact the member as soon as possible to resolve the problem." + notify_member_payment_schedule_error: + subject: "[URGENT] Card debit error" + body: + remember: "In accordance with your %{REFERENCE} payment schedule, a debit by card of %{AMOUNT} was scheduled on %{DATE}." + error: "Unfortunately, an error occurred and this card debit was unable to complete successfully." + action: "Please contact a manager as soon as possible to resolve the problem." notify_admin_payment_schedule_failed: subject: "[URGENT] Falha no débito do cartão" body: @@ -309,6 +321,16 @@ pt: error: "Infelizmente, não foi possível completar o débito no cartão com sucesso." action_html: "Por favor, verifique %{DASHBOARD} ou entre em contato com um gerente antes de 24 horas, caso contrário sua assinatura pode ser interrompida." your_dashboard: "seu dashboard" + notify_admin_payment_schedule_gateway_canceled: + subject: "[URGENT] Payment schedule canceled by the payment gateway" + body: + error: "The payment schedule %{REFERENCE} was canceled by the payment gateway (%{GATEWAY}). No further debits will be made on this payment mean." + action: "Please consult the payment schedule management interface and contact the member as soon as possible to resolve the problem." + notify_member_payment_schedule_gateway_canceled: + subject: "[URGENT] Payment schedule canceled by the payment gateway" + body: + error: "Your payment schedule %{REFERENCE} was canceled by the payment gateway. No further debits will be made on this payment mean." + action: "Please contact a manager as soon as possible to resolve the problem." notify_admin_payment_schedule_check_deadline: subject: "Prazo de pagamento" body: From d7c1ad5099c8dbd44bf603ecbd8746cc50dbacaf Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 15:49:34 +0100 Subject: [PATCH 03/30] New translations app.shared.en.yml (French) --- config/locales/app.shared.fr.yml | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml index 03b6b333d..2e5242557 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -252,7 +252,7 @@ fr: mappings: "Correspondances" #edition/creation form of an OAuth2 authentication provider oauth2: - common_url: "URL commune" + common_url: "Server root URL" common_url_is_required: "L'URL commune est requise." provided_url_is_not_a_valid_url: "L'URL fournie n'est pas une URL valide." authorization_endpoint: "Point d'accès pour l'autorisation" @@ -274,6 +274,7 @@ fr: api_endpoint_url: "Point d'accès/URL de l'API" api_type: "Type d'API" api_fields: "Champ de l'API" + api_field_help: "JsonPath syntax is supported.\n If many fields are selected, the first one will be used.\n Example: $.data[*].name" #machine/training slot modification modal confirm_modify_slot_modal: change_the_slot: "Modifier le créneau" @@ -493,23 +494,26 @@ fr: state_requires_action: "Action requise" state_paid: "Payée" state_error: "Erreur" + state_gateway_canceled: "Canceled by the payment gateway" state_canceled: "Annulée" method_card: "par carte" method_check: "par chèque" method_transfer: "par prélèvement" - confirm_payment: "Confirmer l'encaissement" - solve: "Résoudre" - update_card: "Mettre à jour la carte" - confirm_check_cashing: "Confirmer l'encaissement du chèque" - confirm_check_cashing_body: "Vous devez encaisser un chèque de {AMOUNT} pour l'échéance du {DATE}. En confirmant l'encaissement du chèque, une facture sera générée pour cette échéance." - confirm_bank_transfer: "Confirmer le prélèvement" - confirm_bank_transfer_body: "Vous devez confirmer l'encaissement de {AMOUNT} pour l'échéance du {DATE}. En confirmant le prélèvement bancaire, une facture sera générée pour cette date d'échéance." - confirm_button: "Confirmer" - resolve_action: "Résoudre l'action" - ok_button: "OK" - cancel_subscription: "Annuler l'abonnement" - confirm_cancel_subscription: "Vous êtes sur le point d'annuler cet échéancier de paiement ainsi que l'abonnement lié. Êtes-vous sur ?" - please_ask_reception: "Pour toute question, merci de contacter l'accueil du FabLab." + payment_schedule_item_actions: + download: "Download" + cancel_subscription: "Cancel the subscription" + confirm_payment: "Confirm payment" + confirm_check: "Confirm cashing" + resolve_action: "Resolve the action" + update_card: "Update the card" + update_payment_mean: "Update the payment mean" + please_ask_reception: "For any questions, please contact the FabLab's reception." + confirm_button: "Confirm" + confirm_check_cashing: "Confirm the cashing of the check" + confirm_check_cashing_body: "You must cash a check of {AMOUNT} for the deadline of {DATE}. By confirming the cashing of the check, an invoice will be generated for this due date." + confirm_bank_transfer: "Confirm the bank transfer" + confirm_bank_transfer_body: "You must confirm the receipt of {AMOUNT} for the deadline of {DATE}. By confirming the bank transfer, an invoice will be generated for this due date." + confirm_cancel_subscription: "You're about to cancel this payment schedule and the related subscription. Are you sure?" payment_modal: online_payment_disabled: "Le paiement par carte bancaire n'est pas disponible. Merci de contacter directement l'accueil du FabLab." unexpected_error: "Une erreur est survenue. Merci de rapporter cet incident à l'équipe de Fab-Manager." From a847ce06fbf396d92a7ac567878a92bb54994e3a Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 15:49:35 +0100 Subject: [PATCH 04/30] New translations app.shared.en.yml (Spanish) --- config/locales/app.shared.es.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/config/locales/app.shared.es.yml b/config/locales/app.shared.es.yml index 8e49f49a5..e9ddb2f5c 100644 --- a/config/locales/app.shared.es.yml +++ b/config/locales/app.shared.es.yml @@ -252,7 +252,7 @@ es: mappings: "Mapeos" #edition/creation form of an OAuth2 authentication provider oauth2: - common_url: "URL común" + common_url: "Server root URL" common_url_is_required: "se requiere una URL común." provided_url_is_not_a_valid_url: "La URL cedida no es válida." authorization_endpoint: "Final de la autorización" @@ -274,6 +274,7 @@ es: api_endpoint_url: "API final de URL" api_type: "Tipo de API" api_fields: "Campos de API" + api_field_help: "JsonPath syntax is supported.\n If many fields are selected, the first one will be used.\n Example: $.data[*].name" #machine/training slot modification modal confirm_modify_slot_modal: change_the_slot: "Cambiar la ranura" @@ -493,23 +494,26 @@ es: state_requires_action: "Action required" state_paid: "Paid" state_error: "Error" + state_gateway_canceled: "Canceled by the payment gateway" state_canceled: "Canceled" method_card: "by card" method_check: "by check" method_transfer: "by transfer" + payment_schedule_item_actions: + download: "Download" + cancel_subscription: "Cancel the subscription" confirm_payment: "Confirm payment" - solve: "Solve" + confirm_check: "Confirm cashing" + resolve_action: "Resolve the action" update_card: "Update the card" + update_payment_mean: "Update the payment mean" + please_ask_reception: "For any questions, please contact the FabLab's reception." + confirm_button: "Confirm" confirm_check_cashing: "Confirm the cashing of the check" confirm_check_cashing_body: "You must cash a check of {AMOUNT} for the deadline of {DATE}. By confirming the cashing of the check, an invoice will be generated for this due date." confirm_bank_transfer: "Confirm the bank transfer" confirm_bank_transfer_body: "You must confirm the receipt of {AMOUNT} for the deadline of {DATE}. By confirming the bank transfer, an invoice will be generated for this due date." - confirm_button: "Confirm" - resolve_action: "Resolve the action" - ok_button: "OK" - cancel_subscription: "Cancel the subscription" confirm_cancel_subscription: "You're about to cancel this payment schedule and the related subscription. Are you sure?" - please_ask_reception: "For any questions, please contact the FabLab's reception." payment_modal: online_payment_disabled: "Online payment is not available. Please contact the FabLab's reception directly." unexpected_error: "An error occurred. Please report this issue to the Fab-Manager's team." From 37081c5a1d1860d48d87987b227bfc39df983fb9 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 15:49:36 +0100 Subject: [PATCH 05/30] New translations app.shared.en.yml (German) --- config/locales/app.shared.de.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/config/locales/app.shared.de.yml b/config/locales/app.shared.de.yml index b1f694dee..7dd724516 100644 --- a/config/locales/app.shared.de.yml +++ b/config/locales/app.shared.de.yml @@ -252,7 +252,7 @@ de: mappings: "Zuordnungen" #edition/creation form of an OAuth2 authentication provider oauth2: - common_url: "Gemeinsame URL" + common_url: "Server root URL" common_url_is_required: "Gemeinsame URL ist erforderlich." provided_url_is_not_a_valid_url: "Die angegebene URL ist keine gültige URL." authorization_endpoint: "Authentifizierungs-Endpunkt" @@ -274,6 +274,7 @@ de: api_endpoint_url: "URL des API-Endpunkts" api_type: "API-Typ" api_fields: "API-Felder" + api_field_help: "JsonPath syntax is supported.\n If many fields are selected, the first one will be used.\n Example: $.data[*].name" #machine/training slot modification modal confirm_modify_slot_modal: change_the_slot: "Slot ändern" @@ -493,23 +494,26 @@ de: state_requires_action: "Action required" state_paid: "Paid" state_error: "Error" + state_gateway_canceled: "Canceled by the payment gateway" state_canceled: "Canceled" method_card: "by card" method_check: "by check" method_transfer: "by transfer" + payment_schedule_item_actions: + download: "Download" + cancel_subscription: "Cancel the subscription" confirm_payment: "Confirm payment" - solve: "Solve" + confirm_check: "Confirm cashing" + resolve_action: "Resolve the action" update_card: "Update the card" + update_payment_mean: "Update the payment mean" + please_ask_reception: "For any questions, please contact the FabLab's reception." + confirm_button: "Confirm" confirm_check_cashing: "Confirm the cashing of the check" confirm_check_cashing_body: "You must cash a check of {AMOUNT} for the deadline of {DATE}. By confirming the cashing of the check, an invoice will be generated for this due date." confirm_bank_transfer: "Confirm the bank transfer" confirm_bank_transfer_body: "You must confirm the receipt of {AMOUNT} for the deadline of {DATE}. By confirming the bank transfer, an invoice will be generated for this due date." - confirm_button: "Confirm" - resolve_action: "Resolve the action" - ok_button: "OK" - cancel_subscription: "Cancel the subscription" confirm_cancel_subscription: "You're about to cancel this payment schedule and the related subscription. Are you sure?" - please_ask_reception: "For any questions, please contact the FabLab's reception." payment_modal: online_payment_disabled: "Online payment is not available. Please contact the FabLab's reception directly." unexpected_error: "An error occurred. Please report this issue to the Fab-Manager's team." From 9f7606360fd41ae0e952f55d02dc67fc962c9681 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 15:49:38 +0100 Subject: [PATCH 06/30] New translations app.shared.en.yml (Norwegian) --- config/locales/app.shared.no.yml | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/config/locales/app.shared.no.yml b/config/locales/app.shared.no.yml index ff6fba8b1..79920272f 100644 --- a/config/locales/app.shared.no.yml +++ b/config/locales/app.shared.no.yml @@ -252,7 +252,7 @@ mappings: "Tilordninger" #edition/creation form of an OAuth2 authentication provider oauth2: - common_url: "Felles URL" + common_url: "Server root URL" common_url_is_required: "Felles URL er påkrevd." provided_url_is_not_a_valid_url: "Angitt nettadresse er ikke en gyldig nettadresse." authorization_endpoint: "Autorisasjons sluttpunkt" @@ -274,6 +274,7 @@ api_endpoint_url: "API endpoint URL" api_type: "API type" api_fields: "API-felt" + api_field_help: "JsonPath syntax is supported.\n If many fields are selected, the first one will be used.\n Example: $.data[*].name" #machine/training slot modification modal confirm_modify_slot_modal: change_the_slot: "Endre tidsluken" @@ -493,23 +494,26 @@ state_requires_action: "Handling kreves" state_paid: "Betalt" state_error: "Feil" + state_gateway_canceled: "Canceled by the payment gateway" state_canceled: "Avbrutt" method_card: "med kort" method_check: "med sjekk" method_transfer: "by transfer" - confirm_payment: "Bekreft betaling" - solve: "Løs" - update_card: "Oppdater kortet" + payment_schedule_item_actions: + download: "Download" + cancel_subscription: "Cancel the subscription" + confirm_payment: "Confirm payment" + confirm_check: "Confirm cashing" + resolve_action: "Resolve the action" + update_card: "Update the card" + update_payment_mean: "Update the payment mean" + please_ask_reception: "For any questions, please contact the FabLab's reception." + confirm_button: "Confirm" confirm_check_cashing: "Confirm the cashing of the check" confirm_check_cashing_body: "You must cash a check of {AMOUNT} for the deadline of {DATE}. By confirming the cashing of the check, an invoice will be generated for this due date." confirm_bank_transfer: "Confirm the bank transfer" confirm_bank_transfer_body: "You must confirm the receipt of {AMOUNT} for the deadline of {DATE}. By confirming the bank transfer, an invoice will be generated for this due date." - confirm_button: "Bekreft" - resolve_action: "Løs handlingen" - ok_button: "Ok" - cancel_subscription: "Avslutt medlemskap/abonnement" - confirm_cancel_subscription: "Du er i ferd med å avslutte denne betalingsplanen og det relaterte abonnementet. Er du sikker?" - please_ask_reception: "For alle spørsmål, vennligst ta kontakt ledelsen." + confirm_cancel_subscription: "You're about to cancel this payment schedule and the related subscription. Are you sure?" payment_modal: online_payment_disabled: "Elektronisk betaling er ikke tilgjengelig. Kontakt ledelsen." unexpected_error: "Det oppstod en feil. Vennligst rapporter til Fab-Manager-teamet." From f70f036e7ebeffcb82f15969bfcf708e8dbf0b0a Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 15:49:39 +0100 Subject: [PATCH 07/30] New translations app.shared.en.yml (Portuguese) --- config/locales/app.shared.pt.yml | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/config/locales/app.shared.pt.yml b/config/locales/app.shared.pt.yml index c2a821fcc..ff6fa60a5 100755 --- a/config/locales/app.shared.pt.yml +++ b/config/locales/app.shared.pt.yml @@ -252,7 +252,7 @@ pt: mappings: "Mapeamentos" #edition/creation form of an OAuth2 authentication provider oauth2: - common_url: "URL comum" + common_url: "Server root URL" common_url_is_required: "URL comum é necessária." provided_url_is_not_a_valid_url: "A URL fornecida não é uma URL válida." authorization_endpoint: "Endpoint da autorização" @@ -274,6 +274,7 @@ pt: api_endpoint_url: "API endpoint URL" api_type: "API tipo" api_fields: "API linhas" + api_field_help: "JsonPath syntax is supported.\n If many fields are selected, the first one will be used.\n Example: $.data[*].name" #machine/training slot modification modal confirm_modify_slot_modal: change_the_slot: "Alterar o slot" @@ -493,23 +494,26 @@ pt: state_requires_action: "Ação necessária" state_paid: "Pago" state_error: "Erro" + state_gateway_canceled: "Canceled by the payment gateway" state_canceled: "Cancelado" method_card: "por cartão" method_check: "por verificação" method_transfer: "by transfer" - confirm_payment: "Confirmar pagamento" - solve: "Resolver" - update_card: "Atualizar o cartão" - confirm_check_cashing: "Confirme o desconto de verificação" - confirm_check_cashing_body: "Você deve pagar uma verificação de {AMOUNT} pelo prazo de {DATE}. Ao confirmar o pagamento, uma fatura será gerada para este prazo." + payment_schedule_item_actions: + download: "Download" + cancel_subscription: "Cancel the subscription" + confirm_payment: "Confirm payment" + confirm_check: "Confirm cashing" + resolve_action: "Resolve the action" + update_card: "Update the card" + update_payment_mean: "Update the payment mean" + please_ask_reception: "For any questions, please contact the FabLab's reception." + confirm_button: "Confirm" + confirm_check_cashing: "Confirm the cashing of the check" + confirm_check_cashing_body: "You must cash a check of {AMOUNT} for the deadline of {DATE}. By confirming the cashing of the check, an invoice will be generated for this due date." confirm_bank_transfer: "Confirm the bank transfer" confirm_bank_transfer_body: "You must confirm the receipt of {AMOUNT} for the deadline of {DATE}. By confirming the bank transfer, an invoice will be generated for this due date." - confirm_button: "Confirmar" - resolve_action: "Resolver a ação" - ok_button: "OK" - cancel_subscription: "Cancelar assinatura" - confirm_cancel_subscription: "Você está prestes a cancelar esta agenda de pagamento e a assinatura relacionada. Tem certeza?" - please_ask_reception: "Para qualquer dúvida, entre em contato com a recepção do FabLab." + confirm_cancel_subscription: "You're about to cancel this payment schedule and the related subscription. Are you sure?" payment_modal: online_payment_disabled: "O pagamento online não está disponível. Entre em contato diretamente com a recepção do FabLab." unexpected_error: "Ocorreu um erro. Por favor, reporte este problema à equipe do FabLab." From e04791813a82bf2304db622b00e206b875db2ad8 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 15:49:40 +0100 Subject: [PATCH 08/30] New translations mails.en.yml (Zulu) --- config/locales/mails.zu.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/config/locales/mails.zu.yml b/config/locales/mails.zu.yml index 0a72baea7..d01b5f847 100644 --- a/config/locales/mails.zu.yml +++ b/config/locales/mails.zu.yml @@ -296,6 +296,18 @@ zu: please_find_attached_html: "crwdns21126:0DATE={DATE}crwdnd21126:0AMOUNT={AMOUNT}crwdnd21126:0TYPE={TYPE}crwdne21126:0" #messageFormat interpolation schedule_in_your_dashboard_html: "crwdns21128:0%{DASHBOARD}crwdne21128:0" your_dashboard: "crwdns21130:0crwdne21130:0" + notify_admin_payment_schedule_error: + subject: "crwdns22373:0[URGENT]crwdne22373:0" + body: + remember: "crwdns22375:0%{REFERENCE}crwdnd22375:0%{AMOUNT}crwdnd22375:0%{DATE}crwdne22375:0" + error: "crwdns22377:0crwdne22377:0" + action: "crwdns22379:0%{GATEWAY}crwdne22379:0" + notify_member_payment_schedule_error: + subject: "crwdns22381:0[URGENT]crwdne22381:0" + body: + remember: "crwdns22383:0%{REFERENCE}crwdnd22383:0%{AMOUNT}crwdnd22383:0%{DATE}crwdne22383:0" + error: "crwdns22385:0crwdne22385:0" + action: "crwdns22387:0crwdne22387:0" notify_admin_payment_schedule_failed: subject: "crwdns21132:0[URGENT]crwdne21132:0" body: @@ -309,6 +321,16 @@ zu: error: "crwdns21144:0crwdne21144:0" action_html: "crwdns21146:0%{DASHBOARD}crwdne21146:0" your_dashboard: "crwdns21148:0crwdne21148:0" + notify_admin_payment_schedule_gateway_canceled: + subject: "crwdns22389:0[URGENT]crwdne22389:0" + body: + error: "crwdns22391:0%{REFERENCE}crwdnd22391:0%{GATEWAY}crwdne22391:0" + action: "crwdns22393:0crwdne22393:0" + notify_member_payment_schedule_gateway_canceled: + subject: "crwdns22395:0[URGENT]crwdne22395:0" + body: + error: "crwdns22397:0%{REFERENCE}crwdne22397:0" + action: "crwdns22399:0crwdne22399:0" notify_admin_payment_schedule_check_deadline: subject: "crwdns21150:0crwdne21150:0" body: From e0131fd44ac04f2f1a5379915dca2070ecbe0828 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 15:49:41 +0100 Subject: [PATCH 09/30] New translations mails.en.yml (Norwegian) --- config/locales/mails.no.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/config/locales/mails.no.yml b/config/locales/mails.no.yml index f355eca51..3685f5538 100644 --- a/config/locales/mails.no.yml +++ b/config/locales/mails.no.yml @@ -296,6 +296,18 @@ please_find_attached_html: "Please find attached your payment schedule, issued on {DATE}, with an amount of {AMOUNT} concerning your {TYPE, select, Reservation{reservation} other{subscription}}." #messageFormat interpolation schedule_in_your_dashboard_html: "You can find this payment schedule at any time from %{DASHBOARD} on the Fab Lab's website." your_dashboard: "your dashboard" + notify_admin_payment_schedule_error: + subject: "[URGENT] Card debit error" + body: + remember: "In accordance with the %{REFERENCE} payment schedule, a debit by card of %{AMOUNT} was scheduled on %{DATE}." + error: "Unfortunately, an error occurred and this card debit was unable to complete successfully." + action: "Please then consult the %{GATEWAY} dashboard and contact the member as soon as possible to resolve the problem." + notify_member_payment_schedule_error: + subject: "[URGENT] Card debit error" + body: + remember: "In accordance with your %{REFERENCE} payment schedule, a debit by card of %{AMOUNT} was scheduled on %{DATE}." + error: "Unfortunately, an error occurred and this card debit was unable to complete successfully." + action: "Please contact a manager as soon as possible to resolve the problem." notify_admin_payment_schedule_failed: subject: "[URGENT] Card debit failure" body: @@ -309,6 +321,16 @@ error: "Unfortunately, this card debit was unable to complete successfully." action_html: "Please check %{DASHBOARD} or contact a manager before 24 hours, otherwise your subscription may be interrupted." your_dashboard: "your dashboard" + notify_admin_payment_schedule_gateway_canceled: + subject: "[URGENT] Payment schedule canceled by the payment gateway" + body: + error: "The payment schedule %{REFERENCE} was canceled by the payment gateway (%{GATEWAY}). No further debits will be made on this payment mean." + action: "Please consult the payment schedule management interface and contact the member as soon as possible to resolve the problem." + notify_member_payment_schedule_gateway_canceled: + subject: "[URGENT] Payment schedule canceled by the payment gateway" + body: + error: "Your payment schedule %{REFERENCE} was canceled by the payment gateway. No further debits will be made on this payment mean." + action: "Please contact a manager as soon as possible to resolve the problem." notify_admin_payment_schedule_check_deadline: subject: "Payment deadline" body: From 9ea21c04a2edde11de13ae7232e1ac9fe3dfa6dd Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 15:49:42 +0100 Subject: [PATCH 10/30] New translations app.admin.en.yml (French) --- config/locales/app.admin.fr.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 4848e942d..c281c067f 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -389,9 +389,9 @@ fr: configure_extended_prices_button: extended_prices: "Prix étendus" no_extended_prices: "Aucun prix étendu pour l'instant" - extended_price_DURATION: "{DURATION} minutes" + extended_price_DURATION: "{DURATION} hours" extended_price_form: - duration: "Durée (minutes)" + duration: "Duration (hours)" amount: "Prix" pack_form: hours: "Heures" @@ -762,6 +762,13 @@ fr: reference: "Référence" customer: "Client" date: "Date" + update_payment_mean_modal: + title: "Update the payment mean" + update_info: "Please specify below the new payment mean for this payment schedule to continue." + select_payment_mean: "Select a new payment mean" + method_Transfer: "By bank transfer" + method_Check: "By check" + confirm_button: "Update" #management of users, labels, groups, and so on members: users_management: "Gestion des utilisateurs" From b996d062739b254ff2e220d3ab0a4fa2a1ae9fce Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 15:49:43 +0100 Subject: [PATCH 11/30] New translations en.yml (Zulu) --- config/locales/zu.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config/locales/zu.yml b/config/locales/zu.yml index 7411b4bfb..469e1dd81 100644 --- a/config/locales/zu.yml +++ b/config/locales/zu.yml @@ -367,10 +367,18 @@ zu: all_objects_sync: "crwdns21572:0crwdne21572:0" notify_user_when_payment_schedule_ready: your_schedule_is_ready_html: "crwdns21114:0%{REFERENCE}crwdnd21114:0%{AMOUNT}crwdnd21114:0%{SCHEDULE_ID}crwdne21114:0" + notify_admin_payment_schedule_error: + schedule_error: "crwdns22365:0%{DATE}crwdnd22365:0%{REFERENCE}crwdne22365:0" + notify_member_payment_schedule_error: + schedule_error: "crwdns22367:0%{DATE}crwdnd22367:0%{REFERENCE}crwdne22367:0" notify_admin_payment_schedule_failed: schedule_failed: "crwdns21116:0%{DATE}crwdnd21116:0%{REFERENCE}crwdne21116:0" notify_member_payment_schedule_failed: schedule_failed: "crwdns21118:0%{DATE}crwdnd21118:0%{REFERENCE}crwdne21118:0" + notify_admin_payment_schedule_gateway_canceled: + schedule_canceled: "crwdns22369:0%{REFERENCE}crwdne22369:0" + notify_member_payment_schedule_gateway_canceled: + schedule_canceled: "crwdns22371:0%{REFERENCE}crwdne22371:0" notify_admin_payment_schedule_check_deadline: schedule_deadline: "crwdns21120:0%{DATE}crwdnd21120:0%{REFERENCE}crwdne21120:0" notify_admin_payment_schedule_transfer_deadline: From ef86d4a620027208e263068e711c51b290251ec2 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 15:49:44 +0100 Subject: [PATCH 12/30] New translations en.yml (Spanish) --- config/locales/es.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config/locales/es.yml b/config/locales/es.yml index 6bd0198a9..65a5e39ba 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -367,10 +367,18 @@ es: all_objects_sync: "All data were successfully synchronized on Stripe." notify_user_when_payment_schedule_ready: your_schedule_is_ready_html: "Your payment schedule #%{REFERENCE}, of %{AMOUNT}, is ready. Click here to download." + notify_admin_payment_schedule_error: + schedule_error: "An error occurred for the card debit of the %{DATE} deadline, for schedule %{REFERENCE}" + notify_member_payment_schedule_error: + schedule_error: "An error occurred for the card debit of the %{DATE} deadline, for your schedule %{REFERENCE}" notify_admin_payment_schedule_failed: schedule_failed: "Failed card debit for the %{DATE} deadline, for schedule %{REFERENCE}" notify_member_payment_schedule_failed: schedule_failed: "Failed card debit for the %{DATE} deadline, for your schedule %{REFERENCE}" + notify_admin_payment_schedule_gateway_canceled: + schedule_canceled: "The payment schedule %{REFERENCE} was canceled by the gateway. An action is required." + notify_member_payment_schedule_gateway_canceled: + schedule_canceled: "Your payment schedule %{REFERENCE} was canceled by the gateway." notify_admin_payment_schedule_check_deadline: schedule_deadline: "You must cash the check for the %{DATE} deadline, for schedule %{REFERENCE}" notify_admin_payment_schedule_transfer_deadline: From 4590ed2e5ecd38c9345e84d3fe6b4077a567ff1b Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 15:49:46 +0100 Subject: [PATCH 13/30] New translations app.admin.en.yml (Spanish) --- config/locales/app.admin.es.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index 826233fda..813bfdacf 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -389,9 +389,9 @@ es: configure_extended_prices_button: extended_prices: "Extended prices" no_extended_prices: "No extended price for now" - extended_price_DURATION: "{DURATION} minutes" + extended_price_DURATION: "{DURATION} hours" extended_price_form: - duration: "Duration (minutes)" + duration: "Duration (hours)" amount: "Price" pack_form: hours: "Hours" @@ -762,6 +762,13 @@ es: reference: "Reference" customer: "Customer" date: "Date" + update_payment_mean_modal: + title: "Update the payment mean" + update_info: "Please specify below the new payment mean for this payment schedule to continue." + select_payment_mean: "Select a new payment mean" + method_Transfer: "By bank transfer" + method_Check: "By check" + confirm_button: "Update" #management of users, labels, groups, and so on members: users_management: "Gestión de usuarios" From c6fc00f30b434a31bdfb30edfcc37513c6e04831 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 15:49:47 +0100 Subject: [PATCH 14/30] New translations en.yml (German) --- config/locales/de.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config/locales/de.yml b/config/locales/de.yml index 48b702385..abad0363f 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -367,10 +367,18 @@ de: all_objects_sync: "Alle daten wurden erfolgreich auf Stripe synchronisiert." notify_user_when_payment_schedule_ready: your_schedule_is_ready_html: "Your payment schedule #%{REFERENCE}, of %{AMOUNT}, is ready. Click here to download." + notify_admin_payment_schedule_error: + schedule_error: "An error occurred for the card debit of the %{DATE} deadline, for schedule %{REFERENCE}" + notify_member_payment_schedule_error: + schedule_error: "An error occurred for the card debit of the %{DATE} deadline, for your schedule %{REFERENCE}" notify_admin_payment_schedule_failed: schedule_failed: "Failed card debit for the %{DATE} deadline, for schedule %{REFERENCE}" notify_member_payment_schedule_failed: schedule_failed: "Failed card debit for the %{DATE} deadline, for your schedule %{REFERENCE}" + notify_admin_payment_schedule_gateway_canceled: + schedule_canceled: "The payment schedule %{REFERENCE} was canceled by the gateway. An action is required." + notify_member_payment_schedule_gateway_canceled: + schedule_canceled: "Your payment schedule %{REFERENCE} was canceled by the gateway." notify_admin_payment_schedule_check_deadline: schedule_deadline: "You must cash the check for the %{DATE} deadline, for schedule %{REFERENCE}" notify_admin_payment_schedule_transfer_deadline: From a3518ef88d6f883da88dd462cd8524fc5bacb16c Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 15:49:48 +0100 Subject: [PATCH 15/30] New translations app.admin.en.yml (German) --- config/locales/app.admin.de.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/config/locales/app.admin.de.yml b/config/locales/app.admin.de.yml index dd2aa4e0b..399ec8037 100644 --- a/config/locales/app.admin.de.yml +++ b/config/locales/app.admin.de.yml @@ -389,9 +389,9 @@ de: configure_extended_prices_button: extended_prices: "Extended prices" no_extended_prices: "No extended price for now" - extended_price_DURATION: "{DURATION} minutes" + extended_price_DURATION: "{DURATION} hours" extended_price_form: - duration: "Duration (minutes)" + duration: "Duration (hours)" amount: "Price" pack_form: hours: "Hours" @@ -762,6 +762,13 @@ de: reference: "Referenz" customer: "Kunde" date: "Datum" + update_payment_mean_modal: + title: "Update the payment mean" + update_info: "Please specify below the new payment mean for this payment schedule to continue." + select_payment_mean: "Select a new payment mean" + method_Transfer: "By bank transfer" + method_Check: "By check" + confirm_button: "Update" #management of users, labels, groups, and so on members: users_management: "Benutzer-Verwaltung" From 112a1d330177201ece636f6e4dc0a7135f9b60a3 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 15:49:49 +0100 Subject: [PATCH 16/30] New translations en.yml (Norwegian) --- config/locales/no.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config/locales/no.yml b/config/locales/no.yml index aec270d5b..eb75f1b4b 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -367,10 +367,18 @@ all_objects_sync: "All data were successfully synchronized on Stripe." notify_user_when_payment_schedule_ready: your_schedule_is_ready_html: "Your payment schedule #%{REFERENCE}, of %{AMOUNT}, is ready. Click here to download." + notify_admin_payment_schedule_error: + schedule_error: "An error occurred for the card debit of the %{DATE} deadline, for schedule %{REFERENCE}" + notify_member_payment_schedule_error: + schedule_error: "An error occurred for the card debit of the %{DATE} deadline, for your schedule %{REFERENCE}" notify_admin_payment_schedule_failed: schedule_failed: "Failed card debit for the %{DATE} deadline, for schedule %{REFERENCE}" notify_member_payment_schedule_failed: schedule_failed: "Failed card debit for the %{DATE} deadline, for your schedule %{REFERENCE}" + notify_admin_payment_schedule_gateway_canceled: + schedule_canceled: "The payment schedule %{REFERENCE} was canceled by the gateway. An action is required." + notify_member_payment_schedule_gateway_canceled: + schedule_canceled: "Your payment schedule %{REFERENCE} was canceled by the gateway." notify_admin_payment_schedule_check_deadline: schedule_deadline: "You must cash the check for the %{DATE} deadline, for schedule %{REFERENCE}" notify_admin_payment_schedule_transfer_deadline: From 8d36a741c839c766f58a9fe6c52c71f418585a7d Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 15:49:50 +0100 Subject: [PATCH 17/30] New translations app.admin.en.yml (Norwegian) --- config/locales/app.admin.no.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/config/locales/app.admin.no.yml b/config/locales/app.admin.no.yml index 66861b1af..9eec2bc77 100644 --- a/config/locales/app.admin.no.yml +++ b/config/locales/app.admin.no.yml @@ -389,9 +389,9 @@ configure_extended_prices_button: extended_prices: "Extended prices" no_extended_prices: "No extended price for now" - extended_price_DURATION: "{DURATION} minutes" + extended_price_DURATION: "{DURATION} hours" extended_price_form: - duration: "Duration (minutes)" + duration: "Duration (hours)" amount: "Price" pack_form: hours: "Timer" @@ -762,6 +762,13 @@ reference: "Referanse" customer: "Kunde" date: "Dato" + update_payment_mean_modal: + title: "Update the payment mean" + update_info: "Please specify below the new payment mean for this payment schedule to continue." + select_payment_mean: "Select a new payment mean" + method_Transfer: "By bank transfer" + method_Check: "By check" + confirm_button: "Update" #management of users, labels, groups, and so on members: users_management: "Brukeradministrasjon" From f1d48656767dd436a8af857b39b269744609d4de Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 15:49:51 +0100 Subject: [PATCH 18/30] New translations en.yml (Portuguese) --- config/locales/pt.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config/locales/pt.yml b/config/locales/pt.yml index c77c5bc5c..db5f4411d 100755 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -367,10 +367,18 @@ pt: all_objects_sync: "Todos os dados foram sincronizados com sucesso no Stripe." notify_user_when_payment_schedule_ready: your_schedule_is_ready_html: "Sua fatura #%{REFERENCE}, de %{AMOUNT}, está pronta. Clique aqui para fazer o download." + notify_admin_payment_schedule_error: + schedule_error: "An error occurred for the card debit of the %{DATE} deadline, for schedule %{REFERENCE}" + notify_member_payment_schedule_error: + schedule_error: "An error occurred for the card debit of the %{DATE} deadline, for your schedule %{REFERENCE}" notify_admin_payment_schedule_failed: schedule_failed: "Falha no débito para a data limite de %{DATE} para agendamento %{REFERENCE}" notify_member_payment_schedule_failed: schedule_failed: "Falha no débito para o período %{DATE} de agendamento %{REFERENCE}" + notify_admin_payment_schedule_gateway_canceled: + schedule_canceled: "The payment schedule %{REFERENCE} was canceled by the gateway. An action is required." + notify_member_payment_schedule_gateway_canceled: + schedule_canceled: "Your payment schedule %{REFERENCE} was canceled by the gateway." notify_admin_payment_schedule_check_deadline: schedule_deadline: "Você deve realizar a verificação para a data limite de %{DATE} para agendar %{REFERENCE}" notify_admin_payment_schedule_transfer_deadline: From 432ee5871ebcbf16a3bfa63a4002b4fd30dc697a Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 15:49:53 +0100 Subject: [PATCH 19/30] New translations app.admin.en.yml (Portuguese) --- config/locales/app.admin.pt.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index 7cdfa6288..e4c40ae9e 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -389,9 +389,9 @@ pt: configure_extended_prices_button: extended_prices: "Extended prices" no_extended_prices: "No extended price for now" - extended_price_DURATION: "{DURATION} minutes" + extended_price_DURATION: "{DURATION} hours" extended_price_form: - duration: "Duration (minutes)" + duration: "Duration (hours)" amount: "Price" pack_form: hours: "Horas" @@ -762,6 +762,13 @@ pt: reference: "Referências" customer: "Cliente" date: "Data" + update_payment_mean_modal: + title: "Update the payment mean" + update_info: "Please specify below the new payment mean for this payment schedule to continue." + select_payment_mean: "Select a new payment mean" + method_Transfer: "By bank transfer" + method_Check: "By check" + confirm_button: "Update" #management of users, labels, groups, and so on members: users_management: "Gerenciamento de usuários" From 3313badc7d88d0a044e49f8a7abf9a7a996c8b02 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 15:49:54 +0100 Subject: [PATCH 20/30] New translations app.admin.en.yml (Zulu) --- config/locales/app.admin.zu.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/config/locales/app.admin.zu.yml b/config/locales/app.admin.zu.yml index 8c0d3dbb7..d1550645e 100644 --- a/config/locales/app.admin.zu.yml +++ b/config/locales/app.admin.zu.yml @@ -389,9 +389,9 @@ zu: configure_extended_prices_button: extended_prices: "crwdns22185:0crwdne22185:0" no_extended_prices: "crwdns22187:0crwdne22187:0" - extended_price_DURATION: "crwdns22189:0{DURATION}crwdne22189:0" + extended_price_DURATION: "crwdns22349:0{DURATION}crwdne22349:0" extended_price_form: - duration: "crwdns22191:0crwdne22191:0" + duration: "crwdns22351:0crwdne22351:0" amount: "crwdns22193:0crwdne22193:0" pack_form: hours: "crwdns21958:0crwdne21958:0" @@ -762,6 +762,13 @@ zu: reference: "crwdns21078:0crwdne21078:0" customer: "crwdns21080:0crwdne21080:0" date: "crwdns21082:0crwdne21082:0" + update_payment_mean_modal: + title: "crwdns22353:0crwdne22353:0" + update_info: "crwdns22355:0crwdne22355:0" + select_payment_mean: "crwdns22357:0crwdne22357:0" + method_Transfer: "crwdns22359:0crwdne22359:0" + method_Check: "crwdns22361:0crwdne22361:0" + confirm_button: "crwdns22363:0crwdne22363:0" #management of users, labels, groups, and so on members: users_management: "crwdns7735:0crwdne7735:0" From 98d032abf9e8ee8dc7e704fb21aeaae5c02743b0 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 15:49:55 +0100 Subject: [PATCH 21/30] New translations mails.en.yml (German) --- config/locales/mails.de.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/config/locales/mails.de.yml b/config/locales/mails.de.yml index 8f8279b9c..cb5b56cb8 100644 --- a/config/locales/mails.de.yml +++ b/config/locales/mails.de.yml @@ -296,6 +296,18 @@ de: please_find_attached_html: "Please find attached your payment schedule, issued on {DATE}, with an amount of {AMOUNT} concerning your {TYPE, select, Reservation{reservation} other{subscription}}." #messageFormat interpolation schedule_in_your_dashboard_html: "You can find this payment schedule at any time from %{DASHBOARD} on the Fab Lab's website." your_dashboard: "your dashboard" + notify_admin_payment_schedule_error: + subject: "[URGENT] Card debit error" + body: + remember: "In accordance with the %{REFERENCE} payment schedule, a debit by card of %{AMOUNT} was scheduled on %{DATE}." + error: "Unfortunately, an error occurred and this card debit was unable to complete successfully." + action: "Please then consult the %{GATEWAY} dashboard and contact the member as soon as possible to resolve the problem." + notify_member_payment_schedule_error: + subject: "[URGENT] Card debit error" + body: + remember: "In accordance with your %{REFERENCE} payment schedule, a debit by card of %{AMOUNT} was scheduled on %{DATE}." + error: "Unfortunately, an error occurred and this card debit was unable to complete successfully." + action: "Please contact a manager as soon as possible to resolve the problem." notify_admin_payment_schedule_failed: subject: "[URGENT] Card debit failure" body: @@ -309,6 +321,16 @@ de: error: "Unfortunately, this card debit was unable to complete successfully." action_html: "Please check %{DASHBOARD} or contact a manager before 24 hours, otherwise your subscription may be interrupted." your_dashboard: "your dashboard" + notify_admin_payment_schedule_gateway_canceled: + subject: "[URGENT] Payment schedule canceled by the payment gateway" + body: + error: "The payment schedule %{REFERENCE} was canceled by the payment gateway (%{GATEWAY}). No further debits will be made on this payment mean." + action: "Please consult the payment schedule management interface and contact the member as soon as possible to resolve the problem." + notify_member_payment_schedule_gateway_canceled: + subject: "[URGENT] Payment schedule canceled by the payment gateway" + body: + error: "Your payment schedule %{REFERENCE} was canceled by the payment gateway. No further debits will be made on this payment mean." + action: "Please contact a manager as soon as possible to resolve the problem." notify_admin_payment_schedule_check_deadline: subject: "Payment deadline" body: From 7ededdd157f6e0f7e86549eea83915361c9a6899 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 15:50:02 +0100 Subject: [PATCH 22/30] New translations mails.en.yml (French) --- config/locales/mails.fr.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/config/locales/mails.fr.yml b/config/locales/mails.fr.yml index 01bf05b16..03ededbbe 100644 --- a/config/locales/mails.fr.yml +++ b/config/locales/mails.fr.yml @@ -296,6 +296,18 @@ fr: please_find_attached_html: "Vous trouverez en pièce jointe votre échéancier de paiement du {DATE}, d'un montant de {AMOUNT} concernant votre {TYPE, select, Reservation{réservation} other{abonnement}}." #messageFormat interpolation schedule_in_your_dashboard_html: "Vous pouvez à tout moment retrouver votre échéancier dans %{DASHBOARD} sur le site du Fab Lab." your_dashboard: "votre tableau de bord" + notify_admin_payment_schedule_error: + subject: "[URGENT] Card debit error" + body: + remember: "In accordance with the %{REFERENCE} payment schedule, a debit by card of %{AMOUNT} was scheduled on %{DATE}." + error: "Unfortunately, an error occurred and this card debit was unable to complete successfully." + action: "Please then consult the %{GATEWAY} dashboard and contact the member as soon as possible to resolve the problem." + notify_member_payment_schedule_error: + subject: "[URGENT] Card debit error" + body: + remember: "In accordance with your %{REFERENCE} payment schedule, a debit by card of %{AMOUNT} was scheduled on %{DATE}." + error: "Unfortunately, an error occurred and this card debit was unable to complete successfully." + action: "Please contact a manager as soon as possible to resolve the problem." notify_admin_payment_schedule_failed: subject: "[URGENT] Échec du prélèvement par carte" body: @@ -309,6 +321,16 @@ fr: error: "Malheureusement, ce prélèvement n'a pas pu être effectué correctement." action_html: "Veuillez vous rendre dans %{DASHBOARD} ou prendre contact avec un gestionnaire sous 24 heures, faute de quoi votre abonnement risque d'être interrompu." your_dashboard: "votre tableau de bord" + notify_admin_payment_schedule_gateway_canceled: + subject: "[URGENT] Payment schedule canceled by the payment gateway" + body: + error: "The payment schedule %{REFERENCE} was canceled by the payment gateway (%{GATEWAY}). No further debits will be made on this payment mean." + action: "Please consult the payment schedule management interface and contact the member as soon as possible to resolve the problem." + notify_member_payment_schedule_gateway_canceled: + subject: "[URGENT] Payment schedule canceled by the payment gateway" + body: + error: "Your payment schedule %{REFERENCE} was canceled by the payment gateway. No further debits will be made on this payment mean." + action: "Please contact a manager as soon as possible to resolve the problem." notify_admin_payment_schedule_check_deadline: subject: "Échéance d'encaissement" body: From 9f1230098ed72f1ee245c6c183535d42c1ffe37d Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 15:50:03 +0100 Subject: [PATCH 23/30] New translations mails.en.yml (Spanish) --- config/locales/mails.es.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/config/locales/mails.es.yml b/config/locales/mails.es.yml index 42e144a70..f0d05d3f7 100644 --- a/config/locales/mails.es.yml +++ b/config/locales/mails.es.yml @@ -296,6 +296,18 @@ es: please_find_attached_html: "Please find attached your payment schedule, issued on {DATE}, with an amount of {AMOUNT} concerning your {TYPE, select, Reservation{reservation} other{subscription}}." #messageFormat interpolation schedule_in_your_dashboard_html: "You can find this payment schedule at any time from %{DASHBOARD} on the Fab Lab's website." your_dashboard: "your dashboard" + notify_admin_payment_schedule_error: + subject: "[URGENT] Card debit error" + body: + remember: "In accordance with the %{REFERENCE} payment schedule, a debit by card of %{AMOUNT} was scheduled on %{DATE}." + error: "Unfortunately, an error occurred and this card debit was unable to complete successfully." + action: "Please then consult the %{GATEWAY} dashboard and contact the member as soon as possible to resolve the problem." + notify_member_payment_schedule_error: + subject: "[URGENT] Card debit error" + body: + remember: "In accordance with your %{REFERENCE} payment schedule, a debit by card of %{AMOUNT} was scheduled on %{DATE}." + error: "Unfortunately, an error occurred and this card debit was unable to complete successfully." + action: "Please contact a manager as soon as possible to resolve the problem." notify_admin_payment_schedule_failed: subject: "[URGENT] Card debit failure" body: @@ -309,6 +321,16 @@ es: error: "Unfortunately, this card debit was unable to complete successfully." action_html: "Please check %{DASHBOARD} or contact a manager before 24 hours, otherwise your subscription may be interrupted." your_dashboard: "your dashboard" + notify_admin_payment_schedule_gateway_canceled: + subject: "[URGENT] Payment schedule canceled by the payment gateway" + body: + error: "The payment schedule %{REFERENCE} was canceled by the payment gateway (%{GATEWAY}). No further debits will be made on this payment mean." + action: "Please consult the payment schedule management interface and contact the member as soon as possible to resolve the problem." + notify_member_payment_schedule_gateway_canceled: + subject: "[URGENT] Payment schedule canceled by the payment gateway" + body: + error: "Your payment schedule %{REFERENCE} was canceled by the payment gateway. No further debits will be made on this payment mean." + action: "Please contact a manager as soon as possible to resolve the problem." notify_admin_payment_schedule_check_deadline: subject: "Payment deadline" body: From 337860e75003bb7c289a05cef1842def6ecc0192 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 15:50:05 +0100 Subject: [PATCH 24/30] New translations app.shared.en.yml (Zulu) --- config/locales/app.shared.zu.yml | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/config/locales/app.shared.zu.yml b/config/locales/app.shared.zu.yml index 6e283a176..7cf22640d 100644 --- a/config/locales/app.shared.zu.yml +++ b/config/locales/app.shared.zu.yml @@ -252,7 +252,7 @@ zu: mappings: "crwdns9775:0crwdne9775:0" #edition/creation form of an OAuth2 authentication provider oauth2: - common_url: "crwdns9777:0crwdne9777:0" + common_url: "crwdns22315:0crwdne22315:0" common_url_is_required: "crwdns9779:0crwdne9779:0" provided_url_is_not_a_valid_url: "crwdns9781:0crwdne9781:0" authorization_endpoint: "crwdns9783:0crwdne9783:0" @@ -274,6 +274,7 @@ zu: api_endpoint_url: "crwdns9815:0crwdne9815:0" api_type: "crwdns9817:0crwdne9817:0" api_fields: "crwdns9819:0crwdne9819:0" + api_field_help: "crwdns22317:0crwdne22317:0" #machine/training slot modification modal confirm_modify_slot_modal: change_the_slot: "crwdns9821:0crwdne9821:0" @@ -493,23 +494,26 @@ zu: state_requires_action: "crwdns21014:0crwdne21014:0" state_paid: "crwdns21016:0crwdne21016:0" state_error: "crwdns21018:0crwdne21018:0" + state_gateway_canceled: "crwdns22319:0crwdne22319:0" state_canceled: "crwdns21020:0crwdne21020:0" method_card: "crwdns21500:0crwdne21500:0" method_check: "crwdns21024:0crwdne21024:0" method_transfer: "crwdns22297:0crwdne22297:0" - confirm_payment: "crwdns21026:0crwdne21026:0" - solve: "crwdns21028:0crwdne21028:0" - update_card: "crwdns21030:0crwdne21030:0" - confirm_check_cashing: "crwdns21032:0crwdne21032:0" - confirm_check_cashing_body: "crwdns21034:0{AMOUNT}crwdnd21034:0{DATE}crwdne21034:0" - confirm_bank_transfer: "crwdns22299:0crwdne22299:0" - confirm_bank_transfer_body: "crwdns22301:0{AMOUNT}crwdnd22301:0{DATE}crwdne22301:0" - confirm_button: "crwdns21036:0crwdne21036:0" - resolve_action: "crwdns21038:0crwdne21038:0" - ok_button: "crwdns21040:0crwdne21040:0" - cancel_subscription: "crwdns21044:0crwdne21044:0" - confirm_cancel_subscription: "crwdns21046:0crwdne21046:0" - please_ask_reception: "crwdns21048:0crwdne21048:0" + payment_schedule_item_actions: + download: "crwdns22321:0crwdne22321:0" + cancel_subscription: "crwdns22323:0crwdne22323:0" + confirm_payment: "crwdns22325:0crwdne22325:0" + confirm_check: "crwdns22327:0crwdne22327:0" + resolve_action: "crwdns22329:0crwdne22329:0" + update_card: "crwdns22331:0crwdne22331:0" + update_payment_mean: "crwdns22333:0crwdne22333:0" + please_ask_reception: "crwdns22335:0crwdne22335:0" + confirm_button: "crwdns22337:0crwdne22337:0" + confirm_check_cashing: "crwdns22339:0crwdne22339:0" + confirm_check_cashing_body: "crwdns22341:0{AMOUNT}crwdnd22341:0{DATE}crwdne22341:0" + confirm_bank_transfer: "crwdns22343:0crwdne22343:0" + confirm_bank_transfer_body: "crwdns22345:0{AMOUNT}crwdnd22345:0{DATE}crwdne22345:0" + confirm_cancel_subscription: "crwdns22347:0crwdne22347:0" payment_modal: online_payment_disabled: "crwdns21502:0crwdne21502:0" unexpected_error: "crwdns21504:0crwdne21504:0" From 9c277806f657b3e146e89ab85fdc72deaeda2b1a Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 15:55:33 +0100 Subject: [PATCH 25/30] New translations app.shared.en.yml (French) --- config/locales/app.shared.fr.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml index 2e5242557..2c4a5919e 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -252,7 +252,7 @@ fr: mappings: "Correspondances" #edition/creation form of an OAuth2 authentication provider oauth2: - common_url: "Server root URL" + common_url: "URL racine du serveur" common_url_is_required: "L'URL commune est requise." provided_url_is_not_a_valid_url: "L'URL fournie n'est pas une URL valide." authorization_endpoint: "Point d'accès pour l'autorisation" @@ -274,7 +274,7 @@ fr: api_endpoint_url: "Point d'accès/URL de l'API" api_type: "Type d'API" api_fields: "Champ de l'API" - api_field_help: "JsonPath syntax is supported.\n If many fields are selected, the first one will be used.\n Example: $.data[*].name" + api_field_help: "La syntaxe JsonPath est prise en charge.\n Si plusieurs champs sont sélectionnés, le premier sera utilisé.\n Exemple : $.data[*].name" #machine/training slot modification modal confirm_modify_slot_modal: change_the_slot: "Modifier le créneau" @@ -494,21 +494,21 @@ fr: state_requires_action: "Action requise" state_paid: "Payée" state_error: "Erreur" - state_gateway_canceled: "Canceled by the payment gateway" + state_gateway_canceled: "Annulé par la passerelle de paiement" state_canceled: "Annulée" method_card: "par carte" method_check: "par chèque" method_transfer: "par prélèvement" payment_schedule_item_actions: - download: "Download" - cancel_subscription: "Cancel the subscription" - confirm_payment: "Confirm payment" - confirm_check: "Confirm cashing" - resolve_action: "Resolve the action" - update_card: "Update the card" - update_payment_mean: "Update the payment mean" - please_ask_reception: "For any questions, please contact the FabLab's reception." - confirm_button: "Confirm" + download: "Télécharger" + cancel_subscription: "Annuler l'abonnement" + confirm_payment: "Confirmer le paiement" + confirm_check: "Confirmer l'encaissement" + resolve_action: "Résoudre l'action" + update_card: "Mettre à jour la carte" + update_payment_mean: "Mettre à jour le moyen de paiement" + please_ask_reception: "Pour toute question, merci de contacter l'accueil du FabLab." + confirm_button: "Confirmer" confirm_check_cashing: "Confirm the cashing of the check" confirm_check_cashing_body: "You must cash a check of {AMOUNT} for the deadline of {DATE}. By confirming the cashing of the check, an invoice will be generated for this due date." confirm_bank_transfer: "Confirm the bank transfer" From f75f2b53567f784de7c27178d82ee8ab7417e824 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 15:55:36 +0100 Subject: [PATCH 26/30] New translations app.admin.en.yml (French) --- config/locales/app.admin.fr.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index c281c067f..37ca82754 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -389,9 +389,9 @@ fr: configure_extended_prices_button: extended_prices: "Prix étendus" no_extended_prices: "Aucun prix étendu pour l'instant" - extended_price_DURATION: "{DURATION} hours" + extended_price_DURATION: "{DURATION} heures" extended_price_form: - duration: "Duration (hours)" + duration: "Durée (heures)" amount: "Prix" pack_form: hours: "Heures" @@ -763,12 +763,12 @@ fr: customer: "Client" date: "Date" update_payment_mean_modal: - title: "Update the payment mean" - update_info: "Please specify below the new payment mean for this payment schedule to continue." - select_payment_mean: "Select a new payment mean" - method_Transfer: "By bank transfer" - method_Check: "By check" - confirm_button: "Update" + title: "Mettre à jour le moyen de paiement" + update_info: "Veuillez indiquer ci-dessous le nouveau moyen de paiement pour que cet échéancier de paiement puisse continuer." + select_payment_mean: "Sélectionner un nouveau moyen de paiement" + method_Transfer: "Par virement bancaire" + method_Check: "Par chèques" + confirm_button: "Mettre à jour" #management of users, labels, groups, and so on members: users_management: "Gestion des utilisateurs" From ef2c0f677468ca3e47ff61cd1eee3cb30ad4acfb Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 16:01:45 +0100 Subject: [PATCH 27/30] New translations en.yml (French) --- config/locales/fr.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/locales/fr.yml b/config/locales/fr.yml index f6ffa92dc..2d372dc51 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -368,17 +368,17 @@ fr: notify_user_when_payment_schedule_ready: your_schedule_is_ready_html: "Votre échéancier n°%{REFERENCE}, d'un montant de %{AMOUNT}, est prêt. Cliquez ici pour le télécharger." notify_admin_payment_schedule_error: - schedule_error: "An error occurred for the card debit of the %{DATE} deadline, for schedule %{REFERENCE}" + schedule_error: "Une erreur est survenue pour le prélèvement par carte du %{DATE}, concernant l'échéancier %{REFERENCE}" notify_member_payment_schedule_error: - schedule_error: "An error occurred for the card debit of the %{DATE} deadline, for your schedule %{REFERENCE}" + schedule_error: "Une erreur est survenue pour le prélèvement par carte du %{DATE}, concernant votre échéancier %{REFERENCE}" notify_admin_payment_schedule_failed: schedule_failed: "Échec du prélèvement par carte de l'échéance du %{DATE}, pour l'échéancier %{REFERENCE}" notify_member_payment_schedule_failed: schedule_failed: "Échec du prélèvement par carte de l'échéance du %{DATE}, pour votre échéancier %{REFERENCE}" notify_admin_payment_schedule_gateway_canceled: - schedule_canceled: "The payment schedule %{REFERENCE} was canceled by the gateway. An action is required." + schedule_canceled: "L'échéancier de paiement %{REFERENCE} a été annulé par la passerelle. Une action est requise." notify_member_payment_schedule_gateway_canceled: - schedule_canceled: "Your payment schedule %{REFERENCE} was canceled by the gateway." + schedule_canceled: "Votre échéancier de paiement %{REFERENCE} a été annulé par la passerelle." notify_admin_payment_schedule_check_deadline: schedule_deadline: "Vous devez encaisser le chèque de l'échéance du %{DATE}, pour l'échéancier %{REFERENCE}" notify_admin_payment_schedule_transfer_deadline: From 95759943a590f25e06310d185229acc9fb396cd9 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 16:01:46 +0100 Subject: [PATCH 28/30] New translations mails.en.yml (French) --- config/locales/mails.fr.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/config/locales/mails.fr.yml b/config/locales/mails.fr.yml index 03ededbbe..4655288c0 100644 --- a/config/locales/mails.fr.yml +++ b/config/locales/mails.fr.yml @@ -297,17 +297,17 @@ fr: schedule_in_your_dashboard_html: "Vous pouvez à tout moment retrouver votre échéancier dans %{DASHBOARD} sur le site du Fab Lab." your_dashboard: "votre tableau de bord" notify_admin_payment_schedule_error: - subject: "[URGENT] Card debit error" + subject: "[URGENT] Erreur lors du prélèvement par carte" body: - remember: "In accordance with the %{REFERENCE} payment schedule, a debit by card of %{AMOUNT} was scheduled on %{DATE}." - error: "Unfortunately, an error occurred and this card debit was unable to complete successfully." - action: "Please then consult the %{GATEWAY} dashboard and contact the member as soon as possible to resolve the problem." + remember: "Conformément à l'échéancier de paiement %{REFERENCE}, un prélèvement par carte de %{AMOUNT} était prévu le %{DATE}." + error: "Malheureusement, une erreur s'est prouite et ce prélèvement n'a pas pu être effectué correctement." + action: "Veuillez ensuite consulter le tableau de bord de %{GATEWAY} et contacter le membre dès que possible pour résoudre le problème." notify_member_payment_schedule_error: - subject: "[URGENT] Card debit error" + subject: "[URGENT] Erreur lors du prélèvement par carte" body: - remember: "In accordance with your %{REFERENCE} payment schedule, a debit by card of %{AMOUNT} was scheduled on %{DATE}." - error: "Unfortunately, an error occurred and this card debit was unable to complete successfully." - action: "Please contact a manager as soon as possible to resolve the problem." + remember: "Conformément à votre échéancier de paiement %{REFERENCE}, un prélèvement par carte de %{AMOUNT} était prévu le %{DATE}." + error: "Malheureusement, une erreur s'est prouite et ce prélèvement n'a pas pu être effectué correctement." + action: "Veuillez contacter un responsable dès que possible pour résoudre le problème." notify_admin_payment_schedule_failed: subject: "[URGENT] Échec du prélèvement par carte" body: @@ -322,12 +322,12 @@ fr: action_html: "Veuillez vous rendre dans %{DASHBOARD} ou prendre contact avec un gestionnaire sous 24 heures, faute de quoi votre abonnement risque d'être interrompu." your_dashboard: "votre tableau de bord" notify_admin_payment_schedule_gateway_canceled: - subject: "[URGENT] Payment schedule canceled by the payment gateway" + subject: "[URGENT] Échéancier de paiement annulé par la passerelle de paiement" body: - error: "The payment schedule %{REFERENCE} was canceled by the payment gateway (%{GATEWAY}). No further debits will be made on this payment mean." - action: "Please consult the payment schedule management interface and contact the member as soon as possible to resolve the problem." + error: "L'échéancier de paiement %{REFERENCE} a été annulé par la passerelle de paiement (%{GATEWAY}). Aucun autre prélèvement ne sera effectué sur ce moyen de paiement." + action: "Veuillez consulter l'interface de gestion des échéanciers de paiement et contacter le membre dès que possible pour résoudre le problème." notify_member_payment_schedule_gateway_canceled: - subject: "[URGENT] Payment schedule canceled by the payment gateway" + subject: "[URGENT] Échéancier de paiement annulé par la passerelle de paiement" body: error: "Your payment schedule %{REFERENCE} was canceled by the payment gateway. No further debits will be made on this payment mean." action: "Please contact a manager as soon as possible to resolve the problem." From e719908090a0f024f31863b7238c4ff4bd447ead Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 16:01:47 +0100 Subject: [PATCH 29/30] New translations app.shared.en.yml (French) --- config/locales/app.shared.fr.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml index 2c4a5919e..4aa867e36 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -508,12 +508,12 @@ fr: update_card: "Mettre à jour la carte" update_payment_mean: "Mettre à jour le moyen de paiement" please_ask_reception: "Pour toute question, merci de contacter l'accueil du FabLab." - confirm_button: "Confirmer" - confirm_check_cashing: "Confirm the cashing of the check" - confirm_check_cashing_body: "You must cash a check of {AMOUNT} for the deadline of {DATE}. By confirming the cashing of the check, an invoice will be generated for this due date." - confirm_bank_transfer: "Confirm the bank transfer" - confirm_bank_transfer_body: "You must confirm the receipt of {AMOUNT} for the deadline of {DATE}. By confirming the bank transfer, an invoice will be generated for this due date." - confirm_cancel_subscription: "You're about to cancel this payment schedule and the related subscription. Are you sure?" + confirm_button: "Valider" + confirm_check_cashing: "Confirmer l'encaissement du chèque" + confirm_check_cashing_body: "Vous devez encaisser un chèque de {AMOUNT} pour l'échéance du {DATE}. En confirmant l'encaissement du chèque, une facture sera générée pour cette échéance." + confirm_bank_transfer: "Confirmer le virement bancaire" + confirm_bank_transfer_body: "Vous devez confirmer l'encaissement de {AMOUNT} pour l'échéance du {DATE}. En confirmant le virement bancaire, une facture sera générée pour cette date d'échéance." + confirm_cancel_subscription: "Vous êtes sur le point d'annuler cet échéancier de paiement ainsi que l'abonnement lié. Êtes-vous sur ?" payment_modal: online_payment_disabled: "Le paiement par carte bancaire n'est pas disponible. Merci de contacter directement l'accueil du FabLab." unexpected_error: "Une erreur est survenue. Merci de rapporter cet incident à l'équipe de Fab-Manager." From 6a8e6bdd4d9d1c64c1871c3a10147df5ecfd1fc9 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 17 Jan 2022 16:02:58 +0100 Subject: [PATCH 30/30] New translations mails.en.yml (French) --- config/locales/mails.fr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/mails.fr.yml b/config/locales/mails.fr.yml index 4655288c0..3de801a1d 100644 --- a/config/locales/mails.fr.yml +++ b/config/locales/mails.fr.yml @@ -329,8 +329,8 @@ fr: notify_member_payment_schedule_gateway_canceled: subject: "[URGENT] Échéancier de paiement annulé par la passerelle de paiement" body: - error: "Your payment schedule %{REFERENCE} was canceled by the payment gateway. No further debits will be made on this payment mean." - action: "Please contact a manager as soon as possible to resolve the problem." + error: "Votre échéancier de paiement %{REFERENCE} a été annulé par la passerelle de paiement. Aucun autre prélèvement ne sera effectué sur ce moyen de paiement." + action: "Veuillez contacter un responsable dès que possible pour résoudre le problème." notify_admin_payment_schedule_check_deadline: subject: "Échéance d'encaissement" body: