Merge branch 'translation-fixes' into 'master'

[FIX] Django `makemessages` is ignoring f-strings for translations now

See merge request allianceauth/allianceauth!1772

.gitlab-ci.yml

@@ -113,7 +113,7 @@ test-3.12-core:
 
 test-3.8-all:
   <<: *only-default
-  image: python:3.8-trixie
+  image: python:3.8-bookworm
   script:
     - tox -e py38-all
   artifacts:

allianceauth/fleetactivitytracking/views.py

@@ -320,8 +320,8 @@ def click_fatlink_view(request, token, fat_hash=None):
         messages.warning(
             request,
             _(
-                f"Cannot register the fleet participation for {character.character_name}. The character needs to be online."
+                "Cannot register the fleet participation for {character_name}. The character needs to be online."
-            ),
+            ).format(character_name=character.character_name)
         )
 
     return redirect('fatlink:view')

allianceauth/menu/managers.py

@@ -1,3 +1,5 @@
+from __future__ import annotations  # Still needed for Python 3.8, replaced with better implementations in Py39+
+
 import logging
 from typing import TYPE_CHECKING
 

allianceauth/project_template/supervisor.conf

@@ -11,10 +11,10 @@ environment =
 [program:beat]
 command = %(ENV_AA_COMMAND_CELERY)s
     -A %(ENV_AA_PROJECT_NAME)s beat
-directory = %(ENV_AA_VENV_DIRECTORY)s
+directory = %(ENV_AA_PROJECT_DIRECTORY)s
 user = %(ENV_AA_USER)s
-stdout_logfile = %(ENV_AA_VENV_DIRECTORY)s/log/%(program_name)s.log
+stdout_logfile = %(ENV_AA_PROJECT_DIRECTORY)s/log/%(program_name)s.log
-stderr_logfile = %(ENV_AA_VENV_DIRECTORY)s/log/%(program_name)s.log
+stderr_logfile = %(ENV_AA_PROJECT_DIRECTORY)s/log/%(program_name)s.log
 autostart = true
 autorestart = true
 startsecs = 10
@@ -26,12 +26,12 @@ command = %(ENV_AA_COMMAND_CELERY)s
     --pool=threads
     --concurrency=5
     -n %(program_name)s_%(process_num)02d
-directory = %(ENV_AA_VENV_DIRECTORY)s
+directory = %(ENV_AA_PROJECT_DIRECTORY)s
 user = %(ENV_AA_USER)s
 numprocs = 1
 process_name = %(program_name)s_%(process_num)02d
-stdout_logfile = %(ENV_AA_VENV_DIRECTORY)s/log/%(program_name)s.log
+stdout_logfile = %(ENV_AA_PROJECT_DIRECTORY)s/log/%(program_name)s.log
-stderr_logfile = %(ENV_AA_VENV_DIRECTORY)s/log/%(program_name)s.log
+stderr_logfile = %(ENV_AA_PROJECT_DIRECTORY)s/log/%(program_name)s.log
 autostart = true
 autorestart = true
 startsecs = 10
@@ -42,12 +42,12 @@ priority = 998
 {% if gunicorn %}
 [program:gunicorn]
 user = %(ENV_AA_USER)s
-directory = %(ENV_AA_VENV_DIRECTORY)s
+directory = %(ENV_AA_PROJECT_DIRECTORY)s
 command = %(ENV_AA_COMMAND_GUNICORN)s %(ENV_AA_PROJECT_NAME)s.wsgi
     --workers=3
     --timeout 120
-stdout_logfile = %(ENV_AA_VENV_DIRECTORY)s/log/%(program_name)s.log
+stdout_logfile = %(ENV_AA_PROJECT_DIRECTORY)s/log/%(program_name)s.log
-stderr_logfile = %(ENV_AA_VENV_DIRECTORY)s/log/%(program_name)s.log
+stderr_logfile = %(ENV_AA_PROJECT_DIRECTORY)s/log/%(program_name)s.log
 autostart = true
 autorestart = true
 stopsignal = INT
@@ -57,10 +57,10 @@ stopsignal = INT
 command = %(ENV_AA_COMMAND_MEMMON)s
     -p worker_00=256MB
     -p gunicorn=256MB
-directory = %(ENV_AA_VENV_DIRECTORY)s
+directory = %(ENV_AA_PROJECT_DIRECTORY)s
 events = TICK_60
-stdout_logfile = %(ENV_AA_VENV_DIRECTORY)s/log/memmon.log
+stdout_logfile = %(ENV_AA_PROJECT_DIRECTORY)s/log/memmon.log
-stderr_logfile = %(ENV_AA_VENV_DIRECTORY)s/log/memmon.log
+stderr_logfile = %(ENV_AA_PROJECT_DIRECTORY)s/log/memmon.log
 
 [group:{{ project_name }}]
 programs = beat,worker{% if gunicorn %},gunicorn{% endif %}

allianceauth/services/abstract.py

@@ -100,7 +100,10 @@ class BaseSetPasswordServiceAccountView(ServicesCRUDMixin, BaseServiceView, Upda
     def post(self, request, *args, **kwargs):
         result = super().post(request, *args, **kwargs)
         if self.get_form().is_valid():
-            messages.success(request, _(f"Successfully set your {self.service_name} password"))
+            messages.success(
+                request,
+                _("Successfully set your {service_name} password").format(service_name=self.service_name)
+            )
         return result