aa-sov-timer 2.3.4__tar.gz → 2.4.0__tar.gz

{aa_sov_timer-2.3.4 → aa_sov_timer-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aa-sov-timer
-Version: 2.3.4
+Version: 2.4.0
 Summary: Sov Campaign Timer for Alliance Auth
 Project-URL: Changelog, https://github.com/ppfeufer/aa-sov-timer/blob/master/CHANGELOG.md
 Project-URL: Documentation, https://github.com/ppfeufer/aa-sov-timer/blob/master/README.md
@@ -757,17 +757,9 @@ ______________________________________________________________________
 
 ## Installation<a name="installation"></a>
 
-> [!NOTE]
+> [!IMPORTANT]
 >
-> **AA Sov Timer >= 2.0.0 needs at least Alliance Auth v4.0.0!**
->
-> Please make sure to update your Alliance Auth instance _before_ you install this
-> module or update to the latest version, otherwise an update to Alliance Auth will
-> be pulled in unsupervised.
->
-> The last version compatible with Alliance Auth v3 is `1.12.3`.
-
-**Important**: Please make sure you meet all preconditions before you proceed:
+> Please make sure you meet all preconditions before you proceed.
 
 - AA Sovereignty Timer is a plugin for Alliance Auth. If you don't have Alliance
   Auth running already, please install it first before proceeding. (see the official

{aa_sov_timer-2.3.4 → aa_sov_timer-2.4.0}/README.md

@@ -47,17 +47,9 @@ ______________________________________________________________________
 
 ## Installation<a name="installation"></a>
 
-> [!NOTE]
+> [!IMPORTANT]
 >
-> **AA Sov Timer >= 2.0.0 needs at least Alliance Auth v4.0.0!**
->
-> Please make sure to update your Alliance Auth instance _before_ you install this
-> module or update to the latest version, otherwise an update to Alliance Auth will
-> be pulled in unsupervised.
->
-> The last version compatible with Alliance Auth v3 is `1.12.3`.
-
-**Important**: Please make sure you meet all preconditions before you proceed:
+> Please make sure you meet all preconditions before you proceed.
 
 - AA Sovereignty Timer is a plugin for Alliance Auth. If you don't have Alliance
   Auth running already, please install it first before proceeding. (see the official

{aa_sov_timer-2.3.4 → aa_sov_timer-2.4.0}/sovtimer/__init__.py

@@ -5,5 +5,5 @@ App init
 # Django
 from django.utils.translation import gettext_lazy as _
 
-__version__ = "2.3.4"
+__version__ = "2.4.0"
 __title__ = _("Sovereignty Timers")

{aa_sov_timer-2.3.4 → aa_sov_timer-2.4.0}/sovtimer/locale/cs_CZ/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Sov Timer 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-sov-timer/issues\n"
-"POT-Creation-Date: 2025-04-09 11:48+0200\n"
+"POT-Creation-Date: 2025-06-03 13:33+0200\n"
 "PO-Revision-Date: 2024-07-10 14:26+0000\n"
 "Last-Translator: Dadas Aideron <dadas.aideron@gmail.com>\n"
 "Language-Team: Czech <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/cs/>\n"

{aa_sov_timer-2.3.4 → aa_sov_timer-2.4.0}/sovtimer/locale/de/LC_MESSAGES/django.po

@@ -1,13 +1,13 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# "H. Peter Pfeufer" <info@ppfeufer.de>, 2023, 2024.
+# "H. Peter Pfeufer" <info@ppfeufer.de>, 2023, 2024, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: AA Sov Timer 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-sov-timer/issues\n"
-"POT-Creation-Date: 2025-04-09 11:48+0200\n"
-"PO-Revision-Date: 2024-12-15 10:37+0000\n"
+"POT-Creation-Date: 2025-06-03 13:33+0200\n"
+"PO-Revision-Date: 2025-04-25 14:24+0000\n"
 "Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
 "Language-Team: German <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/de/>\n"
 "Language: de\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.8.4\n"
+"X-Generator: Weblate 5.11\n"
 
 #: sovtimer/__init__.py:9
 msgid "Sovereignty Timers"

{aa_sov_timer-2.3.4 → aa_sov_timer-2.4.0}/sovtimer/locale/django.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: AA Sov Timer 2.3.4\n"
+"Project-Id-Version: AA Sov Timer 2.4.0\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-sov-timer/issues\n"
-"POT-Creation-Date: 2025-04-09 11:48+0200\n"
+"POT-Creation-Date: 2025-06-03 13:33+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

{aa_sov_timer-2.3.4 → aa_sov_timer-2.4.0}/sovtimer/locale/es/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Sov Timer 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-sov-timer/issues\n"
-"POT-Creation-Date: 2025-04-09 11:48+0200\n"
+"POT-Creation-Date: 2025-06-03 13:33+0200\n"
 "PO-Revision-Date: 2024-12-15 10:37+0000\n"
 "Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
 "Language-Team: Spanish <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/es/>\n"

{aa_sov_timer-2.3.4 → aa_sov_timer-2.4.0}/sovtimer/locale/fr_FR/LC_MESSAGES/django.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Sov Timer 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-sov-timer/issues\n"
-"POT-Creation-Date: 2025-04-09 11:48+0200\n"
+"POT-Creation-Date: 2025-06-03 13:33+0200\n"
 "PO-Revision-Date: 2024-12-15 10:37+0000\n"
 "Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
 "Language-Team: French <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/fr/>\n"

{aa_sov_timer-2.3.4 → aa_sov_timer-2.4.0}/sovtimer/locale/it_IT/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Sov Timer 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-sov-timer/issues\n"
-"POT-Creation-Date: 2025-04-09 11:48+0200\n"
+"POT-Creation-Date: 2025-06-03 13:33+0200\n"
 "PO-Revision-Date: 2024-12-22 21:15+0000\n"
 "Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
 "Language-Team: Italian <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/it/>\n"

{aa_sov_timer-2.3.4 → aa_sov_timer-2.4.0}/sovtimer/locale/ja/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Sov Timer 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-sov-timer/issues\n"
-"POT-Creation-Date: 2025-04-09 11:48+0200\n"
+"POT-Creation-Date: 2025-06-03 13:33+0200\n"
 "PO-Revision-Date: 2024-08-06 03:28+0000\n"
 "Last-Translator: Deleted User <noreply+44@weblate.org>\n"
 "Language-Team: Japanese <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/ja/>\n"

{aa_sov_timer-2.3.4 → aa_sov_timer-2.4.0}/sovtimer/locale/ko_KR/LC_MESSAGES/django.po

@@ -5,20 +5,21 @@
 # Author50CO <tkddlschry@gmail.com>, 2023, 2024.
 # Mind of the Raven <okanieva@gmail.com>, 2024.
 # Rodpold Shard <rodpold@gmail.com>, 2024.
+# SiO4 <hohoit0078@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: AA Sov Timer 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-sov-timer/issues\n"
-"POT-Creation-Date: 2025-04-09 11:48+0200\n"
-"PO-Revision-Date: 2024-12-15 10:37+0000\n"
-"Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
+"POT-Creation-Date: 2025-06-03 13:33+0200\n"
+"PO-Revision-Date: 2025-04-28 07:24+0000\n"
+"Last-Translator: SiO4 <hohoit0078@gmail.com>\n"
 "Language-Team: Korean <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/ko/>\n"
 "Language: ko_KR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.8.4\n"
+"X-Generator: Weblate 5.11.1\n"
 
 #: sovtimer/__init__.py:9
 msgid "Sovereignty Timers"
@@ -159,7 +160,7 @@ msgstr "이 앱을 번역하거나 기존 번역을 개선하고 싶으신가요
 
 #: sovtimer/templates/sovtimer/partials/footer/app-translation-footer.html:8
 msgid "Join our team of translators!"
-msgstr "번역팀에 참여하세요!"
+msgstr "번역가 팀에 참여하세요!"
 
 #: sovtimer/views.py:163
 msgid "Neither side has made any progress yet"

{aa_sov_timer-2.3.4 → aa_sov_timer-2.4.0}/sovtimer/locale/nl_NL/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Sov Timer 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-sov-timer/issues\n"
-"POT-Creation-Date: 2025-04-09 11:48+0200\n"
+"POT-Creation-Date: 2025-06-03 13:33+0200\n"
 "PO-Revision-Date: 2024-05-10 14:12+0000\n"
 "Last-Translator: Anonymous <noreply@weblate.org>\n"
 "Language-Team: Dutch <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/nl/>\n"

{aa_sov_timer-2.3.4 → aa_sov_timer-2.4.0}/sovtimer/locale/pl_PL/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Sov Timer 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-sov-timer/issues\n"
-"POT-Creation-Date: 2025-04-09 11:48+0200\n"
+"POT-Creation-Date: 2025-06-03 13:33+0200\n"
 "PO-Revision-Date: 2024-05-10 14:12+0000\n"
 "Last-Translator: Anonymous <noreply@weblate.org>\n"
 "Language-Team: Polish <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/pl/>\n"

{aa_sov_timer-2.3.4 → aa_sov_timer-2.4.0}/sovtimer/locale/ru/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Sov Timer 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-sov-timer/issues\n"
-"POT-Creation-Date: 2025-04-09 11:48+0200\n"
+"POT-Creation-Date: 2025-06-03 13:33+0200\n"
 "PO-Revision-Date: 2024-12-15 10:37+0000\n"
 "Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
 "Language-Team: Russian <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/ru/>\n"

{aa_sov_timer-2.3.4 → aa_sov_timer-2.4.0}/sovtimer/locale/sk/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Sov Timer 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-sov-timer/issues\n"
-"POT-Creation-Date: 2025-04-09 11:48+0200\n"
+"POT-Creation-Date: 2025-06-03 13:33+0200\n"
 "PO-Revision-Date: 2024-05-10 14:12+0000\n"
 "Last-Translator: Anonymous <noreply@weblate.org>\n"
 "Language-Team: Slovak <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/sk/>\n"

{aa_sov_timer-2.3.4 → aa_sov_timer-2.4.0}/sovtimer/locale/uk/LC_MESSAGES/django.po

@@ -4,20 +4,21 @@
 # "Andrii M." <elfleg0las88@gmail.com>, 2023, 2024.
 # Peter Pfeufer <info@ppfeufer.de>, 2023, 2024.
 # M <skrypets@gmail.com>, 2025.
+# s0k0l -_- <salarysalo@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: AA Sov Timer 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-sov-timer/issues\n"
-"POT-Creation-Date: 2025-04-09 11:48+0200\n"
-"PO-Revision-Date: 2025-02-24 15:17+0000\n"
-"Last-Translator: M <skrypets@gmail.com>\n"
+"POT-Creation-Date: 2025-06-03 13:33+0200\n"
+"PO-Revision-Date: 2025-04-10 07:05+0000\n"
+"Last-Translator: s0k0l -_- <salarysalo@gmail.com>\n"
 "Language-Team: Ukrainian <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/uk/>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 3 : (n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 5.10.1\n"
+"X-Generator: Weblate 5.10.4\n"
 
 #: sovtimer/__init__.py:9
 msgid "Sovereignty Timers"
@@ -34,51 +35,37 @@ msgid "Sovereignty Timer"
 msgstr "Таймер суверенітету"
 
 #: sovtimer/models.py:36
-#, fuzzy
-#| msgid "Sovereignty Timer"
 msgid "Can access the Sovereignty Timer module"
-msgstr "Таймер суверенітету"
+msgstr "Є доступ до модуля суверенітету"
 
 #: sovtimer/models.py:73
-#, fuzzy
-#| msgid "Sovereignty Timer"
 msgid "Sovereignty structure"
-msgstr "Таймер суверенітету"
+msgstr "Структура суверенітету"
 
 #: sovtimer/models.py:74
-#, fuzzy
-#| msgid "Sovereignty Timers"
 msgid "Sovereignty structures"
-msgstr "Таймера суверенітету"
+msgstr "Структури суверенітету"
 
 #: sovtimer/models.py:111
-#, fuzzy
-#| msgid "IHub Defense"
 msgid "Sov Hub defense"
-msgstr "Захист інфраструктурного хабу"
+msgstr "Захист хабу суверенітету"
 
 #: sovtimer/models.py:112
-#, fuzzy
-#| msgid "TCU Defense"
 msgid "TCU defense"
-msgstr "Захист TCU"
+msgstr "Захист ТКУ"
 
 #: sovtimer/models.py:138
-#, fuzzy
-#| msgid "Sovereignty Timer"
 msgid "Sovereignty campaign"
-msgstr "Таймер суверенітету"
+msgstr "Кампанія суверенітету"
 
 #: sovtimer/models.py:139
-#, fuzzy
-#| msgid "Sovereignty Timers"
 msgid "Sovereignty campaigns"
-msgstr "Таймера суверенітету"
+msgstr "Кампанії суверенітету"
 
 #: sovtimer/templates/sovtimer/dashboard.html:15
 #: sovtimer/templates/sovtimer/partials/dashboard/table.html:27
 msgid "Type"
-msgstr ""
+msgstr "Тип"
 
 #: sovtimer/templates/sovtimer/dashboard.html:16
 #: sovtimer/templates/sovtimer/partials/dashboard/table.html:28
@@ -102,7 +89,7 @@ msgstr "Власник / Захисник"
 
 #: sovtimer/templates/sovtimer/dashboard.html:20
 msgid "Active campaign"
-msgstr ""
+msgstr "активна кампанія"
 
 #: sovtimer/templates/sovtimer/dashboard.html:21 sovtimer/views.py:161
 msgid "Yes"
@@ -110,45 +97,43 @@ msgstr "Так"
 
 #: sovtimer/templates/sovtimer/dashboard.html:22 sovtimer/views.py:159
 msgid "No"
-msgstr ""
+msgstr "Номер"
 
 #: sovtimer/templates/sovtimer/partials/dashboard/table.html:4
 msgid "The sovereignty timer list is automatically updated every 30 seconds. Progress for any active campaigns will be shown as <i>Previous - Trend - Current</i>."
-msgstr ""
+msgstr "Список таймерів суверенітету оновлюється автоматично кожні 30 секунд. Прогрес активних кампаній буде показаний як <i>Попереднє - Тренд - Поточне</i>."
 
 #: sovtimer/templates/sovtimer/partials/dashboard/table.html:10
-#, fuzzy
-#| msgid "Sovereignty Timers"
 msgid "Sovereignty campaign list"
-msgstr "Таймера суверенітету"
+msgstr "Список кампаній суверенітету"
 
 #: sovtimer/templates/sovtimer/partials/dashboard/table.html:16
 msgid "Timers total:"
-msgstr ""
+msgstr "Таймерів усього:"
 
 #: sovtimer/templates/sovtimer/partials/dashboard/table.html:17
 msgid "Timers upcoming (< 4hrs):"
-msgstr ""
+msgstr "Таймери (< 4 годин):"
 
 #: sovtimer/templates/sovtimer/partials/dashboard/table.html:18
 msgid "Timers active:"
-msgstr ""
+msgstr "Активні таймери:"
 
 #: sovtimer/templates/sovtimer/partials/dashboard/table.html:32
 msgid "ADM"
-msgstr ""
+msgstr "АДМ"
 
 #: sovtimer/templates/sovtimer/partials/dashboard/table.html:33
 msgid "Start"
-msgstr ""
+msgstr "Початок"
 
 #: sovtimer/templates/sovtimer/partials/dashboard/table.html:34
 msgid "Remaining"
-msgstr ""
+msgstr "Залишилось"
 
 #: sovtimer/templates/sovtimer/partials/dashboard/table.html:35
 msgid "Progress"
-msgstr ""
+msgstr "Прогрес"
 
 #: sovtimer/templates/sovtimer/partials/footer/app-translation-footer.html:5
 msgid "Do you want to help translate this app into your language or improve the existing translation?"
@@ -160,15 +145,15 @@ msgstr "Приєднуйтесь до нашої команди переклад
 
 #: sovtimer/views.py:163
 msgid "Neither side has made any progress yet"
-msgstr ""
+msgstr "Жодна з сторін ще не зробила прогресу"
 
 #: sovtimer/views.py:171
 msgid "Defenders making progress"
-msgstr ""
+msgstr "Прогрес захисників"
 
 #: sovtimer/views.py:179
 msgid "Attackers making progress"
-msgstr ""
+msgstr "Прогрес атакуючих"
 
 #~ msgid "No data available in this table"
 #~ msgstr "Немає даних у цій таблиці"

{aa_sov_timer-2.3.4 → aa_sov_timer-2.4.0}/sovtimer/locale/zh_Hans/LC_MESSAGES/django.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Sov Timer 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-sov-timer/issues\n"
-"POT-Creation-Date: 2025-04-09 11:48+0200\n"
+"POT-Creation-Date: 2025-06-03 13:33+0200\n"
 "PO-Revision-Date: 2024-05-15 09:21+0000\n"
 "Last-Translator: SAM_FPS <sam_fps@163.com>\n"
 "Language-Team: Chinese (Simplified) <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/zh_Hans/>\n"

aa_sov_timer-2.4.0/sovtimer/templates/sovtimer/bundles/aa-sov-timer-css.html

@@ -0,0 +1,3 @@
+{% load sri %}
+
+{% sri_static "sovtimer/css/aa-sov-timer.min.css" %}

aa_sov_timer-2.4.0/sovtimer/templates/sovtimer/bundles/aa-sov-timer-js.html

@@ -0,0 +1,3 @@
+{% load sri %}
+
+{% sri_static "sovtimer/js/aa-sov-timer.min.js" %}

{aa_sov_timer-2.3.4 → aa_sov_timer-2.4.0}/sovtimer/templates/sovtimer/partials/dashboard/table.html

@@ -1,7 +1,7 @@
 {% load i18n %}
 
 <p class="text-muted">
-    {% translate 'The sovereignty timer list is automatically updated every 30 seconds. Progress for any active campaigns will be shown as <i>Previous - Trend - Current</i>.' %}
+    {% translate "The sovereignty timer list is automatically updated every 30 seconds. Progress for any active campaigns will be shown as <i>Previous - Trend - Current</i>." %}
 </p>
 
 <div class="card card-default">
@@ -24,15 +24,15 @@
             <table class="table table-striped aa-sovtimer-campaigns" style="width: 100%; border-collapse: collapse !important;">
                 <thead>
                     <tr>
-                        <th class="aa-sovtimer-campaigns-column aa-sovtimer-campaigns-column-type">{% translate 'Type' %}</th>
-                        <th class="aa-sovtimer-campaigns-column aa-sovtimer-campaigns-column-system">{% translate 'System' %}</th>
-                        <th class="aa-sovtimer-campaigns-column aa-sovtimer-campaigns-column-constellation">{% translate 'Constellation' %}</th>
-                        <th class="aa-sovtimer-campaigns-column aa-sovtimer-campaigns-column-region">{% translate 'Region' %}</th>
-                        <th class="aa-sovtimer-campaigns-column aa-sovtimer-campaigns-column-defender">{% translate 'Owner / Defender' %}</th>
-                        <th class="aa-sovtimer-campaigns-column aa-sovtimer-campaigns-column-adm">{% translate 'ADM' %}</th>
-                        <th class="aa-sovtimer-campaigns-column aa-sovtimer-campaigns-column-start-datetime">{% translate 'Start' %}</th>
-                        <th class="aa-sovtimer-campaigns-column aa-sovtimer-campaigns-column-remaining-time">{% translate 'Remaining' %}</th>
-                        <th class="aa-sovtimer-campaigns-column aa-sovtimer-column-campaigns-progress">{% translate 'Progress' %}</th>
+                        <th class="aa-sovtimer-campaigns-column aa-sovtimer-campaigns-column-type">{% translate "Type" %}</th>
+                        <th class="aa-sovtimer-campaigns-column aa-sovtimer-campaigns-column-system">{% translate "System" %}</th>
+                        <th class="aa-sovtimer-campaigns-column aa-sovtimer-campaigns-column-constellation">{% translate "Constellation" %}</th>
+                        <th class="aa-sovtimer-campaigns-column aa-sovtimer-campaigns-column-region">{% translate "Region" %}</th>
+                        <th class="aa-sovtimer-campaigns-column aa-sovtimer-campaigns-column-defender">{% translate "Owner / Defender" %}</th>
+                        <th class="aa-sovtimer-campaigns-column aa-sovtimer-campaigns-column-adm">{% translate "ADM" %}</th>
+                        <th class="aa-sovtimer-campaigns-column aa-sovtimer-campaigns-column-start-datetime">{% translate "Start" %}</th>
+                        <th class="aa-sovtimer-campaigns-column aa-sovtimer-campaigns-column-remaining-time">{% translate "Remaining" %}</th>
+                        <th class="aa-sovtimer-campaigns-column aa-sovtimer-campaigns-column-progress">{% translate "Progress" %}</th>
                     </tr>
                 </thead>
 

aa_sov_timer-2.3.4/sovtimer/helper/static_files.py

@@ -1,43 +0,0 @@
-"""
-Helper functions for static integrity calculations
-"""
-
-# Standard Library
-import os
-from pathlib import Path
-
-# Third Party
-from sri import Algorithm, calculate_integrity
-
-# Alliance Auth
-from allianceauth.services.hooks import get_extension_logger
-
-# Alliance Auth (External Libs)
-from app_utils.logging import LoggerAddTag
-
-# AA Sovereignty Timer
-# AA Sov Timer
-from sovtimer import __title__
-from sovtimer.constants import APP_STATIC_DIR
-
-logger = LoggerAddTag(my_logger=get_extension_logger(__name__), prefix=__title__)
-
-
-def calculate_integrity_hash(relative_file_path: str) -> str:
-    """
-    Calculates the integrity hash for a given static file
-
-    :param self:
-    :type self:
-    :param relative_file_path: The file path relative to the `{APP_NAME}/{PACKAGE_NAME}/static/{PACKAGE_NAME}` folder
-    :type relative_file_path: str
-    :return: The integrity hash
-    :rtype: str
-    """
-
-    file_path = os.path.join(APP_STATIC_DIR, relative_file_path)
-    integrity_hash = calculate_integrity(
-        path=Path(file_path), algorithm=Algorithm.SHA512
-    )
-
-    return integrity_hash

aa_sov_timer-2.3.4/sovtimer/templates/sovtimer/bundles/aa-sov-timer-css.html

@@ -1,3 +0,0 @@
-{% load sovtimer %}
-
-{% sovtimer_static "css/aa-sov-timer.min.css" %}

aa_sov_timer-2.3.4/sovtimer/templates/sovtimer/bundles/aa-sov-timer-js.html

@@ -1,3 +0,0 @@
-{% load sovtimer %}
-
-{% sovtimer_static "js/aa-sov-timer.min.js" %}

aa_sov_timer-2.3.4/sovtimer/templatetags/__init__.py

@@ -1,3 +0,0 @@
-"""
-Initialize the template tags
-"""

aa_sov_timer-2.3.4/sovtimer/templatetags/sovtimer.py

@@ -1,86 +0,0 @@
-"""
-Versioned static URLs to break browser caches when changing the app version
-"""
-
-# Standard Library
-import os
-
-# Django
-from django.template.defaulttags import register
-from django.templatetags.static import static
-from django.utils.safestring import mark_safe
-
-# Alliance Auth
-from allianceauth.services.hooks import get_extension_logger
-
-# Alliance Auth (External Libs)
-from app_utils.logging import LoggerAddTag
-
-# AA Sovereignty Timer
-from sovtimer import __title__, __version__
-from sovtimer.app_settings import debug_enabled
-from sovtimer.constants import PACKAGE_NAME
-from sovtimer.helper.static_files import calculate_integrity_hash
-
-logger = LoggerAddTag(my_logger=get_extension_logger(__name__), prefix=__title__)
-
-
-@register.simple_tag
-def sovtimer_static(relative_file_path: str, script_type: str = None) -> str | None:
-    """
-    Versioned static URL
-
-    :param relative_file_path: The file path relative to the `{APP_NAME}/{PACKAGE_NAME}/static/{PACKAGE_NAME}` folder
-    :type relative_file_path: str
-    :param script_type: The script type
-    :type script_type: str
-    :return: Versioned static URL
-    :rtype: str
-    """
-
-    logger.debug(f"Getting versioned static URL for: {relative_file_path}")
-
-    file_type = os.path.splitext(relative_file_path)[1][1:]
-
-    logger.debug(f"File extension: {file_type}")
-
-    # Only support CSS and JS files
-    if file_type not in ["css", "js"]:
-        raise ValueError(f"Unsupported file type: {file_type}")
-
-    static_file_path = os.path.join(PACKAGE_NAME, relative_file_path)
-    static_url = static(static_file_path)
-
-    # Integrity hash calculation only for non-debug mode
-    sri_string = (
-        f' integrity="{calculate_integrity_hash(relative_file_path)}" crossorigin="anonymous"'
-        if not debug_enabled()
-        else ""
-    )
-
-    # Versioned URL for CSS and JS files
-    # Add version query parameter to break browser caches when changing the app version
-    # Do not add version query parameter for libs as they are already versioned through their file path
-    versioned_url = (
-        static_url
-        if relative_file_path.startswith("libs/")
-        else static_url + "?v=" + __version__
-    )
-
-    return_value = None
-
-    # Return the versioned URL with integrity hash for CSS
-    if file_type == "css":
-        return_value = mark_safe(
-            f'<link rel="stylesheet" href="{versioned_url}"{sri_string}>'
-        )
-
-    # Return the versioned URL with integrity hash for JS files
-    if file_type == "js":
-        js_type = f' type="{script_type}"' if script_type else ""
-
-        return_value = mark_safe(
-            f'<script{js_type} src="{versioned_url}"{sri_string}></script>'
-        )
-
-    return return_value

aa_sov_timer-2.3.4/sovtimer/tests/test_templatetags.py

@@ -1,103 +0,0 @@
-"""
-Test for the template tag sovtimer_static
-"""
-
-# Django
-from django.template import Context, Template
-from django.test import TestCase, override_settings
-
-# AA Sovereignty Timer
-from sovtimer import __version__
-from sovtimer.constants import PACKAGE_NAME
-from sovtimer.helper.static_files import calculate_integrity_hash
-
-
-class TestVersionedStatic(TestCase):
-    """
-    Test `sovtimer_static` template tag
-    """
-
-    @override_settings(DEBUG=False)
-    def test_versioned_static(self):
-        """
-        Test should return the versioned static
-
-        :return:
-        :rtype:
-        """
-
-        context = Context(dict_={"version": __version__})
-        template_to_render = Template(
-            template_string=(
-                "{% load sovtimer %}"
-                "{% sovtimer_static 'css/aa-sov-timer.min.css' %}"
-                "{% sovtimer_static 'js/aa-sov-timer.min.js' %}"
-            )
-        )
-
-        rendered_template = template_to_render.render(context=context)
-
-        expected_static_css_src = (
-            f'/static/{PACKAGE_NAME}/css/aa-sov-timer.min.css?v={context["version"]}'
-        )
-        expected_static_css_src_integrity = calculate_integrity_hash(
-            "css/aa-sov-timer.min.css"
-        )
-        expected_static_js_src = (
-            f'/static/{PACKAGE_NAME}/js/aa-sov-timer.min.js?v={context["version"]}'
-        )
-        expected_static_js_src_integrity = calculate_integrity_hash(
-            "js/aa-sov-timer.min.js"
-        )
-
-        self.assertIn(member=expected_static_css_src, container=rendered_template)
-        self.assertIn(
-            member=expected_static_css_src_integrity, container=rendered_template
-        )
-        self.assertIn(member=expected_static_js_src, container=rendered_template)
-        self.assertIn(
-            member=expected_static_js_src_integrity, container=rendered_template
-        )
-
-    @override_settings(DEBUG=True)
-    def test_versioned_static_with_debug_enabled(self) -> None:
-        """
-        Test versioned static template tag with DEBUG enabled
-
-        :return:
-        :rtype:
-        """
-
-        context = Context({"version": __version__})
-        template_to_render = Template(
-            template_string=(
-                "{% load sovtimer %}" "{% sovtimer_static 'css/aa-sov-timer.min.css' %}"
-            )
-        )
-
-        rendered_template = template_to_render.render(context=context)
-
-        expected_static_css_src = (
-            f'/static/{PACKAGE_NAME}/css/aa-sov-timer.min.css?v={context["version"]}'
-        )
-
-        self.assertIn(member=expected_static_css_src, container=rendered_template)
-        self.assertNotIn(member="integrity=", container=rendered_template)
-
-    def test_invalid_file_type(self) -> None:
-        """
-        Test should raise a ValueError for an invalid file type
-
-        :return:
-        :rtype:
-        """
-
-        context = Context({"version": __version__})
-        template_to_render = Template(
-            template_string=(
-                "{% load sovtimer %}" "{% sovtimer_static 'invalid/invalid.txt' %}"
-            )
-        )
-
-        with self.assertRaises(ValueError):
-            template_to_render.render(context=context)