From 0c418718612818d4bb4f04daa4411ac1f97a2ebf Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Fri, 9 Oct 2026 12:30:21 +0200 Subject: [PATCH] [ADD] Djade to pre-commit ### Added - Djade to pre-commit - https://github.com/adamchainz/djade --- .pre-commit-config.yaml | 9 +++++++++ sovtimer/locale/django.pot | 6 +++--- sovtimer/templates/sovtimer/base.html | 7 +++---- sovtimer/templates/sovtimer/dashboard.html | 6 +++--- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 229c6b52..ddc49bc3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -189,6 +189,15 @@ repos: args: - --target-version=5.2 # Minimum supported Django version for AA. Update as needed. + - repo: https://github.com/adamchainz/djade-pre-commit + rev: "52a7ce253113456c2a1113186a4a19b15c8b68af" # frozen: 1.9.0 + hooks: + - id: djade + name: Djade + description: Check for problems in Django template files. + args: + - --target-version=5.2 # Minimum supported Django version for AA. Update as needed. + - repo: https://github.com/asottile/pyupgrade rev: 75992aaa40730136014f34227e0135f63fc951b4 # frozen: v3.21.2 hooks: diff --git a/sovtimer/locale/django.pot b/sovtimer/locale/django.pot index b26587e0..e9f59b87 100644 --- a/sovtimer/locale/django.pot +++ b/sovtimer/locale/django.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: AA Sovereignty Timer\n" "Report-Msgid-Bugs-To: https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/\n" -"POT-Creation-Date: 2026-10-04 10:07+0200\n" +"POT-Creation-Date: 2026-10-09 12:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: sovtimer/__init__.py:10 sovtimer/models.py:43 -#: sovtimer/templates/sovtimer/base.html:7 -#: sovtimer/templates/sovtimer/base.html:11 +#: sovtimer/templates/sovtimer/base.html:6 +#: sovtimer/templates/sovtimer/base.html:10 msgid "Sovereignty Timer" msgstr "" diff --git a/sovtimer/templates/sovtimer/base.html b/sovtimer/templates/sovtimer/base.html index 63e99740..bcd08ff5 100644 --- a/sovtimer/templates/sovtimer/base.html +++ b/sovtimer/templates/sovtimer/base.html @@ -1,11 +1,10 @@ {% extends "allianceauth/base-bs5.html" %} -{% load i18n %} -{% load aa_i18n %} +{% load aa_i18n i18n %} {% block page_title %} {% translate "Sovereignty Timer" %} -{% endblock %} +{% endblock page_title %} {% block header_nav_brand %} {% translate "Sovereignty Timer" %} @@ -77,4 +76,4 @@ {% include "sovtimer/partials/footer/app-translation-footer.html" %} -{% endblock %} +{% endblock content %} diff --git a/sovtimer/templates/sovtimer/dashboard.html b/sovtimer/templates/sovtimer/dashboard.html index 491518dc..4f5f664e 100644 --- a/sovtimer/templates/sovtimer/dashboard.html +++ b/sovtimer/templates/sovtimer/dashboard.html @@ -4,13 +4,13 @@ {% block sovtimer_body %} {% include "sovtimer/partials/dashboard/table.html" %} -{% endblock %} +{% endblock sovtimer_body %} {% block extra_css %} {% include "bundles/datatables-2-css-bs5.html" %} {% include "bundles/datatables-2-columncontrol-css-bs5.html" %} {% include "sovtimer/bundles/aa-sov-timer-css.html" %} -{% endblock %} +{% endblock extra_css %} {% block extra_javascript %}