From e9b56c66d30a8b81ac66228345e3a88f66ea32ae Mon Sep 17 00:00:00 2001 From: Jumana Bahrainwala Date: Fri, 13 Dec 2024 15:22:55 +0000 Subject: [PATCH 01/11] Fix the translations --- app/translations/csv/fr.csv | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/translations/csv/fr.csv b/app/translations/csv/fr.csv index 5c61bbcea..0fa0cb842 100644 --- a/app/translations/csv/fr.csv +++ b/app/translations/csv/fr.csv @@ -2029,6 +2029,9 @@ "Visit usage report","Consulter le rapport d’utilisation" "Month by month totals","Totaux mensuels" "email messages","courriels" -"Sending paused until 7pm ET. You can schedule more messages to send later.","FR: Sending paused until 7pm ET. You can schedule more messages to send later." -"Sending paused until annual limit resets","FR: Sending paused until annual limit resets" -"These messages exceed the annual limit","FR: These messages exceed the annual limit" \ No newline at end of file +"Sending paused until 7pm ET. You can schedule more messages to send later.","Envois suspendus jusqu’à 19 h HE. Vous pouvez programmer l’envoi de messages supplémentaires pour plus tard." +"Sending paused until annual limit resets","Envois suspendus jusqu’à la réinitialisation de la limite annuelle" +"These messages exceed the annual limit","Votre limite annuelle ne vous permet pas d’envoyer ces messages." +"To send some of these messages now, edit the spreadsheet to {} recipients maximum","Pour envoyer certains de ces courriels maintenant, modifiez la feuille de calcul pour n’inclure que {} destinataires au maximum." +"{} can only send {} more {} until annual limit resets","{} ne peut envoyer que {} {} d'ici la réinitialisation de la limite annuelle" +"To send to recipients you removed, wait until April 1, {} or contact them some other way.","Pour envoyer des messages aux destinataires, attendez le 1er avril {} ou optez pour une autre méthode de contact." \ No newline at end of file From b0a7e203383061968c6176eceb9a9f285209a469 Mon Sep 17 00:00:00 2001 From: William B <7444334+whabanks@users.noreply.github.com> Date: Fri, 13 Dec 2024 12:33:35 -0400 Subject: [PATCH 02/11] Added missing translation Added missing translation for provider response: "Phone is currently unreachable/unavailable" --- app/translations/csv/fr.csv | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/translations/csv/fr.csv b/app/translations/csv/fr.csv index 0fa0cb842..eed56abf3 100644 --- a/app/translations/csv/fr.csv +++ b/app/translations/csv/fr.csv @@ -26,6 +26,7 @@ "Message has been accepted by phone","Le numéro de téléphone a accepté le message" "Phone number not accepting messages right now","Le numéro de téléphone n’accepte pas de messages à l’heure actuelle" "Phone carrier is currently unreachable/unavailable","Le fournisseur téléphonique ne peut pas être rejoint ou est indisponible" +"Phone is currently unreachable/unavailable","Le téléphone ne peut pas être joint ou est indisponible" "Sent","Envoyé" "Email address","Adresse courriel" "email address","adresse courriel" @@ -2034,4 +2035,4 @@ "These messages exceed the annual limit","Votre limite annuelle ne vous permet pas d’envoyer ces messages." "To send some of these messages now, edit the spreadsheet to {} recipients maximum","Pour envoyer certains de ces courriels maintenant, modifiez la feuille de calcul pour n’inclure que {} destinataires au maximum." "{} can only send {} more {} until annual limit resets","{} ne peut envoyer que {} {} d'ici la réinitialisation de la limite annuelle" -"To send to recipients you removed, wait until April 1, {} or contact them some other way.","Pour envoyer des messages aux destinataires, attendez le 1er avril {} ou optez pour une autre méthode de contact." \ No newline at end of file +"To send to recipients you removed, wait until April 1, {} or contact them some other way.","Pour envoyer des messages aux destinataires, attendez le 1er avril {} ou optez pour une autre méthode de contact." From e425c7dd406c2869acfcdde1008c3ca707fc19fa Mon Sep 17 00:00:00 2001 From: Andrew Leith Date: Tue, 17 Dec 2024 12:34:15 +0000 Subject: [PATCH 03/11] fix: fix syntax issue that was preventing pybabel from detecting missing translations --- .../partials/check/too-many-messages-annual.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/templates/partials/check/too-many-messages-annual.html b/app/templates/partials/check/too-many-messages-annual.html index 86e4cb3ae..cca8edac5 100644 --- a/app/templates/partials/check/too-many-messages-annual.html +++ b/app/templates/partials/check/too-many-messages-annual.html @@ -11,14 +11,14 @@ {{ _("Your service is in trial mode. To send more messages, request to go live").format(url_for('main.request_to_go_live', service_id=current_service.id)) }} {% else %} {% if recipients_remaining_messages > 0 %} -

{{ _('{} can only send {} more {} until annual limit resets'.format(current_service.name, recipients_remaining_messages, units)) }}

+

{{ _('{} can only send {} more {} until annual limit resets').format(current_service.name, recipients_remaining_messages, units) }}

- {{ _('To send some of these messages now, edit the spreadsheet to {} recipients maximum. '.format(recipients_remaining_messages)) }} - {{ _('To send to recipients you removed, wait until April 1, {} or contact them some other way.'.format(now().year)) }} + {{ _('To send some of these messages now, edit the spreadsheet to {} recipients maximum. ').format(recipients_remaining_messages) }} + {{ _('To send to recipients you removed, wait until April 1, {} or contact them some other way.').format(now().year) }}

{% else %} -

{{ _('{} cannot send any more {} until April 1, {}'.format(current_service.name, units, now().year)) }}

-

{{ _('For more information, visit the usage report for {}.'.format(url_for('.monthly', service_id=current_service.id), current_service.name)) }}

+

{{ _('{} cannot send any more {} until April 1, {}').format(current_service.name, units, now().year) }}

+

{{ _('For more information, visit the usage report for {}.').format(url_for('.monthly', service_id=current_service.id), current_service.name) }}

{% endif %} {%- endif -%}

\ No newline at end of file From 802ee7be143bf2ea97aa4f061e46cd74e2a073c3 Mon Sep 17 00:00:00 2001 From: Andrew Leith Date: Tue, 17 Dec 2024 12:34:39 +0000 Subject: [PATCH 04/11] fix(translation): correct typo, add three missing translations - we still need the actual french though --- app/translations/csv/fr.csv | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/translations/csv/fr.csv b/app/translations/csv/fr.csv index eed56abf3..2bc8269d7 100644 --- a/app/translations/csv/fr.csv +++ b/app/translations/csv/fr.csv @@ -2033,6 +2033,9 @@ "Sending paused until 7pm ET. You can schedule more messages to send later.","Envois suspendus jusqu’à 19 h HE. Vous pouvez programmer l’envoi de messages supplémentaires pour plus tard." "Sending paused until annual limit resets","Envois suspendus jusqu’à la réinitialisation de la limite annuelle" "These messages exceed the annual limit","Votre limite annuelle ne vous permet pas d’envoyer ces messages." -"To send some of these messages now, edit the spreadsheet to {} recipients maximum","Pour envoyer certains de ces courriels maintenant, modifiez la feuille de calcul pour n’inclure que {} destinataires au maximum." +"To send some of these messages now, edit the spreadsheet to {} recipients maximum. ","Pour envoyer certains de ces courriels maintenant, modifiez la feuille de calcul pour n’inclure que {} destinataires au maximum." "{} can only send {} more {} until annual limit resets","{} ne peut envoyer que {} {} d'ici la réinitialisation de la limite annuelle" "To send to recipients you removed, wait until April 1, {} or contact them some other way.","Pour envoyer des messages aux destinataires, attendez le 1er avril {} ou optez pour une autre méthode de contact." +"For more information, visit the usage report for {}.","FR: For more information, visit the usage report for {}." +"{} cannot send any more {} until April 1, {}","FR: {} cannot send any more {} until April 1, {}" +"To send some of these messages now, edit the spreadsheet to {} recipients maximum. ","FR: To send some of these messages now, edit the spreadsheet to {} recipients maximum. " \ No newline at end of file From 0fc67c339f8e1655688d39420927119f2c677067 Mon Sep 17 00:00:00 2001 From: Andrew Leith Date: Tue, 17 Dec 2024 12:37:49 +0000 Subject: [PATCH 05/11] chore: remove duplicate translation --- app/translations/csv/fr.csv | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/translations/csv/fr.csv b/app/translations/csv/fr.csv index 2bc8269d7..2f8c26db6 100644 --- a/app/translations/csv/fr.csv +++ b/app/translations/csv/fr.csv @@ -2037,5 +2037,4 @@ "{} can only send {} more {} until annual limit resets","{} ne peut envoyer que {} {} d'ici la réinitialisation de la limite annuelle" "To send to recipients you removed, wait until April 1, {} or contact them some other way.","Pour envoyer des messages aux destinataires, attendez le 1er avril {} ou optez pour une autre méthode de contact." "For more information, visit the usage report for {}.","FR: For more information, visit the usage report for {}." -"{} cannot send any more {} until April 1, {}","FR: {} cannot send any more {} until April 1, {}" -"To send some of these messages now, edit the spreadsheet to {} recipients maximum. ","FR: To send some of these messages now, edit the spreadsheet to {} recipients maximum. " \ No newline at end of file +"{} cannot send any more {} until April 1, {}","FR: {} cannot send any more {} until April 1, {}" \ No newline at end of file From 1ce9b94a52c11d176bcb3c379eebc677bb394f8f Mon Sep 17 00:00:00 2001 From: Jumana Bahrainwala Date: Wed, 18 Dec 2024 18:43:36 +0000 Subject: [PATCH 06/11] PR changes --- app/templates/partials/check/too-many-messages-annual.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/partials/check/too-many-messages-annual.html b/app/templates/partials/check/too-many-messages-annual.html index cca8edac5..8ccaea361 100644 --- a/app/templates/partials/check/too-many-messages-annual.html +++ b/app/templates/partials/check/too-many-messages-annual.html @@ -6,7 +6,7 @@ {% set units = _('text messages') %} {% endif %} -

+

{%- if current_service.trial_mode %} {{ _("Your service is in trial mode. To send more messages, request to go live").format(url_for('main.request_to_go_live', service_id=current_service.id)) }} {% else %} @@ -21,4 +21,4 @@

{{ _('For more information, visit the usage report for {}.').format(url_for('.monthly', service_id=current_service.id), current_service.name) }}

{% endif %} {%- endif -%} -

\ No newline at end of file +
\ No newline at end of file From 44e283378dfaeb46ae7e24fbf296af00c9f2daed Mon Sep 17 00:00:00 2001 From: Jumana B Date: Thu, 19 Dec 2024 10:02:09 -0500 Subject: [PATCH 07/11] Update app/templates/partials/check/too-many-messages-annual.html Co-authored-by: Philippe Caron --- app/templates/partials/check/too-many-messages-annual.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/partials/check/too-many-messages-annual.html b/app/templates/partials/check/too-many-messages-annual.html index 8ccaea361..f39a2a7c6 100644 --- a/app/templates/partials/check/too-many-messages-annual.html +++ b/app/templates/partials/check/too-many-messages-annual.html @@ -6,7 +6,7 @@ {% set units = _('text messages') %} {% endif %} -
+
{%- if current_service.trial_mode %} {{ _("Your service is in trial mode. To send more messages, request to go live").format(url_for('main.request_to_go_live', service_id=current_service.id)) }} {% else %} From e123dcc39873f31a8dd9568890fe5bd15931b8e5 Mon Sep 17 00:00:00 2001 From: Jumana B Date: Thu, 19 Dec 2024 10:39:19 -0500 Subject: [PATCH 08/11] Update app/templates/partials/check/too-many-messages-annual.html Co-authored-by: Philippe Caron --- app/templates/partials/check/too-many-messages-annual.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/partials/check/too-many-messages-annual.html b/app/templates/partials/check/too-many-messages-annual.html index f39a2a7c6..e648f63dc 100644 --- a/app/templates/partials/check/too-many-messages-annual.html +++ b/app/templates/partials/check/too-many-messages-annual.html @@ -11,7 +11,7 @@ {{ _("Your service is in trial mode. To send more messages, request to go live").format(url_for('main.request_to_go_live', service_id=current_service.id)) }} {% else %} {% if recipients_remaining_messages > 0 %} -

{{ _('{} can only send {} more {} until annual limit resets').format(current_service.name, recipients_remaining_messages, units) }}

+

{{ _('{} can only send {} more {} until annual limit resets').format(current_service.name, recipients_remaining_messages, units) }}

{{ _('To send some of these messages now, edit the spreadsheet to {} recipients maximum. ').format(recipients_remaining_messages) }} {{ _('To send to recipients you removed, wait until April 1, {} or contact them some other way.').format(now().year) }} From 84b57799dab60649663684f52772a65d696fe45b Mon Sep 17 00:00:00 2001 From: Jumana B Date: Thu, 19 Dec 2024 10:39:32 -0500 Subject: [PATCH 09/11] Update app/templates/partials/check/too-many-messages-annual.html Co-authored-by: Philippe Caron --- app/templates/partials/check/too-many-messages-annual.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/partials/check/too-many-messages-annual.html b/app/templates/partials/check/too-many-messages-annual.html index e648f63dc..fbb477508 100644 --- a/app/templates/partials/check/too-many-messages-annual.html +++ b/app/templates/partials/check/too-many-messages-annual.html @@ -17,7 +17,7 @@ {{ _('To send to recipients you removed, wait until April 1, {} or contact them some other way.').format(now().year) }}

{% else %} -

{{ _('{} cannot send any more {} until April 1, {}').format(current_service.name, units, now().year) }}

+

{{ _('{} cannot send any more {} until April 1, {}').format(current_service.name, units, now().year) }}

{{ _('For more information, visit the usage report for {}.').format(url_for('.monthly', service_id=current_service.id), current_service.name) }}

{% endif %} {%- endif -%} From b062a6d38109fee01bde12af28c8c1d32c208231 Mon Sep 17 00:00:00 2001 From: Jumana B Date: Thu, 19 Dec 2024 10:39:44 -0500 Subject: [PATCH 10/11] Update app/translations/csv/fr.csv Co-authored-by: Philippe Caron --- app/translations/csv/fr.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/translations/csv/fr.csv b/app/translations/csv/fr.csv index 2f8c26db6..d5ea264a7 100644 --- a/app/translations/csv/fr.csv +++ b/app/translations/csv/fr.csv @@ -2036,5 +2036,5 @@ "To send some of these messages now, edit the spreadsheet to {} recipients maximum. ","Pour envoyer certains de ces courriels maintenant, modifiez la feuille de calcul pour n’inclure que {} destinataires au maximum." "{} can only send {} more {} until annual limit resets","{} ne peut envoyer que {} {} d'ici la réinitialisation de la limite annuelle" "To send to recipients you removed, wait until April 1, {} or contact them some other way.","Pour envoyer des messages aux destinataires, attendez le 1er avril {} ou optez pour une autre méthode de contact." -"For more information, visit the usage report for {}.","FR: For more information, visit the usage report for {}." -"{} cannot send any more {} until April 1, {}","FR: {} cannot send any more {} until April 1, {}" \ No newline at end of file +"For more information, visit usage reports.","Pour plus de détails, consulter les rapports d’utilisation." +"{} cannot send any more {} until April 1, {}","{} ne peut plus envoyer de {} d’ici le 1er avril {}." \ No newline at end of file From 44749e7bb4e66ac5e0b327cd003ec65ebc027f06 Mon Sep 17 00:00:00 2001 From: Jumana B Date: Thu, 19 Dec 2024 10:39:52 -0500 Subject: [PATCH 11/11] Update app/templates/partials/check/too-many-messages-annual.html Co-authored-by: Philippe Caron --- app/templates/partials/check/too-many-messages-annual.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/partials/check/too-many-messages-annual.html b/app/templates/partials/check/too-many-messages-annual.html index fbb477508..49077b355 100644 --- a/app/templates/partials/check/too-many-messages-annual.html +++ b/app/templates/partials/check/too-many-messages-annual.html @@ -18,7 +18,7 @@

{% else %}

{{ _('{} cannot send any more {} until April 1, {}').format(current_service.name, units, now().year) }}

-

{{ _('For more information, visit the usage report for {}.').format(url_for('.monthly', service_id=current_service.id), current_service.name) }}

+

{{ _('For more information, visit usage reports.').format(url_for('.monthly', service_id=current_service.id)) }}

{% endif %} {%- endif -%}
\ No newline at end of file