From 6105923d44818a3ddf32c787f206ba45d1a7f429 Mon Sep 17 00:00:00 2001 From: Janne Juhola <62986222+JanneJuhola@users.noreply.github.com> Date: Mon, 28 Oct 2024 16:12:54 +0200 Subject: [PATCH] fix: text improvements & added localizations (Hl-1425 & HL-1486) (#3451) * fix: better text for opening application for editing * fix: missing localization for handler change log added * fix: missing localization for received application status * fix: text in test updated * fix: to prev. commit: received status not used for applicant --- .../applications/tests/test_applications_api.py | 2 +- backend/benefit/locale/en/LC_MESSAGES/django.po | 2 +- backend/benefit/locale/fi/LC_MESSAGES/django.po | 4 ++-- backend/benefit/locale/sv/LC_MESSAGES/django.po | 4 ++-- backend/benefit/messages/automatic_messages.py | 2 +- .../handler/public/locales/en/common.json | 16 ++++++++++++++++ .../handler/public/locales/fi/common.json | 16 ++++++++++++++++ .../handler/public/locales/sv/common.json | 16 ++++++++++++++++ 8 files changed, 55 insertions(+), 7 deletions(-) diff --git a/backend/benefit/applications/tests/test_applications_api.py b/backend/benefit/applications/tests/test_applications_api.py index ff69ffe220..ec78aead3c 100755 --- a/backend/benefit/applications/tests/test_applications_api.py +++ b/backend/benefit/applications/tests/test_applications_api.py @@ -1391,7 +1391,7 @@ def test_application_status_change_as_handler( if to_status == ApplicationStatus.ADDITIONAL_INFORMATION_NEEDED: assert application.messages.count() == 1 assert ( - "Please make the corrections by 11.06.2021" + "Please make the corrections and send application again by 11.06.2021" in application.messages.first().content ) assert len(mailoutbox) == 1 diff --git a/backend/benefit/locale/en/LC_MESSAGES/django.po b/backend/benefit/locale/en/LC_MESSAGES/django.po index 22b33084a7..409b6b8b68 100644 --- a/backend/benefit/locale/en/LC_MESSAGES/django.po +++ b/backend/benefit/locale/en/LC_MESSAGES/django.po @@ -1399,7 +1399,7 @@ msgstr "Swedish" #, python-brace-format msgid "" -"Your application has been opened for editing. Please make the corrections by " +"Your application has been opened for editing. Please make the corrections and send application again by " "{additional_information_needed_by}, otherwise the application cannot be " "processed." msgstr "" diff --git a/backend/benefit/locale/fi/LC_MESSAGES/django.po b/backend/benefit/locale/fi/LC_MESSAGES/django.po index 3fad5730d1..af0ee6a71f 100644 --- a/backend/benefit/locale/fi/LC_MESSAGES/django.po +++ b/backend/benefit/locale/fi/LC_MESSAGES/django.po @@ -1441,11 +1441,11 @@ msgstr "Ruotsi" #, python-brace-format msgid "" -"Your application has been opened for editing. Please make the corrections by " +"Your application has been opened for editing. Please make the corrections and send application again by " "{additional_information_needed_by}, otherwise the application cannot be " "processed." msgstr "" -"Hakemuksesi on avattu muokattavaksi. Tee korjaukset viimeistään " +"Hakemuksesi on avattu muokattavaksi. Tee korjaukset ja lähetä lomake uudelleen viimeistään " "{additional_information_needed_by} mennessä, muuten hakemusta ei voida " "käsitellä." diff --git a/backend/benefit/locale/sv/LC_MESSAGES/django.po b/backend/benefit/locale/sv/LC_MESSAGES/django.po index 1e7ac37372..8795f00380 100644 --- a/backend/benefit/locale/sv/LC_MESSAGES/django.po +++ b/backend/benefit/locale/sv/LC_MESSAGES/django.po @@ -1466,11 +1466,11 @@ msgstr "Svenska" #, python-brace-format msgid "" -"Your application has been opened for editing. Please make the corrections by " +"Your application has been opened for editing. Please make the corrections and send application again by " "{additional_information_needed_by}, otherwise the application cannot be " "processed." msgstr "" -"Din ansökan har öppnats för redigering. Gör ändringarna senast " +"Din ansökan har öppnats för redigering. Gör ändringarna och skicka ansökan igen senast " "{additional_information_needed_by}, annars kan ansökan inte behandlas." msgid "" diff --git a/backend/benefit/messages/automatic_messages.py b/backend/benefit/messages/automatic_messages.py index 19a13104c0..7ac318529e 100644 --- a/backend/benefit/messages/automatic_messages.py +++ b/backend/benefit/messages/automatic_messages.py @@ -16,7 +16,7 @@ LOGGER = logging.getLogger(__name__) APPLICATION_REOPENED_MESSAGE = _( - "Your application has been opened for editing. Please make the corrections by " + "Your application has been opened for editing. Please make the corrections and send application again by " "{additional_information_needed_by}, otherwise the application cannot be processed." ) diff --git a/frontend/benefit/handler/public/locales/en/common.json b/frontend/benefit/handler/public/locales/en/common.json index e85bfe02ea..abbcf21b63 100644 --- a/frontend/benefit/handler/public/locales/en/common.json +++ b/frontend/benefit/handler/public/locales/en/common.json @@ -740,6 +740,7 @@ "accepted": "Hakemus on hyväksytty ja Helsinki-lisää on myönnetty aikavälille {{dateRangeStart}} – {{dateRangeEnd}}", "rejected": "Hakemus on hylätty. Helsinki-lisää ei myönnetä.", "handling": "Hakemus on käsittelyssä.", + "received": "Hakemus on vastaanotettu.", "cancelled": "Hakemus on peruttu.", "additional_information_needed": "Hakemus on käsittelyssä." }, @@ -1819,6 +1820,21 @@ }, "handledByAhjoAutomation": { "label": "Käsitelty Ahjo automaatiolla" + }, + "officialCompanyStreetAddress": { + "label": "Katuosoite" + }, + "companyName": { + "label": "Työantaja" + }, + "officialCompanyPostcode": { + "label": "Postinumero" + }, + "officialCompanyCity": { + "label": "Postitoimipaikka" + }, + "companyForm": { + "label": "Yritysmuoto" } } } diff --git a/frontend/benefit/handler/public/locales/fi/common.json b/frontend/benefit/handler/public/locales/fi/common.json index 23742966d1..24c4883402 100644 --- a/frontend/benefit/handler/public/locales/fi/common.json +++ b/frontend/benefit/handler/public/locales/fi/common.json @@ -740,6 +740,7 @@ "accepted": "Hakemus on hyväksytty ja Helsinki-lisää on myönnetty aikavälille {{dateRangeStart}} – {{dateRangeEnd}}", "rejected": "Hakemus on hylätty. Helsinki-lisää ei myönnetä.", "handling": "Hakemus on käsittelyssä.", + "received": "Hakemus on vastaanotettu.", "cancelled": "Hakemus on peruttu.", "additional_information_needed": "Hakemus on käsittelyssä." }, @@ -1818,6 +1819,21 @@ }, "handledByAhjoAutomation": { "label": "Käsitelty Ahjo automaatiolla" + }, + "officialCompanyStreetAddress": { + "label": "Katuosoite" + }, + "companyName": { + "label": "Työantaja" + }, + "officialCompanyPostcode": { + "label": "Postinumero" + }, + "officialCompanyCity": { + "label": "Postitoimipaikka" + }, + "companyForm": { + "label": "Yritysmuoto" } } } diff --git a/frontend/benefit/handler/public/locales/sv/common.json b/frontend/benefit/handler/public/locales/sv/common.json index e85bfe02ea..abbcf21b63 100644 --- a/frontend/benefit/handler/public/locales/sv/common.json +++ b/frontend/benefit/handler/public/locales/sv/common.json @@ -740,6 +740,7 @@ "accepted": "Hakemus on hyväksytty ja Helsinki-lisää on myönnetty aikavälille {{dateRangeStart}} – {{dateRangeEnd}}", "rejected": "Hakemus on hylätty. Helsinki-lisää ei myönnetä.", "handling": "Hakemus on käsittelyssä.", + "received": "Hakemus on vastaanotettu.", "cancelled": "Hakemus on peruttu.", "additional_information_needed": "Hakemus on käsittelyssä." }, @@ -1819,6 +1820,21 @@ }, "handledByAhjoAutomation": { "label": "Käsitelty Ahjo automaatiolla" + }, + "officialCompanyStreetAddress": { + "label": "Katuosoite" + }, + "companyName": { + "label": "Työantaja" + }, + "officialCompanyPostcode": { + "label": "Postinumero" + }, + "officialCompanyCity": { + "label": "Postitoimipaikka" + }, + "companyForm": { + "label": "Yritysmuoto" } } }