Fix translation issues and move style to a proper class

numerique-gouv · Aug 20, 2024 · 1163813 · 1163813
1 parent 790bdc2
commit 1163813
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 11 deletions.
diff --git a/config/settings.py b/config/settings.py
@@ -189,8 +189,6 @@ def show_toolbar(request):
 
 USE_I18N = True
 
-USE_L10N = True
-
 USE_TZ = True
 
 WAGTAIL_I18N_ENABLED = True
@@ -200,6 +198,8 @@ def show_toolbar(request):
     ("fr", "French"),
 ]
 
+LOCALE_PATHS = ["locale"]
+
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/5.0/howto/static-files/
 STORAGES = {}

diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-17 17:54+0200\n"
-"PO-Revision-Date: 2024-06-26 17:57+0200\n"
+"POT-Creation-Date: 2024-08-20 11:23+0200\n"
+"PO-Revision-Date: 2024-08-20 11:25+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr\n"
@@ -45,9 +45,13 @@ msgstr "Retourner à l’accueil"
 msgid "Display settings"
 msgstr "Paramètres d’affichage"
 
-#: templates/blocks/footer.html:55
-msgid "Ce site a été fait avec"
-msgstr "Ce site a été fait avec"
+#: templates/blocks/footer.html:56
+msgid "Opens a new window"
+msgstr "Ouvre une nouvelle fenêtre"
+
+#: templates/blocks/footer.html:58
+msgid "This website is made with"
+msgstr "Ce site est fait avec"
 
 #: templates/blocks/header.html:5 templates/blocks/header.html:13
 msgid "Home page"
@@ -67,4 +71,4 @@ msgstr "Menu"
 
 #: templates/blocks/header.html:106
 msgid "Main menu"
-msgstr "Menu principal"
+msgstr "Menu principal"
diff --git a/pyproject.toml b/pyproject.toml
@@ -64,7 +64,7 @@ extend-exclude = '''
 
 [tool.djlint]
 max_blank_lines = 1
-ignore = "H030,H031,H006"
+ignore = "H030,H031,H006,D018"
 indent = 2
 
 [tool.pyright]

diff --git a/static/css/style.css b/static/css/style.css
diff --git a/static/css/style.sass b/static/css/style.sass
@@ -31,3 +31,8 @@
     height: 4.5rem !important
     margin: 1.5rem
     width: 4.5rem
+
+.cmsfr-footer__bottom-extra
+    border-left: 1px solid var(--border-default-grey)
+    padding-left: 1em
+    margin-left: 1em
diff --git a/templates/blocks/footer.html b/templates/blocks/footer.html
@@ -51,6 +51,13 @@
     </li>
   {% endif %}
 {% endblock footer_links %}
+
 {% block footer_bottom_extra %}
-| {% translate "Ce site a été fait avec" %} <a href="https://sites-faciles.beta.numerique.gouv.fr/?mtm_campaign=footer-link" target="_blank" title="Créez un site internet DSFR et RGAA">Sites faciles</a>
+  {% translate "Opens a new window" as new_window %}
+  <span class="cmsfr-footer__bottom-extra">
+    {% translate "This website is made with" %} <a href="https://sites-faciles.beta.numerique.gouv.fr/?mtm_campaign=footer-link"
+    target="_blank"
+    rel="noopener external"
+    title="Sites faciles - {{ new_window }}">Sites faciles</a>
+  </span>
 {% endblock footer_bottom_extra %}