From eaaa1a9d5ec051412c76251f63996f68a68d3bcb Mon Sep 17 00:00:00 2001 From: Mat Date: Wed, 7 Aug 2024 16:23:07 +0100 Subject: [PATCH] Standardise MoJ header (#640) fix: standardise MoJ header - add organisation name back in to match https://design-patterns.service.justice.gov.uk/components/header/ - make sure the english "translation" gets included in the docker image. --- Dockerfile | 1 + locale/en/LC_MESSAGES/django.po | 16 ++++++++++------ templates/base/navigation.html | 2 ++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 66943c64..bc63d22f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,6 +49,7 @@ ENV VIRTUAL_ENV=/app/.venv \ # copy project and dependencies COPY . . COPY --from=builder /app/static ./static +COPY --from=builder /app/locale ./locale COPY --from=builder ${VIRTUAL_ENV} ${VIRTUAL_ENV} RUN chmod +x ./scripts/app-entrypoint.sh diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 3700517a..f3dc7864 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Find MoJ data\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-07 11:51+0100\n" +"POT-Creation-Date: 2024-08-07 14:56+0100\n" "Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -43,7 +43,7 @@ msgid "Chart" msgstr "Chart" # Page title -#: home/service/glossary.py:61 templates/base/navigation.html:70 +#: home/service/glossary.py:61 templates/base/navigation.html:72 msgid "Glossary" msgstr "Glossary" @@ -53,13 +53,13 @@ msgid "Metadata specification" msgstr "Metadata specification" # Page title -#: home/service/search.py:170 templates/base/navigation.html:65 +#: home/service/search.py:170 templates/base/navigation.html:67 #: templates/details_base.html:14 msgid "Search" msgstr "Search" # Page title -#: home/views.py:25 templates/base/navigation.html:60 +#: home/views.py:25 templates/base/navigation.html:62 msgid "Home" msgstr "Home" @@ -153,13 +153,17 @@ msgstr "" "© Crown copyright" +#: templates/base/navigation.html:15 +msgid "Ministry of Justice" +msgstr "Ministry of Justice" + # Service name - note the capitalisation -#: templates/base/navigation.html:16 templates/home.html:11 +#: templates/base/navigation.html:18 templates/home.html:11 msgid "Find MOJ data" msgstr "Find MoJ data" # Header link -#: templates/base/navigation.html:34 +#: templates/base/navigation.html:36 msgid "Sign out" msgstr "Sign out" diff --git a/templates/base/navigation.html b/templates/base/navigation.html index 9d5018de..bd5d411c 100644 --- a/templates/base/navigation.html +++ b/templates/base/navigation.html @@ -12,6 +12,8 @@ + {% translate "Ministry of Justice" %} + {% translate "Find MOJ data" %} {% if ENV == "dev" or ENV is None %}