Skip to content

Commit

Permalink
Merge pull request #632 from communitiesuk/FS-2531-window-closed-warn…
Browse files Browse the repository at this point in the history
…ing-welsh

FS-2531: Welsh translation for window closed warning and 500 error added.
  • Loading branch information
hamzabinkhalid authored Oct 9, 2024
2 parents aff748a + aba63a1 commit cd5a060
Show file tree
Hide file tree
Showing 6 changed files with 148 additions and 48 deletions.
14 changes: 13 additions & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,20 @@
"module": "flask",
"args": [
"run",
"--no-debugger"
"--no-debugger",
"--port=3008",
"--host=0.0.0.0"
],
"env": {
"PYTHONUNBUFFERED":"1",
"APPLICATION_STORE_API_HOST":"http://localhost:3002",
"AUTHENTICATOR_HOST":"http://localhost:3004",
"FLASK_ENV":"development",
"FORMS_SERVICE_PUBLIC_HOST":"http://localhost:3009",
"FUND_STORE_API_HOST":"http://localhost:3001",
"REDIS_INSTANCE_URI":"redis://localhost:6379",
"USE_LOCAL_DATA":"False"
},
"jinja": true,
"justMyCode": true
},
Expand Down
6 changes: 3 additions & 3 deletions app/templates/500.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{% extends "base.html" %}

{% set pageHeading %}Sorry, there is a problem with the service{% endset %}
{% set pageHeading %}{% trans %}Sorry, there is a problem with the service{% endtrans %}{% endset %}

{% block content %}
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<h1 class="govuk-heading-xl">{{ pageHeading }}</h1>
<p class="govuk-body">Try again later.</p>
<p class="govuk-body">{% trans %}Try again later.{% endtrans %}</p>
<p class="govuk-body"><a class="govuk-link" href=" {{
url_for("content_routes.contact_us")
}}">Contact us{# djlint:off #}</a>{# djlint:on #} if you have any questions.</p>
}}">{% trans %}Contact us{% endtrans %}{# djlint:off #}</a>{# djlint:on #} {% trans %}if you have any questions.{% endtrans %}</p>
</div>
</div>
{% endblock content %}
20 changes: 10 additions & 10 deletions app/templates/partials/round_closed_warning.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
data-module="govuk-notification-banner">
<div class="govuk-notification-banner__header">
<h2 class="govuk-notification-banner__title" id="govuk-notification-banner-title">
Important
{% trans %}Important{% endtrans %}
</h2>
</div>
<div class="govuk-notification-banner__content">
{% if round_title in ["Expression of interest","Mynegi diddordeb"] %}
<h2 class="govuk-notification-banner__heading">
Window closed - {{ fund_name }}
{% trans %}Window closed{% endtrans %} - {{ fund_name }}
</h2>
<p class="govuk-body">(Closed: {{ submission_deadline|datetime_format }})</p>
<p class="govuk-body">We have now entered a pre-election period. There will be no further Community Ownership
Fund announcements at this time.</p>
<p class="govuk-body">You can no longer submit applications in this window.</p>
<p class="govuk-body">({% trans %}Closed{% endtrans %}: {{ submission_deadline|datetime_format }})</p>
<p class="govuk-body">{% trans %}We have now entered a pre-election period. There will be no further Community Ownership
Fund announcements at this time.{% endtrans %}</p>
<p class="govuk-body">{% trans %}You can no longer submit applications in this window.{% endtrans %}</p>
{% else %}
<h2 class="govuk-notification-banner__heading">
Window closed - {{ fund_name }} {{ round_title }}
{% trans %}Window closed{% endtrans %} - {{ fund_name }} {{ round_title }}
</h2>
<p class="govuk-body">(Closed: {{ submission_deadline|datetime_format }})</p>
<p class="govuk-body">You can no longer submit applications in this window. Any you had in progress will be
emailed to you.</p>
<p class="govuk-body">({% trans %}Closed{% endtrans %}: {{ submission_deadline|datetime_format }})</p>
<p class="govuk-body">{% trans %}You can no longer submit applications in this window. Any you had in progress will be
emailed to you.{% endtrans %}</p>
{% endif %}
</div>
</div>
Expand Down
Binary file modified app/translations/cy/LC_MESSAGES/messages.mo
Binary file not shown.
86 changes: 65 additions & 21 deletions app/translations/cy/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-06-14 17:23+0100\n"
"POT-Creation-Date: 2024-10-08 15:29+0100\n"
"PO-Revision-Date: 2022-10-25 16:55+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: cy\n"
Expand All @@ -19,15 +19,15 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.14.0\n"

#: app/create_app.py:125 app/default/application_routes.py:301
#: app/create_app.py:129 app/default/application_routes.py:301
msgid "Apply for"
msgstr "Gwneud cais am"

#: app/create_app.py:127
#: app/create_app.py:131
msgid "Access Funding"
msgstr "Cael Mynediad at Gyllid"

#: app/filters.py:15
#: app/filters.py:15 app/filters.py:62 app/filters.py:92
msgid "at"
msgstr "am"

Expand Down Expand Up @@ -123,22 +123,14 @@ msgstr "Pa mor hawdd oedd deall y meini prawf cymhwysedd ar gyfer y gronfa hon?"
msgid "Number of hours spent:"
msgstr "Nifer yr oriau a dreuliwyd:"

#: app/forms/research.py:17
#: app/forms/research.py:18
msgid "I agree to be contacted for research purposes"
msgstr "Rwy'n cytuno i chi gysylltu â mi at ddibenion ymchwil"

#: app/forms/research.py:18
#: app/forms/research.py:19
msgid "I do not want to be contacted for research purposes"
msgstr "Nid wyf eisiau i chi gysylltu â mi at ddibenion ymchwil"

#: app/forms/research.py:24
msgid "Name of contact is required"
msgstr "Mae angen enw’r cyswllt"

#: app/forms/research.py:23
msgid "Contact email address is required"
msgstr "Mae angen cyfeiriad e-bost y cyswllt"

#: app/models/language.py:5
msgid "English"
msgstr "Saesneg"
Expand Down Expand Up @@ -171,6 +163,22 @@ msgstr "Heb Gyflwyno"
msgid "Ready to Submit"
msgstr "Yn barod i'w gyflwyno "

#: app/templates/500.html:3
msgid "Sorry, there is a problem with the service"
msgstr "Mae problem gyda'r gwasanaeth"

#: app/templates/500.html:9
msgid "Try again later."
msgstr "Ceisiwch eto nes ymlaen."

#: app/templates/500.html:12 app/templates/footer.html:23
msgid "Contact us"
msgstr "Cysylltwch â "

#: app/templates/500.html:12
msgid "if you have any questions."
msgstr "os oes gennych unrhyw gwestiynau."

#: app/templates/accessibility_statement.html:2
msgid "Accessibility statement"
msgstr "Datganiad Hygyrchedd"
Expand Down Expand Up @@ -628,10 +636,6 @@ msgstr "Cwcis"
msgid "Accessibility Statement"
msgstr "Datganiad Hygyrchedd"

#: app/templates/footer.html:23
msgid "Contact us"
msgstr "Cysylltwch â ni"

#: app/templates/fund_start_page.html:5
msgid "Start or continue an"
msgstr "Gwneud cais am"
Expand Down Expand Up @@ -736,15 +740,15 @@ msgstr "Rydych wedi gwrthod cwcis dadansoddeg. Gallwch"
msgid "View all applications"
msgstr "Eich ceisiadau"

#: app/templates/header.html:38
#: app/templates/header.html:41
msgid "Sign out"
msgstr "Allgofnodi"

#: app/templates/header.html:50
#: app/templates/header.html:55
msgid "beta"
msgstr "beta"

#: app/templates/header.html:52
#: app/templates/header.html:57
msgid "This is a new service."
msgstr "Gwasanaeth newydd yw hwn."

Expand Down Expand Up @@ -4178,6 +4182,40 @@ msgstr "Ffôn testun"
msgid "Check eligibility"
msgstr "Gwirio cymhwysedd"

#: app/templates/partials/round_closed_warning.html:6
msgid "Important"
msgstr "Pwysig"

#: app/templates/partials/round_closed_warning.html:12
#: app/templates/partials/round_closed_warning.html:20
msgid "Window closed"
msgstr "Ffenestr ar gau"

#: app/templates/partials/round_closed_warning.html:14
#: app/templates/partials/round_closed_warning.html:22
msgid "Closed"
msgstr "Ar gau"

#: app/templates/partials/round_closed_warning.html:15
msgid ""
"We have now entered a pre-election period. There will be no further "
"Community Ownership\n"
" Fund announcements at this time."
msgstr ""

#: app/templates/partials/round_closed_warning.html:17
msgid "You can no longer submit applications in this window."
msgstr "Ni allwch gyflwyno ceisiadau yn y ffenestr hon mwyach."

#: app/templates/partials/round_closed_warning.html:23
msgid ""
"You can no longer submit applications in this window. Any you had in "
"progress will be\n"
" emailed to you."
msgstr ""
"Ni allwch gyflwyno ceisiadau yn y ffenestr hon mwyach. Bydd unrhyw un "
"oedd gennych ar y gweill yn cael ei e-bostio atoch."

#: app/templates/partials/start-application-button.html:11
msgid "Start new application"
msgstr "Dechrau cais newydd"
Expand Down Expand Up @@ -4586,3 +4624,9 @@ msgstr "Cyflwyno'ch cais"

#~ msgid "when to call you"
#~ msgstr "pa bryd y gallai ddigwydd"

#~ msgid "Name of contact is required"
#~ msgstr "Mae angen enw’r cyswllt"

#~ msgid "Contact email address is required"
#~ msgstr "Mae angen cyfeiriad e-bost y cyswllt"
70 changes: 57 additions & 13 deletions messages.pot
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-06-14 17:23+0100\n"
"POT-Creation-Date: 2024-10-08 15:29+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -17,15 +17,15 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.14.0\n"

#: app/create_app.py:125 app/default/application_routes.py:301
#: app/create_app.py:129 app/default/application_routes.py:301
msgid "Apply for"
msgstr ""

#: app/create_app.py:127
#: app/create_app.py:131
msgid "Access Funding"
msgstr ""

#: app/filters.py:15
#: app/filters.py:15 app/filters.py:62 app/filters.py:92
msgid "at"
msgstr ""

Expand Down Expand Up @@ -119,11 +119,11 @@ msgstr ""
msgid "Number of hours spent:"
msgstr ""

#: app/forms/research.py:17
#: app/forms/research.py:18
msgid "I agree to be contacted for research purposes"
msgstr ""

#: app/forms/research.py:18
#: app/forms/research.py:19
msgid "I do not want to be contacted for research purposes"
msgstr ""

Expand Down Expand Up @@ -159,6 +159,22 @@ msgstr ""
msgid "Ready to Submit"
msgstr ""

#: app/templates/500.html:3
msgid "Sorry, there is a problem with the service"
msgstr ""

#: app/templates/500.html:9
msgid "Try again later."
msgstr ""

#: app/templates/500.html:12 app/templates/footer.html:23
msgid "Contact us"
msgstr ""

#: app/templates/500.html:12
msgid "if you have any questions."
msgstr ""

#: app/templates/accessibility_statement.html:2
msgid "Accessibility statement"
msgstr ""
Expand Down Expand Up @@ -560,10 +576,6 @@ msgstr ""
msgid "Accessibility Statement"
msgstr ""

#: app/templates/footer.html:23
msgid "Contact us"
msgstr ""

#: app/templates/fund_start_page.html:5
msgid "Start or continue an"
msgstr ""
Expand Down Expand Up @@ -664,15 +676,15 @@ msgstr ""
msgid "View all applications"
msgstr ""

#: app/templates/header.html:38
#: app/templates/header.html:41
msgid "Sign out"
msgstr ""

#: app/templates/header.html:50
#: app/templates/header.html:55
msgid "beta"
msgstr ""

#: app/templates/header.html:52
#: app/templates/header.html:57
msgid "This is a new service."
msgstr ""

Expand Down Expand Up @@ -3743,6 +3755,38 @@ msgstr ""
msgid "Check eligibility"
msgstr ""

#: app/templates/partials/round_closed_warning.html:6
msgid "Important"
msgstr ""

#: app/templates/partials/round_closed_warning.html:12
#: app/templates/partials/round_closed_warning.html:20
msgid "Window closed"
msgstr ""

#: app/templates/partials/round_closed_warning.html:14
#: app/templates/partials/round_closed_warning.html:22
msgid "Closed"
msgstr ""

#: app/templates/partials/round_closed_warning.html:15
msgid ""
"We have now entered a pre-election period. There will be no further "
"Community Ownership\n"
" Fund announcements at this time."
msgstr ""

#: app/templates/partials/round_closed_warning.html:17
msgid "You can no longer submit applications in this window."
msgstr ""

#: app/templates/partials/round_closed_warning.html:23
msgid ""
"You can no longer submit applications in this window. Any you had in "
"progress will be\n"
" emailed to you."
msgstr ""

#: app/templates/partials/start-application-button.html:11
msgid "Start new application"
msgstr ""
Expand Down

0 comments on commit cd5a060

Please sign in to comment.