Version Bump 4.8.0

Merge branch 'translations_7f31a07ccd4e4a66b1dd7b6bc2dbddb5' into 'master'
Updates for project Alliance Auth See merge request allianceauth/allianceauth!1732
2025-07-09 04:20:17 +02:00 · 2025-07-03 09:19:25 +10:00 · 2025-07-02 23:17:15 +00:00 · 2025-07-02 23:17:15 +00:00 · 2025-07-02 23:06:28 +00:00 · 2025-07-01 14:07:12 +02:00
140 changed files with 6546 additions and 4436 deletions
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -3,22 +3,41 @@
 # Update this file:
 #   pre-commit autoupdate

+# Set the default language versions for the hooks
+default_language_version:
+  python: python3  # Force all Python hooks to use Python 3
+  node: 22.12.0  # Force all Node hooks to use Node 22.12.0
+
+# Globally exclude files
+# https://pre-commit.com/#top_level-exclude
+exclude: |
+  (?x)(
+    LICENSE|
+    allianceauth\/static\/allianceauth\/css\/themes\/bootstrap-locals.less|
+    \.min\.css|
+    \.min\.js|
+    \.po|
+    \.mo|
+    swagger\.json|
+    static/(.*)/libs/
+  )
+
 repos:
  # Code Upgrades
  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.2
+    rev: v3.20.0
    hooks:
      - id: pyupgrade
        args: [--py38-plus]
  - repo: https://github.com/adamchainz/django-upgrade
-    rev: 1.17.0
+    rev: 1.25.0
    hooks:
      - id: django-upgrade
        args: [--target-version=4.2]

  # Formatting
  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
    hooks:
      # Identify invalid files
      - id: check-ast
@ -44,48 +63,22 @@ repos:
        args: [--fix=lf]
      - id: trailing-whitespace
        args: [--markdown-linebreak-ext=md]
-        exclude: |
-          (?x)(
-            \.min\.css|
-            \.min\.js|
-            \.po|
-            \.mo|
-            swagger\.json|
-            static/(.*)/libs/
-          )
      - id: check-executables-have-shebangs
      - id: end-of-file-fixer
-        exclude: |
-          (?x)(
-            \.min\.css|
-            \.min\.js|
-            \.po|
-            \.mo|
-            swagger\.json|
-            static/(.*)/libs/
-          )
  - repo: https://github.com/editorconfig-checker/editorconfig-checker.python
-    rev: 2.7.3
+    rev: 3.2.1
    hooks:
      - id: editorconfig-checker
-        exclude: |
-          (?x)(
-            LICENSE|
-            allianceauth\/static\/allianceauth\/css\/themes\/bootstrap-locals.less|
-            \.po|
-            \.mo|
-            swagger\.json|
-            static/(.*)/libs/
-          )
  - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.41.0
+    rev: v0.45.0
    hooks:
      - id: markdownlint
+        language: node
        args:
          - --disable=MD013
  # Infrastructure
  - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: 2.1.3
+    rev: v2.6.0
    hooks:
      - id: pyproject-fmt
        name: pyproject.toml formatter
@ -93,9 +86,9 @@ repos:
        args:
          - --indent=4
        additional_dependencies:
-          - tox==4.15.0 # https://github.com/tox-dev/tox/releases/latest
+          - tox==4.24.1 # https://github.com/tox-dev/tox/releases/latest
  - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.18
+    rev: v0.24.1
    hooks:
      - id: validate-pyproject
        name: Validate pyproject.toml
--- a/README.md
+++ b/README.md
@ -1,15 +1,15 @@
 # Alliance Auth

-[![license](https://img.shields.io/badge/license-GPLv2-green)](https://pypi.org/project/allianceauth/)
-[![python](https://img.shields.io/pypi/pyversions/allianceauth)](https://pypi.org/project/allianceauth/)
-[![django](https://img.shields.io/pypi/djversions/allianceauth?label=django)](https://pypi.org/project/allianceauth/)
-[![version](https://img.shields.io/pypi/v/allianceauth?label=release)](https://pypi.org/project/allianceauth/)
-[![pipeline status](https://gitlab.com/allianceauth/allianceauth/badges/master/pipeline.svg)](https://gitlab.com/allianceauth/allianceauth/commits/master)
+[![License](https://img.shields.io/badge/license-GPLv2-green)](https://pypi.org/project/allianceauth/)
+[![Python Versions](https://img.shields.io/pypi/pyversions/allianceauth)](https://pypi.org/project/allianceauth/)
+[![Django Versions](https://img.shields.io/pypi/djversions/allianceauth?label=django)](https://pypi.org/project/allianceauth/)
+[![Stable AA Version](https://img.shields.io/pypi/v/allianceauth?label=release)](https://pypi.org/project/allianceauth/)
+[![Pipeline Status](https://gitlab.com/allianceauth/allianceauth/badges/master/pipeline.svg)](https://gitlab.com/allianceauth/allianceauth/commits/master)
 [![Documentation Status](https://readthedocs.org/projects/allianceauth/badge/?version=latest)](https://allianceauth.readthedocs.io/?badge=latest)
-[![coverage report](https://gitlab.com/allianceauth/allianceauth/badges/master/coverage.svg)](https://gitlab.com/allianceauth/allianceauth/commits/master)
+[![Test Coverage Report](https://gitlab.com/allianceauth/allianceauth/badges/master/coverage.svg)](https://gitlab.com/allianceauth/allianceauth/commits/master)
 [![Chat on Discord](https://img.shields.io/discord/399006117012832262.svg)](https://discord.gg/fjnHAmk)

-An auth system for EVE Online to help in-game organizations manage online service access.
+A flexible authentication platform for EVE Online to help in-game organizations manage access to applications and services. AA provides both, a stable core, and a robust framework for community development and custom applications.

 ## Content

@ -22,17 +22,17 @@ An auth system for EVE Online to help in-game organizations manage online servic

 ## Overview

-Alliance Auth (AA) is a web site that helps Eve Online organizations efficiently manage access to applications and services.
+Alliance Auth (AA) is a platform that helps Eve Online organizations efficiently manage access to applications and services.

 Main features:

- Automatically grants or revokes user access to external services (e.g. Discord, Mumble) and web apps (e.g. SRP requests) based on the user's current membership to [in-game organizations](https://allianceauth.readthedocs.io/en/latest/features/core/states/) and [groups](https://allianceauth.readthedocs.io/en/latest/features/core/groups/)
+- Automatically grants or revokes user access to external services (e.g.: Discord, Mumble) based on the user's current membership to [a variety of EVE Online affiliation](https://allianceauth.readthedocs.io/en/latest/features/core/states/) and [groups](https://allianceauth.readthedocs.io/en/latest/features/core/groups/)

 - Provides a central web site where users can directly access web apps (e.g. SRP requests, Fleet Schedule) and manage their access to external services and groups.

- Includes a set of connectors (called ["services"](https://allianceauth.readthedocs.io/en/latest/features/services/)) for integrating access management with many popular external applications / services like Discord, Mumble, Teamspeak 3, SMF and others
+- Includes a set of connectors (called ["Services"](https://allianceauth.readthedocs.io/en/latest/features/services/)) for integrating access management with many popular external applications / services like Discord, Mumble, Teamspeak 3, SMF and others

- Includes a set of web [apps](https://allianceauth.readthedocs.io/en/latest/features/apps/) which add many useful functions, e.g.: fleet schedule, timer board, SRP request management, fleet activity tracker
+- Includes a set of web [Apps](https://allianceauth.readthedocs.io/en/latest/features/apps/) which add many useful functions, e.g.: fleet schedule, timer board, SRP request management, fleet activity tracker

 - Can be easily extended with additional services and apps. Many are provided by the community and can be found here: [Community Creations](https://gitlab.com/allianceauth/community-creations)

@ -42,9 +42,15 @@ For further details about AA - including an installation guide and a full list o

 ## Screenshot

-Here is an example of the Alliance Auth web site with some plug-ins apps and services enabled:
+Here is an example of the Alliance Auth web site with a mixture of Services, Apps and Community Creations enabled:

-![screenshot](https://i.imgur.com/2tnX9kD.png)
+### Flatly Theme
+
+![Flatly Theme](docs/_static/images/promotion/SampleInstallation-Flatly.png)
+
+### Darkly Theme
+
+![Darkly Theme](docs/_static/images/promotion/SampleInstallation-Darkly.png)

 ## Support

--- a/allianceauth/init.py
+++ b/allianceauth/init.py
@ -5,7 +5,7 @@ manage online service access.
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.

-__version__ = '4.6.0'
+__version__ = '4.8.0'
 __title__ = 'Alliance Auth'
 __url__ = 'https://gitlab.com/allianceauth/allianceauth'
 NAME = f'{__title__} v{__version__}'
--- a/allianceauth/analytics/apps.py
+++ b/allianceauth/analytics/apps.py
@ -1,6 +1,8 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _


 class AnalyticsConfig(AppConfig):
    name = 'allianceauth.analytics'
    label = 'analytics'
+    verbose_name = _('Analytics')
--- a/allianceauth/authentication/apps.py
+++ b/allianceauth/authentication/apps.py
@ -1,10 +1,12 @@
 from django.apps import AppConfig
 from django.core.checks import register, Tags
+from django.utils.translation import gettext_lazy as _


 class AuthenticationConfig(AppConfig):
    name = "allianceauth.authentication"
    label = "authentication"
+    verbose_name = _("Authentication")

    def ready(self):
        from allianceauth.authentication import checks, signals  # noqa: F401
--- a/allianceauth/authentication/models.py
+++ b/allianceauth/authentication/models.py
@ -1,4 +1,5 @@
 import logging
+from typing import ClassVar

 from django.contrib.auth.models import User, Permission
 from django.db import models, transaction
@ -27,7 +28,7 @@ class State(models.Model):
                                            help_text="Factions to whose members this state is available.")
    public = models.BooleanField(default=False, help_text="Make this state available to any character.")

-    objects = StateManager()
+    objects: ClassVar[StateManager] = StateManager()

    class Meta:
        ordering = ['-priority']
@ -137,8 +138,10 @@ class UserProfile(models.Model):
                    sender=self.__class__, user=self.user, state=self.state
                )

-    def __str__(self):
+    def __str__(self) -> str:
        return str(self.user)
+
+
 class CharacterOwnership(models.Model):
    class Meta:
        default_permissions = ('change', 'delete')
@ -148,7 +151,7 @@ class CharacterOwnership(models.Model):
    owner_hash = models.CharField(max_length=28, unique=True)
    user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='character_ownerships')

-    objects = CharacterOwnershipManager()
+    objects: ClassVar[CharacterOwnershipManager] = CharacterOwnershipManager()

    def __str__(self):
        return f"{self.user}: {self.character}"
--- a/allianceauth/authentication/templates/authentication/tokens.html
+++ b/allianceauth/authentication/templates/authentication/tokens.html
@ -14,7 +14,7 @@
 {% block content %}
    <div>
        <p class="mb-3">
-            {% translate "This page is a best attempt, but backups or database logs can still contain your tokens. Always revoke tokens on https://community.eveonline.com/support/third-party-applications/ where possible."|urlize %}
+            {% translate "This page is a best attempt, but backups or database logs can still contain your tokens. Always revoke tokens on https://developers.eveonline.com/authorized-apps where possible."|urlize %}
        </p>

        <table class="table w-100" id="table_tokens">
@ -31,7 +31,7 @@
                    <tr>
                        <td style="white-space:initial;">
                            {% for s in t.scopes.all %}
-                                <span class="badge bg-secondary">{{ s.name }}</span>
+                                <span class="badge text-bg-secondary">{{ s.name }}</span>
                            {% endfor %}
                        </td>

--- a/allianceauth/authentication/templates/public/base.html
+++ b/allianceauth/authentication/templates/public/base.html
@ -1,24 +1,24 @@
 {% load theme_tags %}
 {% load static %}
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" {% theme_html_tags %}>
    <head>
+        <!-- Required meta tags -->
        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <meta name="description" content="">
-        <meta name="author" content="">
-        <!-- TODO Bundle all the site specific stuff up into its own template for easy override -->
-        <meta property="og:title" content="{{ SITE_NAME }}">
-        <meta property="og:image" content="{{ SITE_URL }}{% static 'allianceauth/icons/apple-touch-icon.png' %}">
-        <meta property="og:description" content="Alliance Auth - An auth system for EVE Online to help in-game organizations manage online service access.">
+        <!-- End Required meta tags -->

+        <!-- Meta tags -->
+        {% include 'allianceauth/opengraph.html' %}
        {% include 'allianceauth/icons.html' %}
+        <!-- Meta tags -->

        <title>{% block title %}{% block page_title %}{% endblock page_title %} - {{ SITE_NAME }}{% endblock title %}</title>

        {% theme_css %}
+
        {% include 'bundles/fontawesome.html' %}
+        {% include 'bundles/auth-framework-css.html' %}

        {% block extra_include %}
        {% endblock %}
--- a/allianceauth/authentication/templates/public/lang_select.html
+++ b/allianceauth/authentication/templates/public/lang_select.html
@ -1,17 +1,15 @@
 {% load i18n %}

-<div class="dropdown">
-    <form action="{% url 'set_language' %}" method="post">
-        {% csrf_token %}
+<form class="dropdown-item" action="{% url 'set_language' %}" method="post">
+    {% csrf_token %}

-        <select class="form-select" onchange="this.form.submit()" class="form-control" id="lang-select" name="language">
-            {% get_available_languages as LANGUAGES %}
+    <select class="form-select" onchange="this.form.submit()" class="form-control" id="lang-select" name="language">
+        {% get_available_languages as LANGUAGES %}

-            {% for lang_code, lang_name in LANGUAGES %}
-                <option lang="{{ lang_code }}" value="{{ lang_code }}"{% if lang_code == LANGUAGE_CODE %} selected{% endif %}>
-                    {{ lang_code|language_name_local|capfirst }} ({{ lang_code }})
-                </option>
-            {% endfor %}
-        </select>
-    </form>
-</div>
+        {% for lang_code, lang_name in LANGUAGES %}
+            <option lang="{{ lang_code }}" value="{{ lang_code }}"{% if lang_code == LANGUAGE_CODE %} selected{% endif %}>
+                {{ lang_code|language_name_local|capfirst }} ({{ lang_code }})
+            </option>
+        {% endfor %}
+    </select>
+</form>
--- a/allianceauth/authentication/templates/public/middle_box.html
+++ b/allianceauth/authentication/templates/public/middle_box.html
@ -29,7 +29,7 @@
                </p>

                <p class="text-center">
-                    <a class="text-reset" href="https://community.eveonline.com/support/third-party-applications/" target="_blank" rel="noopener noreferrer">
+                    <a class="text-reset" href="https://developers.eveonline.com/authorized-apps" target="_blank" rel="noopener noreferrer">
                        {% translate "Manage ESI Applications" %}
                    </a>
                </p>
--- a/allianceauth/checks.py
+++ b/allianceauth/checks.py
@ -1,3 +1,7 @@
+"""
+Django system checks for Alliance Auth
+"""
+
 from typing import List
 from django import db
 from django.core.checks import CheckMessage, Error, register, Warning
@ -16,142 +20,475 @@ B = Configuration

@register()
 def django_settings(app_configs, **kwargs) -> List[CheckMessage]:
-    errors: List[CheckMessage] = []
-    if hasattr(settings, "SITE_URL"):
-        if settings.SITE_URL[-1] == "/":
-            errors.append(Warning("'SITE_URL' Has a trailing slash. This may lead to incorrect links being generated by Auth.", hint="", id="allianceauth.checks.B005"))
-    else:
-        errors.append(Error("No 'SITE_URL' found is settings. This may lead to incorrect links being generated by Auth or Errors in 3rd party modules.", hint="", id="allianceauth.checks.B006"))
+    """
+    Check that Django settings are correctly configured

-    if hasattr(settings, "CSRF_TRUSTED_ORIGINS") and hasattr(settings, "SITE_URL"):
-        if settings.SITE_URL not in settings.CSRF_TRUSTED_ORIGINS:
-            errors.append(Warning("'SITE_URL' not found in 'CSRF_TRUSTED_ORIGINS'. Auth may not load pages correctly until this is rectified.", hint="", id="allianceauth.checks.B007"))
+    :param app_configs:
+    :type app_configs:
+    :param kwargs:
+    :type kwargs:
+    :return:
+    :rtype:
+    """
+
+    errors: List[CheckMessage] = []
+
+    # Check for SITE_URL
+    if hasattr(settings, "SITE_URL"):
+        # Check if SITE_URL is empty
+        if settings.SITE_URL == "":
+            errors.append(
+                Error(
+                    msg="'SITE_URL' is empty.",
+                    hint="Make sure to set 'SITE_URL' to the URL of your Auth instance. (Without trailing slash)",
+                    id="allianceauth.checks.B011",
+                )
+            )
+        # Check if SITE_URL has a trailing slash
+        elif settings.SITE_URL[-1] == "/":
+            errors.append(
+                Warning(
+                    msg="'SITE_URL' has a trailing slash. This may lead to incorrect links being generated by Auth.",
+                    hint="",
+                    id="allianceauth.checks.B005",
+                )
+            )
+    # SITE_URL not found
    else:
-        errors.append(Error("No 'CSRF_TRUSTED_ORIGINS' found is settings, Auth may not load pages correctly until this is rectified", hint="", id="allianceauth.checks.B008"))
+        errors.append(
+            Error(
+                msg="No 'SITE_URL' found is settings. This may lead to incorrect links being generated by Auth or Errors in 3rd party modules.",
+                hint="",
+                id="allianceauth.checks.B006",
+            )
+        )
+
+    # Check for CSRF_TRUSTED_ORIGINS
+    if hasattr(settings, "CSRF_TRUSTED_ORIGINS") and hasattr(settings, "SITE_URL"):
+        # Check if SITE_URL is not in CSRF_TRUSTED_ORIGINS
+        if settings.SITE_URL not in settings.CSRF_TRUSTED_ORIGINS:
+            errors.append(
+                Warning(
+                    msg="'SITE_URL' not found in 'CSRF_TRUSTED_ORIGINS'. Auth may not load pages correctly until this is rectified.",
+                    hint="",
+                    id="allianceauth.checks.B007",
+                )
+            )
+    # CSRF_TRUSTED_ORIGINS not found
+    else:
+        errors.append(
+            Error(
+                msg="No 'CSRF_TRUSTED_ORIGINS' found is settings, Auth may not load pages correctly until this is rectified",
+                hint="",
+                id="allianceauth.checks.B008",
+            )
+        )
+
+    # Check for ESI_USER_CONTACT_EMAIL
+    if hasattr(settings, "ESI_USER_CONTACT_EMAIL"):
+        # Check if ESI_USER_CONTACT_EMAIL is empty
+        if settings.ESI_USER_CONTACT_EMAIL == "":
+            errors.append(
+                Error(
+                    msg="'ESI_USER_CONTACT_EMAIL' is empty. A valid email is required as maintainer contact for CCP.",
+                    hint="",
+                    id="allianceauth.checks.B009",
+                )
+            )
+    # ESI_USER_CONTACT_EMAIL not found
+    else:
+        errors.append(
+            Error(
+                msg="No 'ESI_USER_CONTACT_EMAIL' found is settings. A valid email is required as maintainer contact for CCP.",
+                hint="",
+                id="allianceauth.checks.B010",
+            )
+        )

    return errors


@register()
 def system_package_redis(app_configs, **kwargs) -> List[CheckMessage]:
+    """
+    Check that Redis is a supported version
+
+    :param app_configs:
+    :type app_configs:
+    :param kwargs:
+    :type kwargs:
+    :return:
+    :rtype:
+    """
+
+    allianceauth_redis_install_link = "https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools"
+
    errors: List[CheckMessage] = []
+
    try:
-        redis_version = Pep440Version(get_redis_client().info()['redis_version'])
+        redis_version = Pep440Version(get_redis_client().info()["redis_version"])
    except InvalidVersion:
        errors.append(Warning("Unable to confirm Redis Version"))
+
        return errors

-    if redis_version.major == 7 and redis_version.minor == 2 and timezone.now() > timezone.datetime(year=2025, month=8, day=31, tzinfo=timezone.utc):
-        errors.append(Error(f"Redis {redis_version.public} in Security Support only, Updating Suggested", hint="https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools", id="allianceauth.checks.A001"))
+    if (
+        redis_version.major == 7
+        and redis_version.minor == 2
+        and timezone.now()
+        > timezone.datetime(year=2025, month=8, day=31, tzinfo=timezone.utc)
+    ):
+        errors.append(
+            Error(
+                msg=f"Redis {redis_version.public} in Security Support only, Updating Suggested",
+                hint=allianceauth_redis_install_link,
+                id="allianceauth.checks.A001",
+            )
+        )
    elif redis_version.major == 7 and redis_version.minor == 0:
-        errors.append(Warning(f"Redis {redis_version.public} in Security Support only, Updating Suggested", hint="https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools", id="allianceauth.checks.A002"))
+        errors.append(
+            Warning(
+                msg=f"Redis {redis_version.public} in Security Support only, Updating Suggested",
+                hint=allianceauth_redis_install_link,
+                id="allianceauth.checks.A002",
+            )
+        )
    elif redis_version.major == 6 and redis_version.minor == 2:
-        errors.append(Warning(f"Redis {redis_version.public} in Security Support only, Updating Suggested", hint="https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools", id="allianceauth.checks.A018"))
+        errors.append(
+            Warning(
+                msg=f"Redis {redis_version.public} in Security Support only, Updating Suggested",
+                hint=allianceauth_redis_install_link,
+                id="allianceauth.checks.A018",
+            )
+        )
    elif redis_version.major in [6, 5]:
-        errors.append(Error(f"Redis {redis_version.public} EOL", hint="https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools", id="allianceauth.checks.A003"))
+        errors.append(
+            Error(
+                msg=f"Redis {redis_version.public} EOL",
+                hint=allianceauth_redis_install_link,
+                id="allianceauth.checks.A003",
+            )
+        )

    return errors


@register()
 def system_package_mysql(app_configs, **kwargs) -> List[CheckMessage]:
+    """
+    Check that MySQL is a supported version
+
+    :param app_configs:
+    :type app_configs:
+    :param kwargs:
+    :type kwargs:
+    :return:
+    :rtype:
+    """
+
+    mysql_quick_guide_link = "https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/"
+
    errors: List[CheckMessage] = []

    for connection in db.connections.all():
        if connection.vendor == "mysql":
            try:
-                mysql_version = Pep440Version(".".join(str(i) for i in connection.mysql_version))
+                mysql_version = Pep440Version(
+                    ".".join(str(i) for i in connection.mysql_version)
+                )
            except InvalidVersion:
                errors.append(Warning("Unable to confirm MySQL Version"))
+
                return errors

-            # MySQL 8
-            if mysql_version.major == 8 and mysql_version.minor == 4 and timezone.now() > timezone.datetime(year=2032, month=4, day=30, tzinfo=timezone.utc):
-                errors.append(Error(f"MySQL {mysql_version.public} EOL", hint="https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/", id="allianceauth.checks.A004"))
-            elif mysql_version.major == 8 and mysql_version.minor == 3:
-                errors.append(Warning(f"MySQL {mysql_version.public} Non LTS", hint="https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/", id="allianceauth.checks.A005"))
-            elif mysql_version.major == 8 and mysql_version.minor == 2:
-                errors.append(Warning(f"MySQL {mysql_version.public} Non LTS", hint="https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/", id="allianceauth.checks.A006"))
-            elif mysql_version.major == 8 and mysql_version.minor == 1:
-                errors.append(Error(f"MySQL {mysql_version.public} EOL", hint="https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/", id="allianceauth.checks.A007"))
-            elif mysql_version.major == 8 and mysql_version.minor == 0 and timezone.now() > timezone.datetime(year=2026, month=4, day=30, tzinfo=timezone.utc):
-                errors.append(Error(f"MySQL {mysql_version.public} EOL", hint="https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/", id="allianceauth.checks.A008"))
-            elif mysql_version.major < 8:  # This will also catch Mariadb 5.x
-                errors.append(Error(f"MySQL or MariaDB {mysql_version.public} EOL", hint="https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/", id="allianceauth.checks.A009"))
+            #  MySQL 8
+            if mysql_version.major == 8:
+                if mysql_version.minor == 4 and timezone.now() > timezone.datetime(
+                    year=2032, month=4, day=30, tzinfo=timezone.utc
+                ):
+                    errors.append(
+                        Error(
+                            msg=f"MySQL {mysql_version.public} EOL",
+                            hint=mysql_quick_guide_link,
+                            id="allianceauth.checks.A004",
+                        )
+                    )
+                elif mysql_version.minor == 3:
+                    errors.append(
+                        Warning(
+                            msg=f"MySQL {mysql_version.public} Non LTS",
+                            hint=mysql_quick_guide_link,
+                            id="allianceauth.checks.A005",
+                        )
+                    )
+                elif mysql_version.minor == 2:
+                    errors.append(
+                        Warning(
+                            msg=f"MySQL {mysql_version.public} Non LTS",
+                            hint=mysql_quick_guide_link,
+                            id="allianceauth.checks.A006",
+                        )
+                    )
+                elif mysql_version.minor == 1:
+                    errors.append(
+                        Error(
+                            msg=f"MySQL {mysql_version.public} EOL",
+                            hint=mysql_quick_guide_link,
+                            id="allianceauth.checks.A007",
+                        )
+                    )
+                elif mysql_version.minor == 0 and timezone.now() > timezone.datetime(
+                    year=2026, month=4, day=30, tzinfo=timezone.utc
+                ):
+                    errors.append(
+                        Error(
+                            msg=f"MySQL {mysql_version.public} EOL",
+                            hint=mysql_quick_guide_link,
+                            id="allianceauth.checks.A008",
+                        )
+                    )
+
+            # MySQL below 8
+            # This will also catch Mariadb 5.x
+            elif mysql_version.major < 8:
+                errors.append(
+                    Error(
+                        msg=f"MySQL or MariaDB {mysql_version.public} EOL",
+                        hint=mysql_quick_guide_link,
+                        id="allianceauth.checks.A009",
+                    )
+                )
+
    return errors


@register()
 def system_package_mariadb(app_configs, **kwargs) -> List[CheckMessage]:
+    """
+    Check that MariaDB is a supported version
+
+    :param app_configs:
+    :type app_configs:
+    :param kwargs:
+    :type kwargs:
+    :return:
+    :rtype:
+    """
+
+    mariadb_download_link = "https://mariadb.org/download/?t=repo-config"
+
    errors: List[CheckMessage] = []

    for connection in db.connections.all():
-        if connection.vendor == "mysql":  # Still to find a way to determine MySQL vs MariaDB
+        # TODO: Find a way to determine MySQL vs. MariaDB
+        if connection.vendor == "mysql":
            try:
-                mariadb_version = Pep440Version(".".join(str(i) for i in connection.mysql_version))
+                mariadb_version = Pep440Version(
+                    ".".join(str(i) for i in connection.mysql_version)
+                )
            except InvalidVersion:
                errors.append(Warning("Unable to confirm MariaDB Version"))
+
                return errors

            # MariaDB 11
-            if mariadb_version.major == 11 and mariadb_version.minor == 4 and timezone.now() > timezone.datetime(year=2029, month=5, day=19, tzinfo=timezone.utc):
-                errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A010"))
-            elif mariadb_version.major == 11 and mariadb_version.minor == 2:
-                errors.append(Warning(f"MariaDB {mariadb_version.public} Non LTS", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A018"))
-                if timezone.now() > timezone.datetime(year=2024, month=11, day=21, tzinfo=timezone.utc):
-                    errors.append(Error(f"MariaDB {mariadb_version.public}  EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A011"))
-            elif mariadb_version.major == 11 and mariadb_version.minor == 1:
-                errors.append(Warning(f"MariaDB {mariadb_version.public} Non LTS", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A019"))
-                if timezone.now() > timezone.datetime(year=2024, month=8, day=21, tzinfo=timezone.utc):
-                    errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A012"))
-            elif mariadb_version.major == 11 and mariadb_version.minor in [0, 3]:  # Demote versions down here once EOL
-                errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config.", id="allianceauth.checks.A013"))
+            if mariadb_version.major == 11:
+                if mariadb_version.minor == 4 and timezone.now() > timezone.datetime(
+                    year=2029, month=5, day=19, tzinfo=timezone.utc
+                ):
+                    errors.append(
+                        Error(
+                            msg=f"MariaDB {mariadb_version.public} EOL",
+                            hint=mariadb_download_link,
+                            id="allianceauth.checks.A010",
+                        )
+                    )
+                elif mariadb_version.minor == 2:
+                    errors.append(
+                        Warning(
+                            msg=f"MariaDB {mariadb_version.public} Non LTS",
+                            hint=mariadb_download_link,
+                            id="allianceauth.checks.A018",
+                        )
+                    )
+
+                    if timezone.now() > timezone.datetime(
+                        year=2024, month=11, day=21, tzinfo=timezone.utc
+                    ):
+                        errors.append(
+                            Error(
+                                msg=f"MariaDB {mariadb_version.public} EOL",
+                                hint=mariadb_download_link,
+                                id="allianceauth.checks.A011",
+                            )
+                        )
+                elif mariadb_version.minor == 1:
+                    errors.append(
+                        Warning(
+                            msg=f"MariaDB {mariadb_version.public} Non LTS",
+                            hint=mariadb_download_link,
+                            id="allianceauth.checks.A019",
+                        )
+                    )
+
+                    if timezone.now() > timezone.datetime(
+                        year=2024, month=8, day=21, tzinfo=timezone.utc
+                    ):
+                        errors.append(
+                            Error(
+                                msg=f"MariaDB {mariadb_version.public} EOL",
+                                hint=mariadb_download_link,
+                                id="allianceauth.checks.A012",
+                            )
+                        )
+                # Demote versions down here once EOL
+                elif mariadb_version.minor in [0, 3]:
+                    errors.append(
+                        Error(
+                            msg=f"MariaDB {mariadb_version.public} EOL",
+                            hint=mariadb_download_link,
+                            id="allianceauth.checks.A013",
+                        )
+                    )

            # MariaDB 10
-            elif mariadb_version.major == 10 and mariadb_version.minor == 11 and timezone.now() > timezone.datetime(year=2028, month=2, day=10, tzinfo=timezone.utc):
-                errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config.", id="allianceauth.checks.A014"))
-            elif mariadb_version.major == 10 and mariadb_version.minor == 6 and timezone.now() > timezone.datetime(year=2026, month=7, day=6, tzinfo=timezone.utc):
-                errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A0015"))
-            elif mariadb_version.major == 10 and mariadb_version.minor == 5 and timezone.now() > timezone.datetime(year=2025, month=6, day=24, tzinfo=timezone.utc):
-                errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A016"))
-            elif mariadb_version.major == 10 and mariadb_version.minor in [0, 1, 2, 3, 4, 7, 9, 10]:  # Demote versions down here once EOL
-                errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A017"))
+            elif mariadb_version.major == 10:
+                if mariadb_version.minor == 11 and timezone.now() > timezone.datetime(
+                    year=2028, month=2, day=10, tzinfo=timezone.utc
+                ):
+                    errors.append(
+                        Error(
+                            msg=f"MariaDB {mariadb_version.public} EOL",
+                            hint=mariadb_download_link,
+                            id="allianceauth.checks.A014",
+                        )
+                    )
+                elif mariadb_version.minor == 6 and timezone.now() > timezone.datetime(
+                    year=2026, month=7, day=6, tzinfo=timezone.utc
+                ):
+                    errors.append(
+                        Error(
+                            msg=f"MariaDB {mariadb_version.public} EOL",
+                            hint=mariadb_download_link,
+                            id="allianceauth.checks.A0015",
+                        )
+                    )
+                elif mariadb_version.minor == 5 and timezone.now() > timezone.datetime(
+                    year=2025, month=6, day=24, tzinfo=timezone.utc
+                ):
+                    errors.append(
+                        Error(
+                            msg=f"MariaDB {mariadb_version.public} EOL",
+                            hint=mariadb_download_link,
+                            id="allianceauth.checks.A016",
+                        )
+                    )
+                # Demote versions down here once EOL
+                elif mariadb_version.minor in [0, 1, 2, 3, 4, 7, 9, 10]:
+                    errors.append(
+                        Error(
+                            msg=f"MariaDB {mariadb_version.public} EOL",
+                            hint=mariadb_download_link,
+                            id="allianceauth.checks.A017",
+                        )
+                    )

    return errors


@register()
 def system_package_sqlite(app_configs, **kwargs) -> List[CheckMessage]:
+    """
+    Check that SQLite is a supported version
+
+    :param app_configs:
+    :type app_configs:
+    :param kwargs:
+    :type kwargs:
+    :return:
+    :rtype:
+    """
+
    errors: List[CheckMessage] = []
+
    for connection in db.connections.all():
        if connection.vendor == "sqlite":
            try:
-                sqlite_version = Pep440Version(".".join(str(i) for i in sqlite_version_info))
+                sqlite_version = Pep440Version(
+                    ".".join(str(i) for i in sqlite_version_info)
+                )
            except InvalidVersion:
                errors.append(Warning("Unable to confirm SQLite Version"))
+
                return errors
            if sqlite_version.major == 3 and sqlite_version.minor < 27:
-                errors.append(Error(f"SQLite {sqlite_version.public} Unsupported by Django", hint="https://pkgs.org/download/sqlite3", id="allianceauth.checks.A020"))
+                errors.append(
+                    Error(
+                        msg=f"SQLite {sqlite_version.public} Unsupported by Django",
+                        hint="https://pkgs.org/download/sqlite3",
+                        id="allianceauth.checks.A020",
+                    )
+                )
+
    return errors


@register()
 def sql_settings(app_configs, **kwargs) -> List[CheckMessage]:
+    """
+    Check that SQL settings are correctly configured
+
+    :param app_configs:
+    :type app_configs:
+    :param kwargs:
+    :type kwargs:
+    :return:
+    :rtype:
+    """
+
    errors: List[CheckMessage] = []
+
    for connection in db.connections.all():
        if connection.vendor == "mysql":
            try:
                if connection.settings_dict["OPTIONS"]["charset"] != "utf8mb4":
-                    errors.append(Error(f"SQL Charset is not set to utf8mb4 DB:{connection.alias}", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8", id="allianceauth.checks.B001"))
+                    errors.append(
+                        Error(
+                            msg=f"SQL Charset is not set to utf8mb4 DB: {connection.alias}",
+                            hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8",
+                            id="allianceauth.checks.B001",
+                        )
+                    )
            except KeyError:
-                errors.append(Error(f"SQL Charset is not set to utf8mb4 DB:{connection.alias}", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8", id="allianceauth.checks.B001"))
+                errors.append(
+                    Error(
+                        msg=f"SQL Charset is not set to utf8mb4 DB: {connection.alias}",
+                        hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8",
+                        id="allianceauth.checks.B001",
+                    )
+                )

            # This hasn't actually been set on AA yet
            # try:
-            #     if connection.settings_dict["OPTIONS"]["collation"] != "utf8mb4_unicode_ci":
-            #         errors.append(Error(f"SQL Collation is not set to utf8mb4_unicode_ci DB:{connection.alias}", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8", id="allianceauth.checks.B001"))
+            #     if (
+            #         connection.settings_dict["OPTIONS"]["collation"]
+            #         != "utf8mb4_unicode_ci"
+            #     ):
+            #         errors.append(
+            #             Error(
+            #                 msg=f"SQL Collation is not set to utf8mb4_unicode_ci DB:{connection.alias}",
+            #                 hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8",
+            #                 id="allianceauth.checks.B001",
+            #             )
+            #         )
            # except KeyError:
-            #     errors.append(Error(f"SQL Collation is not set to utf8mb4_unicode_ci DB:{connection.alias}", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8", id="allianceauth.checks.B001"))
+            #     errors.append(
+            #         Error(
+            #             msg=f"SQL Collation is not set to utf8mb4_unicode_ci DB:{connection.alias}",
+            #             hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8",
+            #             id="allianceauth.checks.B001",
+            #         )
+            #     )

        # if connection.vendor == "sqlite":

@ -160,19 +497,57 @@ def sql_settings(app_configs, **kwargs) -> List[CheckMessage]:

@register()
 def celery_settings(app_configs, **kwargs) -> List[CheckMessage]:
+    """
+    Check that Celery settings are correctly configured
+
+    :param app_configs:
+    :type app_configs:
+    :param kwargs:
+    :type kwargs:
+    :return:
+    :rtype:
+    """
+
    errors: List[CheckMessage] = []

    try:
-        if current_app.conf.broker_transport_options != {'priority_steps': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], 'queue_order_strategy': 'priority'}:
-            errors.append(Error("Celery Priorities are not set correctly", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/8861ec0a61790eca0261f1adc1cc04ca5f243cbc", id="allianceauth.checks.B003"))
+        if current_app.conf.broker_transport_options != {
+            "priority_steps": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
+            "queue_order_strategy": "priority",
+        }:
+            errors.append(
+                Error(
+                    msg="Celery Priorities are not set correctly",
+                    hint="https://gitlab.com/allianceauth/allianceauth/-/commit/8861ec0a61790eca0261f1adc1cc04ca5f243cbc",
+                    id="allianceauth.checks.B003",
+                )
+            )
    except KeyError:
-        errors.append(Error("Celery Priorities are not set", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/8861ec0a61790eca0261f1adc1cc04ca5f243cbc", id="allianceauth.checks.B003"))
+        errors.append(
+            Error(
+                msg="Celery Priorities are not set",
+                hint="https://gitlab.com/allianceauth/allianceauth/-/commit/8861ec0a61790eca0261f1adc1cc04ca5f243cbc",
+                id="allianceauth.checks.B003",
+            )
+        )

    try:
-        if current_app.conf.broker_connection_retry_on_startup != True:
-            errors.append(Error("Celery broker_connection_retry_on_startup not set correctly", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/380c41400b535447839e5552df2410af35a75280", id="allianceauth.checks.B004"))
+        if not current_app.conf.broker_connection_retry_on_startup:
+            errors.append(
+                Error(
+                    msg="Celery broker_connection_retry_on_startup not set correctly",
+                    hint="https://gitlab.com/allianceauth/allianceauth/-/commit/380c41400b535447839e5552df2410af35a75280",
+                    id="allianceauth.checks.B004",
+                )
+            )
    except KeyError:
-        errors.append(Error("Celery broker_connection_retry_on_startup not set", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/380c41400b535447839e5552df2410af35a75280", id="allianceauth.checks.B004"))
+        errors.append(
+            Error(
+                msg="Celery broker_connection_retry_on_startup not set",
+                hint="https://gitlab.com/allianceauth/allianceauth/-/commit/380c41400b535447839e5552df2410af35a75280",
+                id="allianceauth.checks.B004",
+            )
+        )

    return errors

--- a/allianceauth/corputils/apps.py
+++ b/allianceauth/corputils/apps.py
@ -1,6 +1,8 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _


 class CorpUtilsConfig(AppConfig):
    name = 'allianceauth.corputils'
    label = 'corputils'
+    verbose_name = _('Corporation Stats')
--- a/allianceauth/corputils/models.py
+++ b/allianceauth/corputils/models.py
@ -1,5 +1,6 @@
 import logging
 import os
+from typing import ClassVar

 from allianceauth.authentication.models import CharacterOwnership, UserProfile
 from bravado.exception import HTTPForbidden
@ -40,9 +41,9 @@ class CorpStats(models.Model):
        verbose_name = "corp stats"
        verbose_name_plural = "corp stats"

-    objects = CorpStatsManager()
+    objects: ClassVar[CorpStatsManager] = CorpStatsManager()

-    def __str__(self):
+    def __str__(self) -> str:
        return f"{self.__class__.__name__} for {self.corp}"

    def update(self):
--- a/allianceauth/corputils/templates/corputils/corpstats.html
+++ b/allianceauth/corputils/templates/corputils/corpstats.html
@ -138,7 +138,7 @@
                                                                <td style="width: 30%;">{{ alt.corporation_name }}</td>
                                                                <td style="width: 30%;">{{ alt.alliance_name|default_if_none:"" }}</td>
                                                                <td style="width: 5%;">
-                                                                    <a href="https://zkillboard.com/character/{{ alt.character_id }}/" class="badge bg-danger" target="_blank">
+                                                                    <a href="https://zkillboard.com/character/{{ alt.character_id }}/" class="badge text-bg-danger" target="_blank">
                                                                        {% translate "Killboard" %}
                                                                    </a>
                                                                </td>
@ -175,7 +175,7 @@
                                                <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member }}"></td>
                                                <td>{{ member }}</td>
                                                <td>
-                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge bg-danger" target="_blank">{% translate "Killboard" %}</a>
+                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge text-bg-danger" target="_blank">{% translate "Killboard" %}</a>
                                                </td>
                                                <td>{{ member.character_ownership.user.profile.main_character.character_name }}</td>
                                                <td>{{ member.character_ownership.user.profile.main_character.corporation_name }}</td>
@ -188,7 +188,7 @@
                                                <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member.character_name }}"></td>
                                                <td>{{ member.character_name }}</td>
                                                <td>
-                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge bg-danger" target="_blank">{% translate "Killboard" %}</a>
+                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge text-bg-danger" target="_blank">{% translate "Killboard" %}</a>
                                                </td>
                                                <td></td>
                                                <td></td>
@ -219,7 +219,7 @@
                                                <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member.character_name }}"></td>
                                                <td>{{ member.character_name }}</td>
                                                <td>
-                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge bg-danger" target="_blank">
+                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge text-bg-danger" target="_blank">
                                                        {% translate "Killboard" %}
                                                    </a>
                                                </td>
--- a/allianceauth/corputils/templates/corputils/search.html
+++ b/allianceauth/corputils/templates/corputils/search.html
@ -28,7 +28,7 @@
                            <td><img src="{{ result.1.portrait_url }}" class="img-circle" alt="{{ result.1.character_name }}"></td>
                            <td>{{ result.1.character_name }}</td>
                            <td >{{ result.0.corp.corporation_name }}</td>
-                            <td><a href="https://zkillboard.com/character/{{ result.1.character_id }}/" class="badge bg-danger" target="_blank">{% translate "Killboard" %}</a></td>
+                            <td><a href="https://zkillboard.com/character/{{ result.1.character_id }}/" class="badge text-bg-danger" target="_blank">{% translate "Killboard" %}</a></td>
                            <td>{{ result.1.main_character.character_name }}</td>
                            <td>{{ result.1.main_character.corporation_name }}</td>
                            <td>{{ result.1.main_character.alliance_name }}</td>
--- a/allianceauth/crontab/apps.py
+++ b/allianceauth/crontab/apps.py
@ -3,6 +3,7 @@ Crontab App Config
 """

 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _


 class CrontabConfig(AppConfig):
@ -12,3 +13,4 @@ class CrontabConfig(AppConfig):

    name = "allianceauth.crontab"
    label = "crontab"
+    verbose_name = _("Crontab")
--- a/allianceauth/crontab/migrations/0001_initial.py
+++ b/allianceauth/crontab/migrations/0001_initial.py
@ -0,0 +1,29 @@
+# Generated by Django 4.2.16 on 2025-01-20 06:16
+
+import allianceauth.crontab.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CronOffset',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('minute', models.FloatField(default=allianceauth.crontab.models.random_default, verbose_name='Minute Offset')),
+                ('hour', models.FloatField(default=allianceauth.crontab.models.random_default, verbose_name='Hour Offset')),
+                ('day_of_month', models.FloatField(default=allianceauth.crontab.models.random_default, verbose_name='Day of Month Offset')),
+                ('month_of_year', models.FloatField(default=allianceauth.crontab.models.random_default, verbose_name='Month of Year Offset')),
+                ('day_of_week', models.FloatField(default=allianceauth.crontab.models.random_default, verbose_name='Day of Week Offset')),
+            ],
+            options={
+                'verbose_name': 'Cron Offsets',
+            },
+        ),
+    ]
--- a/allianceauth/crontab/migrations/init.py
+++ b/allianceauth/crontab/migrations/init.py
--- a/allianceauth/crontab/schedulers.py
+++ b/allianceauth/crontab/schedulers.py
@ -20,6 +20,10 @@ class OffsetDatabaseScheduler(DatabaseScheduler):
    Takes the Celery Schedule from local.py and applies our AA Framework Cron Offset, if apply_offset is true
    Otherwise it passes it through as normal
    """
+
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
+
    def update_from_dict(self, mapping):
        s = {}

@ -36,10 +40,11 @@ class OffsetDatabaseScheduler(DatabaseScheduler):

        for name, entry_fields in mapping.items():
            try:
-                apply_offset = entry_fields.pop("apply_offset", False)
+                apply_offset = entry_fields.pop("apply_offset", False)  # Ensure this pops before django tries to save to ORM
                entry = self.Entry.from_entry(name, app=self.app, **entry_fields)

-                if entry.model.enabled and apply_offset:
+                if apply_offset:
+                    entry_fields.update({"apply_offset": apply_offset})  # Reapply this as its gets pulled from config inconsistently.
                    schedule_obj = entry.schedule
                    if isinstance(schedule_obj, schedules.crontab):
                        offset_cs = CrontabSchedule.from_schedule(offset_cron(schedule_obj))
@ -51,11 +56,13 @@ class OffsetDatabaseScheduler(DatabaseScheduler):
                            day_of_week=offset_cs.day_of_week,
                            timezone=offset_cs.timezone,
                        )
+                        entry.schedule = offset_cron(schedule_obj)  # This gets passed into Celery Beats Memory, important to keep it in sync with the model/DB
                        entry.model.crontab = offset_cs
                        entry.model.save()
                        logger.debug(f"Offset applied for '{name}' due to 'apply_offset' = True.")

-                s[name] = entry
+                if entry.model.enabled:
+                    s[name] = entry

            except Exception as e:
                logger.exception("Error updating schedule for %s: %r", name, e)
--- a/allianceauth/crontab/utils.py
+++ b/allianceauth/crontab/utils.py
@ -19,8 +19,17 @@ def offset_cron(schedule: crontab) -> crontab:

    try:
        cron_offset = CronOffset.get_solo()
-        new_minute = [(m + (round(60 * cron_offset.minute))) % 60 for m in schedule.minute]
-        new_hour = [(m + (round(24 * cron_offset.hour))) % 24 for m in schedule.hour]
+
+        # Stops this shit from happening 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23
+        # It is only cosmetic, but still annoying
+        if schedule._orig_minute == '*':
+            new_minute = '*'
+        else:
+            new_minute = [(m + (round(60 * cron_offset.minute))) % 60 for m in schedule.minute]
+        if schedule._orig_hour == '*':
+            new_hour = '*'
+        else:
+            new_hour = [(m + (round(24 * cron_offset.hour))) % 24 for m in schedule.hour]

        return crontab(
            minute=",".join(str(m) for m in sorted(new_minute)),
--- a/allianceauth/eveonline/apps.py
+++ b/allianceauth/eveonline/apps.py
@ -1,6 +1,8 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _


 class EveonlineConfig(AppConfig):
    name = 'allianceauth.eveonline'
    label = 'eveonline'
+    verbose_name = _('EVE Online')
--- a/allianceauth/eveonline/autogroups/apps.py
+++ b/allianceauth/eveonline/autogroups/apps.py
@ -1,9 +1,11 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _


 class EveAutogroupsConfig(AppConfig):
    name = 'allianceauth.eveonline.autogroups'
    label = 'eve_autogroups'
+    verbose_name = _('EVE Online Autogroups')

    def ready(self):
        import allianceauth.eveonline.autogroups.signals
--- a/allianceauth/eveonline/autogroups/models.py
+++ b/allianceauth/eveonline/autogroups/models.py
@ -1,4 +1,5 @@
 import logging
+from typing import ClassVar
 from django.db import models, transaction
 from django.contrib.auth.models import Group, User
 from django.core.exceptions import ObjectDoesNotExist
@ -38,13 +39,13 @@ class AutogroupsConfigManager(models.Manager):
        """
        if state is None:
            state = user.profile.state
-        for config in self.filter(states=state):
-            # grant user new groups for their state
-            config.update_group_membership_for_user(user)
        for config in self.exclude(states=state):
            # ensure user does not have groups from previous state
            config.remove_user_from_alliance_groups(user)
            config.remove_user_from_corp_groups(user)
+        for config in self.filter(states=state):
+            # grant user new groups for their state
+            config.update_group_membership_for_user(user)


 class AutogroupsConfig(models.Model):
@ -78,7 +79,7 @@ class AutogroupsConfig(models.Model):
        max_length=10, default='', blank=True,
        help_text='Any spaces in the group name will be replaced with this.')

-    objects = AutogroupsConfigManager()
+    objects: ClassVar[AutogroupsConfigManager] = AutogroupsConfigManager()

    def __init__(self, *args, **kwargs):
        super().__init__(*args, **kwargs)
--- a/allianceauth/eveonline/autogroups/tests/test_managers.py
+++ b/allianceauth/eveonline/autogroups/tests/test_managers.py
@ -1,3 +1,4 @@
+from allianceauth.eveonline.models import EveCorporationInfo
 from django.test import TestCase
 from allianceauth.tests.auth_utils import AuthUtils

@ -73,3 +74,51 @@ class AutogroupsConfigManagerTestCase(TestCase):
        AutogroupsConfig.objects.update_groups_for_user(member)

        self.assertTrue(update_groups.called)
+
+    def test_update_group_membership_corp_in_two_configs(self):
+        # given
+        member = AuthUtils.create_member('test member')
+        AuthUtils.add_main_character_2(
+            member,
+            character_id='1234',
+            name='test character',
+            corp_id='2345',
+            corp_name='corp name',
+            corp_ticker='TIKK',
+
+        )
+
+        corp = EveCorporationInfo.objects.create(
+            corporation_id='2345',
+            corporation_name='corp name',
+            corporation_ticker='TIKK',
+            member_count=10,
+        )
+
+        member_state = AuthUtils.get_member_state()
+        member_config = AutogroupsConfig.objects.create(corp_groups=True)
+        member_config.states.add(member_state)
+        blue_state = AuthUtils.get_blue_state()
+        blue_state.member_corporations.add(corp)
+        blue_config = AutogroupsConfig.objects.create(corp_groups=True)
+        blue_config.states.add(blue_state)
+
+        member.profile.state = blue_state
+        member.profile.save()
+
+        AutogroupsConfig.objects.update_groups_for_user(member)
+
+        # Checks before test that the role is correctly applied
+        group = blue_config.get_corp_group(corp)
+        self.assertIn(group, member.groups.all())
+
+        # when
+        blue_state.member_corporations.remove(corp)
+        member_state.member_corporations.add(corp)
+        member.profile.state = member_state
+        member.profile.save()
+
+        # then
+        AutogroupsConfig.objects.update_groups_for_user(member)
+        group = member_config.get_corp_group(corp)
+        self.assertIn(group, member.groups.all())
--- a/allianceauth/eveonline/managers.py
+++ b/allianceauth/eveonline/managers.py
@ -14,10 +14,20 @@ class EveCharacterProviderManager:
 class EveCharacterManager(models.Manager):
    provider = EveCharacterProviderManager()

-    def create_character(self, character_id):
+    def exclude_biomassed(self):
+        """
+        Get a queryset of EveCharacter objects, excluding the "Doomheim" corporation (1000001).
+
+        :return:
+        :rtype:
+        """
+
+        return self.exclude(corporation_id=1000001)
+
+    def create_character(self, character_id) -> models.Model:
        return self.create_character_obj(self.provider.get_character(character_id))

-    def create_character_obj(self, character: providers.Character):
+    def create_character_obj(self, character: providers.Character) -> models.Model:
        return self.create(
            character_id=character.id,
            character_name=character.name,
--- a/allianceauth/eveonline/models.py
+++ b/allianceauth/eveonline/models.py
@ -1,5 +1,5 @@
 import logging
-from typing import Union
+from typing import ClassVar, Union

 from django.core.exceptions import ObjectDoesNotExist
 from django.db import models
@ -75,8 +75,8 @@ class EveAllianceInfo(models.Model):
    alliance_ticker = models.CharField(max_length=254)
    executor_corp_id = models.PositiveIntegerField()

-    objects = EveAllianceManager()
-    provider = EveAllianceProviderManager()
+    objects: ClassVar[EveAllianceManager] = EveAllianceManager()
+    provider: ClassVar[EveAllianceProviderManager] = EveAllianceProviderManager()

    class Meta:
        indexes = [models.Index(fields=['executor_corp_id',])]
@ -147,7 +147,7 @@ class EveCorporationInfo(models.Model):
        EveAllianceInfo, blank=True, null=True, on_delete=models.SET_NULL
    )

-    objects = EveCorporationManager()
+    objects: ClassVar[EveCorporationManager] = EveCorporationManager()
    provider = EveCorporationProviderManager()

    class Meta:
@ -214,7 +214,7 @@ class EveCharacter(models.Model):
    faction_id = models.PositiveIntegerField(blank=True, null=True, default=None)
    faction_name = models.CharField(max_length=254, blank=True, null=True, default='')

-    objects = EveCharacterManager()
+    objects: ClassVar[EveCharacterManager] = EveCharacterManager()
    provider = EveCharacterProviderManager()

    class Meta:
--- a/allianceauth/eveonline/tests/test_providers.py
+++ b/allianceauth/eveonline/tests/test_providers.py
@ -723,5 +723,5 @@ class TestEveSwaggerProvider(TestCase):
        my_client = my_provider.client
        operation = my_client.Universe.get_universe_factions()
        self.assertEqual(
-            operation.future.request.headers['User-Agent'], 'allianceauth v1.0.0'
+            operation.future.request.headers['User-Agent'], 'allianceauth v1.0.0 dummy@example.net'
        )
--- a/allianceauth/fleetactivitytracking/apps.py
+++ b/allianceauth/fleetactivitytracking/apps.py
@ -1,6 +1,8 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _


 class FatConfig(AppConfig):
    name = 'allianceauth.fleetactivitytracking'
    label = 'fleetactivitytracking'
+    verbose_name = _('Fleet Activity Tracking')
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html
@ -36,7 +36,7 @@
                        <th class="text-center">{% translate "Character" %}</th>
                        <th class="text-center">{% translate "System" %}</th>
                        <th class="text-center">{% translate "Ship" %}</th>
-                        <th class="text-center">{% translate "Eve Time" %}</th>
+                        <th class="text-center">{% translate "EVE time" %}</th>
                        <th></th>
                    </tr>

--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
@ -72,7 +72,7 @@
                        <tr>
                            <th class="text-center">{% translate "Fleet" %}</th>
                            <th class="text-center">{% translate "Creator" %}</th>
-                            <th class="text-center">{% translate "Eve Time" %}</th>
+                            <th class="text-center">{% translate "EVE time" %}</th>
                            <th class="text-center">{% translate "Duration" %}</th>
                            <th class="text-center">{% translate "Edit" %}</th>
                        </tr>
@ -80,7 +80,7 @@
                        {% for link in created_fats %}
                            <tr>
                                <td class="text-center">
-                                    <a href="{% url 'fatlink:click' link.hash %}" class="badge bg-primary">
+                                    <a href="{% url 'fatlink:click' link.hash %}" class="badge text-bg-primary">
                                        {{ link.fleet }}
                                    </a>
                                </td>
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
@ -41,7 +41,7 @@
                        <th scope="col" class="text-center">{% translate "Character" %}</th>
                        <th scope="col" class="text-center">{% translate "System" %}</th>
                        <th scope="col" class="text-center">{% translate "Ship" %}</th>
-                        <th scope="col" class="text-center">{% translate "Eve Time" %}</th>
+                        <th scope="col" class="text-center">{% translate "EVE time" %}</th>
                    </tr>

                    {% for fat in fats %}
@ -89,7 +89,7 @@
                            <th scope="col" class="text-center">{% translate "Name" %}</th>
                            <th scope="col" class="text-center">{% translate "Creator" %}</th>
                            <th scope="col" class="text-center">{% translate "Fleet" %}</th>
-                            <th scope="col" class="text-center">{% translate "Eve Time" %}</th>
+                            <th scope="col" class="text-center">{% translate "EVE time" %}</th>
                            <th scope="col" class="text-center">{% translate "Duration" %}</th>
                            <th scope="col" class="text-center">{% translate "Edit" %}</th>
                        </tr>
@ -97,7 +97,7 @@
                        {% for link in fatlinks %}
                            <tr>
                                <td class="text-center">
-                                    <a href="{% url 'fatlink:click' link.hash %}" class="badge bg-primary">{{ link.fleet }}</a>
+                                    <a href="{% url 'fatlink:click' link.hash %}" class="badge text-bg-primary">{{ link.fleet }}</a>
                                </td>
                                <td class="text-center">{{ link.creator.username }}</td>
                                <td class="text-center">{{ link.fleet }}</td>
--- a/allianceauth/framework/api/user.py
+++ b/allianceauth/framework/api/user.py
@ -10,24 +10,39 @@ from allianceauth.authentication.models import CharacterOwnership
 from allianceauth.eveonline.models import EveCharacter


-def get_all_characters_from_user(user: User) -> list:
+def get_all_characters_from_user(user: User, main_first: bool = False) -> list:
    """
-    Get all characters from a user or an empty list
-    when no characters are found for the user or the user is None
+    Get all characters from a user
+    This function retrieves all characters associated with a given user, optionally ordering them
+    with the main character first.
+    If the user is None, an empty list is returned.

-    :param user:
-    :type user:
-    :return:
-    :rtype:
+    :param user: The user whose characters are to be retrieved
+    :type user: User
+    :param main_first: If True, the main character will be listed first
+    :type main_first: bool
+    :return: A list of EveCharacter objects associated with the user
+    :rtype: list[EveCharacter]
    """

    if user is None:
        return []

    try:
-        characters = [
-            char.character for char in CharacterOwnership.objects.filter(user=user)
-        ]
+        if main_first:
+            characters = [
+                char.character
+                for char in CharacterOwnership.objects.filter(user=user).order_by(
+                    "-character__userprofile", "character__character_name"
+                )
+            ]
+        else:
+            characters = [
+                char.character
+                for char in CharacterOwnership.objects.filter(user=user).order_by(
+                    "character__character_name"
+                )
+            ]
    except AttributeError:
        return []

--- a/allianceauth/framework/apps.py
+++ b/allianceauth/framework/apps.py
@ -3,6 +3,7 @@ Framework App Config
 """

 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _


 class FrameworkConfig(AppConfig):
@ -12,3 +13,4 @@ class FrameworkConfig(AppConfig):

    name = "allianceauth.framework"
    label = "framework"
+    verbose_name = _("Framework")
--- a/allianceauth/framework/static/allianceauth/framework/css/auth-framework.css
+++ b/allianceauth/framework/static/allianceauth/framework/css/auth-framework.css
@ -5,6 +5,24 @@
 * to be used throughout Alliance Auth and its Community Apps
 */

+/* General
+------------------------------------------------------------------------------------- */
+@media all {
+    .navbar-toggler.collapsed {
+        transform: rotate(180deg);
+    }
+
+    ul#nav-right:has(li) + ul#nav-right-character-control > li:first-child {
+        display: list-item !important;
+    }
+}
+
+@media all and (max-width: 991px) {
+    ul#nav-left:has(li) + ul#nav-right + ul#nav-right-character-control > li:first-child {
+        display: list-item !important;
+    }
+}
+
 /* Bootstrap fixes
 ------------------------------------------------------------------------------------- */
@media all {
@ -49,14 +67,14 @@
    }

    /* Chevron icons */
-    #sidebar-menu [data-bs-toggle="collapse"] > i.fa-chevron-down,
-    #sidebar-menu [data-bs-toggle="collapse"].collapsed > i.fa-chevron-right {
+    #sidebar-menu span[data-bs-toggle="collapse"][aria-expanded="true"] > i.fa-chevron-down,
+    #sidebar-menu span[data-bs-toggle="collapse"][aria-expanded="false"] > i.fa-chevron-right {
        display: block;
        width: 16px;
    }

-    #sidebar-menu [data-bs-toggle="collapse"] > i.fa-chevron-right,
-    #sidebar-menu [data-bs-toggle="collapse"].collapsed > i.fa-chevron-down {
+    #sidebar-menu span[data-bs-toggle="collapse"][aria-expanded="true"] > i.fa-chevron-right,
+    #sidebar-menu span[data-bs-toggle="collapse"][aria-expanded="false"] > i.fa-chevron-down {
        display: none;
    }
 }
--- a/allianceauth/framework/staticfiles/storage.py
+++ b/allianceauth/framework/staticfiles/storage.py
@ -0,0 +1,105 @@
+"""
+Custom static files storage for Alliance Auth.
+
+This module defines a custom static files storage class for
+Alliance Auth, named `AaManifestStaticFilesStorage`.
+
+Using `ManifestStaticFilesStorage` will give us a hashed name for
+our static files, which is useful for cache busting.
+
+This storage class extends Django's `ManifestStaticFilesStorage` to ignore missing files,
+which the original class does not handle, and log them in debug mode.
+It is useful for handling cases where static files may not exist, such as when a
+CSS file references a background image that is not present in the static files directory.
+
+With debug mode enabled, it will print a message for each missing file when running `collectstatic`,
+which can help identify issues with static file references during development.
+"""
+
+from django.conf import settings
+from django.contrib.staticfiles.storage import ManifestStaticFilesStorage
+
+
+class AaManifestStaticFilesStorage(ManifestStaticFilesStorage):
+    """
+    Custom static files storage that ignores missing files.
+    """
+
+    @classmethod
+    def _cleanup_name(cls, name: str) -> str:
+        """
+        Clean up the name by removing quotes.
+        This method is used to ensure that the name does not contain any quotes,
+        which can cause issues with file paths.
+
+        :param name: The name of the static file.
+        :type name: str
+        :return: The cleaned-up name without quotes.
+        :rtype: str
+        """
+
+        # Remove quotes from the name
+        return name.replace('"', "").replace("'", "")
+
+    def __init__(self, *args, **kwargs):
+        """
+        Initialize the static files storage, ignoring missing files.
+
+        :param args:
+        :type args:
+        :param kwargs:
+        :type kwargs:
+        """
+
+        self.missing_files = []
+
+        super().__init__(*args, **kwargs)
+
+    def hashed_name(self, name, content=None, filename=None):
+        """
+        Generate a hashed name for the given static file, ignoring missing files.
+
+        Ignore missing files, e.g. non-existent background image referenced from css.
+        Returns the original filename if the referenced file doesn't exist.
+
+        :param name: The name of the static file to hash.
+        :type name: str
+        :param content: The content of the static file, if available.
+        :type content: bytes | None
+        :param filename: The original filename of the static file, if available.
+        :type filename: str | None
+        :return: The hashed name of the static file, or the original name if the file is missing.
+        :rtype: str
+        """
+
+        try:
+            clean_name = self._cleanup_name(name)
+
+            return super().hashed_name(clean_name, content, filename)
+        except ValueError as e:
+            if settings.DEBUG:
+                # In debug mode, we log the missing file message
+                message = e.args[0].split(" with ")[0]
+                self.missing_files.append(message)
+                # print(f'\x1b[0;30;41m{message}\x1b[0m')
+
+            return name
+
+    def post_process(self, *args, **kwargs):
+        """
+        Post-process the static files, printing any missing files in debug mode.
+
+        :param args:
+        :type args:
+        :param kwargs:
+        :type kwargs:
+        :return:
+        :rtype:
+        """
+
+        yield from super().post_process(*args, **kwargs)
+
+        if settings.DEBUG:
+            # In debug mode, print the missing files
+            for message in sorted(set(self.missing_files)):
+                print(f"\x1b[0;30;41m{message}\x1b[0m")
--- a/allianceauth/framework/templates/framework/header/page-header.html
+++ b/allianceauth/framework/templates/framework/header/page-header.html
@ -2,12 +2,14 @@
 {#    {% include "framework/header/page-header.html" with title="Foobar" subtitle="Barfoo" %}#}

 {% if title %}
-    <h1 class="page-header text-center mb-3">
-        {{ title }}
+    <header class="aa-page-header mb-3">
+        <h1 class="page-header text-center">
+            {{ title }}

-        {% if subtitle %}
-            <br>
-            <small class="text-muted">{{ subtitle }}</small>
-        {% endif %}
-    </h1>
+            {% if subtitle %}
+                <br>
+                <small class="text-muted">{{ subtitle }}</small>
+            {% endif %}
+        </h1>
+    </header>
 {% endif %}
--- a/allianceauth/groupmanagement/apps.py
+++ b/allianceauth/groupmanagement/apps.py
@ -1,10 +1,11 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _


 class GroupManagementConfig(AppConfig):
    name = 'allianceauth.groupmanagement'
    label = 'groupmanagement'
-    verbose_name = 'Group Management'
+    verbose_name = _('Group Management')

    def ready(self):
        from . import signals  # noqa: F401
--- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html
@ -39,12 +39,12 @@

                            <td>
                                {% if group.authgroup.hidden %}
-                                    <span class="badge bg-info">{% translate "Hidden" %}</span>
+                                    <span class="badge text-bg-info">{% translate "Hidden" %}</span>
                                {% endif %}
                                {% if group.authgroup.open %}
-                                    <span class="badge bg-success">{% translate "Open" %}</span>
+                                    <span class="badge text-bg-success">{% translate "Open" %}</span>
                                {% else %}
-                                    <span class="badge bg-secondary">{% translate "Requestable" %}</span>
+                                    <span class="badge text-bg-secondary">{% translate "Requestable" %}</span>
                                {% endif %}
                            </td>

--- a/allianceauth/groupmanagement/templates/groupmanagement/groups.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/groups.html
@ -17,7 +17,7 @@
        <li class="nav-item">
            <a class="nav-link" href="{% url 'groupmanagement:management' %}">{% translate "Group Management" %}
                {% if req_count %}
-                    <span class="badge bg-secondary">{{ req_count }}</span>
+                    <span class="badge text-bg-secondary">{{ req_count }}</span>
                {% endif %}
            </a>
        </li>
@ -33,8 +33,8 @@
                    <th>{% translate "Description" %}</th>
                    <th>
                        {% translate "Leaders" %}<br>
-                        <span class="my-1 me-1 fw-lighter badge bg-primary">{% translate "User" %}</span>
-                        <span class="my-1 me-1 fw-lighter badge bg-secondary">{% translate "Group" %}</span>
+                        <span class="my-1 me-1 fw-lighter badge text-bg-primary">{% translate "User" %}</span>
+                        <span class="my-1 me-1 fw-lighter badge text-bg-secondary">{% translate "Group" %}</span>
                    </th>
                    <th></th>
                </tr>
@ -53,13 +53,13 @@
                            {% if g.group.authgroup.group_leaders.all.count %}
                                {% for leader in g.group.authgroup.group_leaders.all %}
                                    {% if leader.profile.main_character %}
-                                        <span class="my-1 me-1 badge bg-primary">{{leader.profile.main_character}}</span>
+                                        <span class="my-1 me-1 badge text-bg-primary">{{leader.profile.main_character}}</span>
                                    {% endif %}
                                {% endfor %}
                            {% endif %}
                            {% if g.group.authgroup.group_leader_groups.all.count %}
                                {% for group in g.group.authgroup.group_leader_groups.all %}
-                                    <span class="my-1 me-1 badge bg-secondary">{{group.name}}</span>
+                                    <span class="my-1 me-1 badge text-bg-secondary">{{group.name}}</span>
                                {% endfor %}
                            {% endif %}
                        </td>
--- a/allianceauth/groupmanagement/templates/groupmanagement/index.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/index.html
@ -19,7 +19,7 @@
            {% translate "Join Requests" %}

            {% if acceptrequests %}
-                <span class="badge bg-secondary">{{ acceptrequests|length }}</span>
+                <span class="badge text-bg-secondary">{{ acceptrequests|length }}</span>
            {% endif %}
        </a>
    </li>
@ -30,7 +30,7 @@
                {% translate "Leave Requests" %}

                {% if leaverequests %}
-                    <span class="badge bg-secondary">{{ leaverequests|length }}</span>
+                    <span class="badge text-bg-secondary">{{ leaverequests|length }}</span>
                {% endif %}
            </a>
        </li>
--- a/allianceauth/hrapplications/apps.py
+++ b/allianceauth/hrapplications/apps.py
@ -1,6 +1,8 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _


 class HRApplicationsConfig(AppConfig):
    name = 'allianceauth.hrapplications'
    label = 'hrapplications'
+    verbose_name = _('HR Applications')
--- a/allianceauth/hrapplications/models.py
+++ b/allianceauth/hrapplications/models.py
@ -1,3 +1,4 @@
+from typing import ClassVar
 from django.contrib.auth.models import User
 from django.db import models
 from sortedm2m.fields import SortedManyToManyField
@ -40,7 +41,7 @@ class Application(models.Model):
    reviewer_character = models.ForeignKey(EveCharacter, on_delete=models.SET_NULL, blank=True, null=True)
    created = models.DateTimeField(auto_now_add=True)

-    objects = ApplicationManager()
+    objects: ClassVar[ApplicationManager] = ApplicationManager()

    def __str__(self):
        return str(self.user) + " Application To " + str(self.form)
--- a/allianceauth/hrapplications/templates/hrapplications/management.html
+++ b/allianceauth/hrapplications/templates/hrapplications/management.html
@ -43,11 +43,11 @@
                                <td class="text-center">{{ personal_app.form.corp.corporation_name }}</td>
                                <td class="text-center">
                                    {% if personal_app.approved == None %}
-                                        <div class="badge bg-warning">{% translate "Pending" %}</div>
+                                        <div class="badge text-bg-warning">{% translate "Pending" %}</div>
                                    {% elif personal_app.approved == True %}
-                                        <div class="badge bg-success">{% translate "Approved" %}</div>
+                                        <div class="badge text-bg-success">{% translate "Approved" %}</div>
                                    {% else %}
-                                        <div class="badge bg-danger">{% translate "Rejected" %}</div>
+                                        <div class="badge text-bg-danger">{% translate "Rejected" %}</div>
                                    {% endif %}
                                </td>
                                <td class="text-center">
@ -133,14 +133,14 @@
                                            <td class="text-center">
                                                {% if app.approved == None %}
                                                    {% if app.reviewer_str %}
-                                                        <div class="badge bg-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
+                                                        <div class="badge text-bg-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
                                                    {% else %}
-                                                        <div class="badge bg-warning">{% translate "Pending" %}</div>
+                                                        <div class="badge text-bg-warning">{% translate "Pending" %}</div>
                                                    {% endif %}
                                                {% elif app.approved == True %}
-                                                    <div class="badge bg-success">{% translate "Approved" %}</div>
+                                                    <div class="badge text-bg-success">{% translate "Approved" %}</div>
                                                {% else %}
-                                                    <div class="badge bg-danger">{% translate "Rejected" %}</div>
+                                                    <div class="badge text-bg-danger">{% translate "Rejected" %}</div>
                                                {% endif %}
                                            </td>
                                            <td class="text-center">
@ -177,14 +177,14 @@
                                            <td class="text-center">
                                                {% if app.approved == None %}
                                                    {% if app.reviewer_str %}
-                                                        <div class="badge bg-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
+                                                        <div class="badge text-bg-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
                                                    {% else %}
-                                                        <div class="badge bg-warning">{% translate "Pending" %}</div>
+                                                        <div class="badge text-bg-warning">{% translate "Pending" %}</div>
                                                    {% endif %}
                                                {% elif app.approved == True %}
-                                                    <div class="badge bg-success">{% translate "Approved" %}</div>
+                                                    <div class="badge text-bg-success">{% translate "Approved" %}</div>
                                                {% else %}
-                                                    <div class="badge bg-danger">{% translate "Rejected" %}</div>
+                                                    <div class="badge text-bg-danger">{% translate "Rejected" %}</div>
                                                {% endif %}
                                            </td>
                                            <td class="text-center">
--- a/allianceauth/hrapplications/templates/hrapplications/searchview.html
+++ b/allianceauth/hrapplications/templates/hrapplications/searchview.html
@ -43,11 +43,11 @@
                            <td>{{ app.form.corp }}</td>
                            <td class="text-center">
                                {% if app.approved == None %}
-                                    <div class="badge bg-warning">{% translate "Pending" %}</div>
+                                    <div class="badge text-bg-warning">{% translate "Pending" %}</div>
                                {% elif app.approved == True %}
-                                    <div class="badge bg-success">{% translate "Approved" %}</div>
+                                    <div class="badge text-bg-success">{% translate "Approved" %}</div>
                                {% else %}
-                                    <div class="badge bg-danger">{% translate "Rejected" %}</div>
+                                    <div class="badge text-bg-danger">{% translate "Rejected" %}</div>
                                {% endif %}
                            </td>
                            <td class="text-end">
--- a/allianceauth/hrapplications/templates/hrapplications/view.html
+++ b/allianceauth/hrapplications/templates/hrapplications/view.html
@ -31,7 +31,7 @@
        </div>

        <div class="card mb-3">
-            <div class="card-header bg-info">
+            <div class="card-header text-bg-info">
                <div class="card-title mb-0">{% translate "Applicant" %}</div>
            </div>

@ -50,7 +50,7 @@
        </div>

        <div class="card mb-3">
-            <div class="card-header bg-info">
+            <div class="card-header text-bg-info">
                <div class="card-title mb-0">{% translate "Characters" %}</div>
            </div>

--- a/allianceauth/locale/cs_CZ/LC_MESSAGES/django.mo
+++ b/allianceauth/locale/cs_CZ/LC_MESSAGES/django.mo
--- a/allianceauth/locale/cs_CZ/LC_MESSAGES/django.po
+++ b/allianceauth/locale/cs_CZ/LC_MESSAGES/django.po
--- a/allianceauth/locale/de/LC_MESSAGES/django.mo
+++ b/allianceauth/locale/de/LC_MESSAGES/django.mo
--- a/allianceauth/locale/de/LC_MESSAGES/django.po
+++ b/allianceauth/locale/de/LC_MESSAGES/django.po
--- a/allianceauth/locale/en/LC_MESSAGES/django.po
+++ b/allianceauth/locale/en/LC_MESSAGES/django.po
--- a/allianceauth/locale/es/LC_MESSAGES/django.mo
+++ b/allianceauth/locale/es/LC_MESSAGES/django.mo
--- a/allianceauth/locale/es/LC_MESSAGES/django.po
+++ b/allianceauth/locale/es/LC_MESSAGES/django.po
--- a/allianceauth/locale/fr_FR/LC_MESSAGES/django.mo
+++ b/allianceauth/locale/fr_FR/LC_MESSAGES/django.mo
--- a/allianceauth/locale/fr_FR/LC_MESSAGES/django.po
+++ b/allianceauth/locale/fr_FR/LC_MESSAGES/django.po
--- a/allianceauth/locale/it_IT/LC_MESSAGES/django.mo
+++ b/allianceauth/locale/it_IT/LC_MESSAGES/django.mo
--- a/allianceauth/locale/it_IT/LC_MESSAGES/django.po
+++ b/allianceauth/locale/it_IT/LC_MESSAGES/django.po
--- a/allianceauth/locale/ja/LC_MESSAGES/django.mo
+++ b/allianceauth/locale/ja/LC_MESSAGES/django.mo
--- a/allianceauth/locale/ja/LC_MESSAGES/django.po
+++ b/allianceauth/locale/ja/LC_MESSAGES/django.po
--- a/allianceauth/locale/ko_KR/LC_MESSAGES/django.mo
+++ b/allianceauth/locale/ko_KR/LC_MESSAGES/django.mo
--- a/allianceauth/locale/ko_KR/LC_MESSAGES/django.po
+++ b/allianceauth/locale/ko_KR/LC_MESSAGES/django.po
--- a/allianceauth/locale/nl_NL/LC_MESSAGES/django.mo
+++ b/allianceauth/locale/nl_NL/LC_MESSAGES/django.mo
--- a/allianceauth/locale/nl_NL/LC_MESSAGES/django.po
+++ b/allianceauth/locale/nl_NL/LC_MESSAGES/django.po
--- a/allianceauth/locale/pl_PL/LC_MESSAGES/django.mo
+++ b/allianceauth/locale/pl_PL/LC_MESSAGES/django.mo
--- a/allianceauth/locale/pl_PL/LC_MESSAGES/django.po
+++ b/allianceauth/locale/pl_PL/LC_MESSAGES/django.po
--- a/allianceauth/locale/ru/LC_MESSAGES/django.mo
+++ b/allianceauth/locale/ru/LC_MESSAGES/django.mo
--- a/allianceauth/locale/ru/LC_MESSAGES/django.po
+++ b/allianceauth/locale/ru/LC_MESSAGES/django.po
--- a/allianceauth/locale/uk/LC_MESSAGES/django.mo
+++ b/allianceauth/locale/uk/LC_MESSAGES/django.mo
--- a/allianceauth/locale/uk/LC_MESSAGES/django.po
+++ b/allianceauth/locale/uk/LC_MESSAGES/django.po
--- a/allianceauth/locale/zh_Hans/LC_MESSAGES/django.mo
+++ b/allianceauth/locale/zh_Hans/LC_MESSAGES/django.mo
--- a/allianceauth/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/allianceauth/locale/zh_Hans/LC_MESSAGES/django.po
--- a/allianceauth/menu/apps.py
+++ b/allianceauth/menu/apps.py
@ -1,6 +1,7 @@
 import logging

 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _

 logger = logging.getLogger(__name__)

@ -12,6 +13,7 @@ logger = logging.getLogger(__name__)
 class MenuConfig(AppConfig):
    name = "allianceauth.menu"
    label = "menu"
+    verbose_name = _("Menu")

    def ready(self):
        from allianceauth.menu.core import smart_sync
--- a/allianceauth/menu/models.py
+++ b/allianceauth/menu/models.py
@ -1,3 +1,4 @@
+from typing import ClassVar
 from django.db import models
 from django.utils.translation import gettext_lazy as _

@ -68,7 +69,7 @@ class MenuItem(models.Model):
        help_text=_("External URL this menu items will link to"),
    )

-    objects = MenuItemManager()
+    objects: ClassVar[MenuItemManager] = MenuItemManager()

    def __str__(self) -> str:
        return self.text
--- a/allianceauth/menu/templates/menu/menu-item-bs5.html
+++ b/allianceauth/menu/templates/menu/menu-item-bs5.html
@ -11,8 +11,8 @@
            data-bs-target="#{{ item.html_id }}"
            aria-expanded="false"
            aria-controls=""
-        {% endif %}>
-    </i>
+        {% endif %}
+    ></i>
    <a
        class="nav-link flex-fill align-self-center me-auto {% if item.navactive %}{% navactive request item.navactive|join:' ' %}{% endif %}"
        {% if item.is_folder %}
@ -27,7 +27,7 @@
    </a>

    {% if item.count >= 1 %}
-        <span class="badge bg-primary m-2 align-self-center{% if not item.is_folder %} me-2{% endif %}">
+        <span class="badge text-bg-primary m-2 align-self-center{% if not item.is_folder %} me-2{% endif %}">
            {{ item.count }}
        </span>
    {% elif item.url %}
@ -36,7 +36,7 @@

    {% if item.is_folder %}
        <span
-            class="pill m-2 align-self-center collapsed"
+            class="pill m-2 align-self-center"
            type="button"
            data-bs-toggle="collapse"
            data-bs-target="#{{ item.html_id }}"
--- a/allianceauth/menu/templates/menu/menu-notification-block.html
+++ b/allianceauth/menu/templates/menu/menu-notification-block.html
@ -2,8 +2,8 @@
 {% load navactive %}
 {% load auth_notifications %}

-<li class="nav-item {% navactive request 'notifications:' %}" id="menu_item_notifications">
-    <a class="nav-link" href="{% url 'notifications:list' %}">
+<li class="nav-item" id="menu_item_notifications">
+    <a class="nav-link {% navactive request 'notifications:' %}" href="{% url 'notifications:list' %}">
        {% with unread_count=request.user|user_unread_notification_count %}
            <i class="fa-solid fa-bell{% if unread_count %} text-danger{% endif %}"></i>
        {% endwith %}
--- a/allianceauth/menu/templates/menu/menu-user.html
+++ b/allianceauth/menu/templates/menu/menu-user.html
@ -2,28 +2,51 @@
 {% load evelinks %}
 {% load theme_tags %}

-<div id="aa-user-info" class="w-100 d-flex flex-column justify-content-center align-items-center text-center py-1 border-top border-secondary {% if not user.is_authenticated %}position-absolute bottom-0{% endif %}">
+<div
+    id="aa-user-info"
+    class="w-100 d-flex flex-column justify-content-center align-items-center text-center py-1 border-top border-secondary {% if not user.is_authenticated %}position-absolute bottom-0{% endif %}"
+>
    <div class="d-flex mb-0 w-100">
        <div class="p-2 position-relative m-2">
            {% if user.is_authenticated %}
                {% with request.user.profile.main_character as main %}
-                    <img class="rounded-circle" src="{{ main.character_id|character_portrait_url:64 }}" alt="{{ main.character_name }}">
-                    <img class="rounded-circle position-absolute bottom-0 start-0" src="{{ main.corporation_logo_url_32 }}" alt="{{ main.corporation_name }}">
+                    <img
+                        class="rounded-circle"
+                        src="{{ main.character_id|character_portrait_url:64 }}"
+                        alt="{{ main.character_name }}"
+                    >
+
+                    <img
+                        class="rounded-circle position-absolute bottom-0 start-0"
+                        src="{{ main.corporation_logo_url_32 }}"
+                        alt="{{ main.corporation_name }}"
+                    >
+
                    {% if main.alliance_id %}
-                        <img class="rounded-circle position-absolute bottom-0 end-0" src="{{ main.alliance_logo_url_32 }}" alt="{{ main.alliance_name }}">
+                        <img
+                            class="rounded-circle position-absolute bottom-0 end-0"
+                            src="{{ main.alliance_logo_url_32 }}"
+                            alt="{{ main.alliance_name }}"
+                        >
                    {% elif main.faction_id %}
-                        <img class="rounded-circle position-absolute bottom-0 end-0" src="{{ main.faction_logo_url_32 }}" alt="{{ main.faction_name }}">
+                        <img
+                            class="rounded-circle position-absolute bottom-0 end-0"
+                            src="{{ main.faction_logo_url_32 }}"
+                            alt="{{ main.faction_name }}"
+                        >
                    {% endif %}
                {% endwith %}
            {% else %}
                {% include "bundles/image-auth-logo.html" with logo_width="64px" %}
            {% endif %}
        </div>
+
        <div class="align-self-center text-start">
            {% if user.is_authenticated %}
                {% with request.user.profile.main_character as main %}
                    <h5 class="m-0">{{ main.character_name }}</h5>
                    <p class="m-0 small">{{ main.corporation_name }}</p>
+
                    {% if main.alliance_id %}
                        <p class="m-0 small">{{ main.alliance_name }}</p>
                    {% elif main.faction_id %}
@ -34,56 +57,106 @@
                <h5 class="m-0">{{ SITE_NAME }}</h5>
            {% endif %}
        </div>
+
        <div class="ms-auto dropup">
            <button type="button" class="h-100 btn" data-bs-toggle="dropdown" aria-expanded="false">
                <i class="fa-solid fa-gear fa-fw text-light"></i>
            </button>
+
            <ul class="dropdown-menu" style="min-width: 200px;">
                <li><h6 class="dropdown-header">{% translate "Language" %}</h6></li>
-                <li>
-                    <a class="dropdown-item">{% include "public/lang_select.html" %}</a>
-                </li>
-                <li><h6 class="dropdown-header">{% translate "Theme" %}</h6></li>

                <li>
-                    <a class="dropdown-item">
-                        {% theme_select %}
-                    </a>
+                    {% include "public/lang_select.html" %}
                </li>

+                {% theme_select %}
+
                {% if user.is_superuser %}
                    <li><hr class="dropdown-divider"></li>
                    <li><h6 class="dropdown-header">{% translate "Super User" %}</h6></li>
+
                    <li>
-                        <a class="dropdown-item"  href="https://allianceauth.readthedocs.io/" title="Alliance Auth Documentation"><i class="fa-solid fa-book fa-fw"></i> Alliance Auth Documentation</a>
-                    </li>
-                    <li>
-                        <a class="dropdown-item"  href="https://discord.gg/fjnHAmk" title="Alliance Auth Discord"><i class="fa-brands fa-discord fa-fw"></i> Alliance Auth Discord</a>
-                    </li>
-                    <li>
-                        <a class="dropdown-item" href="https://gitlab.com/allianceauth/allianceauth" title="Alliance Auth Git"><i class="fa-brands fa-gitlab fa-fw"></i> Alliance Auth Git</a>
-                    </li>
-                {% endif %}
-                {% if user.is_staff %}
-                <li>
-                    <a class="dropdown-item" href="{% url 'admin:index' %}">
-                        <i class="fa-solid fa-gear fa-fw"></i> {% translate "Admin" %}
-                    </a>
-                </li>
-                {% endif %}
-                <li><hr class="dropdown-divider"></li>
-                {% if user.is_authenticated %}
-                    <li>
-                        <a class="dropdown-item" href="{% url 'authentication:token_management' %}">
-                            <i class="fa-solid fa-user-lock fa-fw"></i> Token Management
+                        <a
+                            class="dropdown-item"
+                            href="https://allianceauth.readthedocs.io/"
+                            title="{% translate 'Alliance Auth Documentation' %}"
+                        >
+                            <i class="fa-solid fa-book fa-fw"></i>
+                            {% translate "Alliance Auth Documentation" %}
                        </a>
                    </li>
+
                    <li>
-                        <a class="dropdown-item text-danger" href="{% url 'logout' %}" title="{% translate 'Sign Out' %}"><i class="fa-solid fa-right-from-bracket fa-fw "></i> {% translate 'Sign Out' %}</a>
+                        <a
+                            class="dropdown-item"
+                            href="https://discord.gg/fjnHAmk"
+                            title="{% translate 'Alliance Auth Discord' %}"
+                        >
+                            <i class="fa-brands fa-discord fa-fw"></i>
+                            {% translate "Alliance Auth Discord" %}
+                        </a>
+                    </li>
+
+                    <li>
+                        <a
+                            class="dropdown-item"
+                            href="https://gitlab.com/allianceauth/allianceauth"
+                            title="{% translate 'Alliance Auth Git' %}"
+                        >
+                            <i class="fa-brands fa-gitlab fa-fw"></i>
+                            {% translate "Alliance Auth Git" %}
+                        </a>
+                    </li>
+                {% endif %}
+
+                {% if user.is_staff %}
+                    <li>
+                        <a
+                            class="dropdown-item"
+                            href="{% url 'admin:index' %}"
+                            title="{% translate 'Admin' %}"
+                        >
+                            <i class="fa-solid fa-gear fa-fw"></i>
+                            {% translate "Admin" %}
+                        </a>
+                    </li>
+                {% endif %}
+
+                <li><hr class="dropdown-divider"></li>
+
+                {% if user.is_authenticated %}
+                    <li>
+                        <a
+                            class="dropdown-item"
+                            href="{% url 'authentication:token_management' %}"
+                            title="{% translate 'Token Management' %}"
+                        >
+                            <i class="fa-solid fa-user-lock fa-fw"></i>
+                            {% translate "Token Management" %}
+                        </a>
+                    </li>
+
+                    <li>
+                        <a
+                            class="dropdown-item text-danger"
+                            href="{% url 'logout' %}"
+                            title="{% translate 'Sign Out' %}"
+                        >
+                            <i class="fa-solid fa-right-from-bracket fa-fw"></i>
+                            {% translate 'Sign Out' %}
+                        </a>
                    </li>
                {% else %}
                    <li>
-                        <a class="dropdown-item text-success" href="{% url 'authentication:login' %}" title="{% translate 'Sign In' %}"> <i class="fa-solid fa-right-to-bracket fa-fw "></i> {% translate 'Sign In' %}</a>
+                        <a
+                            class="dropdown-item text-success"
+                            href="{% url 'authentication:login' %}"
+                            title="{% translate 'Sign In' %}"
+                        >
+                            <i class="fa-solid fa-right-to-bracket fa-fw"></i>
+                            {% translate 'Sign In' %}
+                        </a>
                    </li>
                {% endif %}
            </ul>
--- a/allianceauth/menu/templates/menu/sortable-side-menu.html
+++ b/allianceauth/menu/templates/menu/sortable-side-menu.html
@ -5,7 +5,7 @@
 <div class="col-auto px-0">
    <div class="collapse collapse-horizontal" tabindex="-1" id="sidebar">
        <div>
-            <div class="nav-padding navbar-dark bg-dark text-light px-0 d-flex flex-column overflow-hidden vh-100 {% if not user.is_authenticated %}position-relative{% endif %}">
+            <div class="nav-padding navbar-dark text-bg-dark px-0 d-flex flex-column overflow-hidden vh-100 {% if not user.is_authenticated %}position-relative{% endif %}">
                {% if user.is_authenticated %}
                    <ul id="sidebar-menu" class="navbar-nav flex-column mb-auto overflow-auto pt-2">
                        <li class="d-flex flex-wrap m-2 p-2 pt-0 pb-0 mt-0 mb-0 me-0 pe-0">
--- a/allianceauth/notifications/apps.py
+++ b/allianceauth/notifications/apps.py
@ -1,6 +1,8 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _


 class NotificationsConfig(AppConfig):
    name = 'allianceauth.notifications'
    label = 'notifications'
+    verbose_name = _('Notifications')
--- a/allianceauth/notifications/models.py
+++ b/allianceauth/notifications/models.py
@ -1,4 +1,5 @@
 import logging
+from typing import ClassVar

 from django.db import models
 from django.contrib.auth.models import User
@ -56,7 +57,7 @@ class Notification(models.Model):
    timestamp = models.DateTimeField(auto_now_add=True, db_index=True)
    viewed = models.BooleanField(default=False, db_index=True)

-    objects = NotificationManager()
+    objects: ClassVar[NotificationManager] = NotificationManager()

    def __str__(self) -> str:
        return f"{self.user}: {self.title}"
--- a/allianceauth/notifications/templates/notifications/list.html
+++ b/allianceauth/notifications/templates/notifications/list.html
@ -15,14 +15,14 @@
    <li class="nav-item">
        <a class="nav-link active" id="unread-tab" data-bs-toggle="tab" data-bs-target="#unread" type="button" role="tab" aria-controls="unread" aria-selected="true">
            {% translate "Unread" %}
-            <span class="badge bg-secondary">{{ unread|length }}</span>
+            <span class="badge text-bg-secondary">{{ unread|length }}</span>
        </a>
    </li>

    <li class="nav-item">
        <a class="nav-link" id="read-tab" data-bs-toggle="tab" data-bs-target="#read" type="button" role="tab" aria-controls="read" aria-selected="false">
            {% translate "Read" %}
-            <span class="badge bg-secondary">{{ read|length }}</span>
+            <span class="badge text-bg-secondary">{{ read|length }}</span>
        </a>
    </li>
 {% endblock %}
--- a/allianceauth/notifications/templates/notifications/view.html
+++ b/allianceauth/notifications/templates/notifications/view.html
@ -17,7 +17,7 @@
    </div>

    <div class="card border-{{ notif.level }}">
-        <div class="card-header bg-{{ notif.level }}">
+        <div class="card-header text-bg-{{ notif.level }}">
            {{ notif.timestamp }}
            {{ notif.title }}
        </div>
--- a/allianceauth/optimer/apps.py
+++ b/allianceauth/optimer/apps.py
@ -1,6 +1,8 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _


 class OptimerConfig(AppConfig):
    name = 'allianceauth.optimer'
    label = 'optimer'
+    verbose_name = _('Fleet Operations')
--- a/allianceauth/optimer/templates/optimer/dashboard.ops.html
+++ b/allianceauth/optimer/templates/optimer/dashboard.ops.html
@ -14,7 +14,7 @@
                            <th class="text-center">{% translate "Operation" %}</th>
                            <th class="text-center">{% translate "Type" %}</th>
                            <th class="text-center">{% translate "Form Up System" %}</th>
-                            <th class="text-center">{% translate "EVE Time" %}</th>
+                            <th class="text-center">{% translate "EVE time" %}</th>
                        </tr>
                    </thead>

--- a/allianceauth/optimer/templates/optimer/management.html
+++ b/allianceauth/optimer/templates/optimer/management.html
@ -24,8 +24,8 @@
 {% block content %}
    <div>
        <div class="text-center mb-3">
-            <div class="badge bg-primary text-start">
-                <b>{% translate "Current Eve Time:" %}</b>
+            <div class="badge text-bg-primary text-start">
+                <b>{% translate "Current EVE time:" %}</b>
                <span id="current-time"></span>
            </div>
        </div>
@ -127,8 +127,8 @@
        };

        /**
-         * Get the current Eve time as a string
-         * @returns {string} Eve time string
+         * Get the current EVE time as a string
+         * @returns {string} EVE time string
         */
        const updateClock = () => {
            document.getElementById("current-time").innerHTML = getCurrentEveTimeString();
--- a/allianceauth/permissions_tool/apps.py
+++ b/allianceauth/permissions_tool/apps.py
@ -1,6 +1,8 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _


 class PermissionsToolConfig(AppConfig):
    name = 'allianceauth.permissions_tool'
    label = 'permissions_tool'
+    verbose_name = _('Permissions Audit')
--- a/allianceauth/project_template/project_name/settings/base.py
+++ b/allianceauth/project_template/project_name/settings/base.py
@ -15,67 +15,68 @@ from django.contrib import messages
 from django.utils.translation import gettext_lazy as _

 INSTALLED_APPS = [
-    'allianceauth',  # needs to be on top of this list to support favicons in Django admin (see https://gitlab.com/allianceauth/allianceauth/-/issues/1301)
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    'django.contrib.humanize',
-    'django_celery_beat',
-    'solo',
-    'bootstrapform',
-    'django_bootstrap5',  # https://github.com/zostera/django-bootstrap5
-    'sortedm2m',
-    'esi',
-    'allianceauth.framework',
-    'allianceauth.authentication',
-    'allianceauth.services',
-    'allianceauth.eveonline',
-    'allianceauth.groupmanagement',
-    'allianceauth.notifications',
-    'allianceauth.thirdparty.navhelper',
-    'allianceauth.analytics',
-    'allianceauth.menu',
-    'allianceauth.theme',
-    'allianceauth.theme.darkly',
-    'allianceauth.theme.flatly',
-    'allianceauth.theme.materia',
+    "allianceauth",  # needs to be on top of this list to support favicons in Django admin (see https://gitlab.com/allianceauth/allianceauth/-/issues/1301)
+    "django.contrib.admin",
+    "django.contrib.auth",
+    "django.contrib.contenttypes",
+    "django.contrib.sessions",
+    "django.contrib.messages",
+    "django.contrib.staticfiles",
+    "django.contrib.humanize",
+    "django_celery_beat",
+    "solo",
+    "bootstrapform",
+    "django_bootstrap5",  # https://github.com/zostera/django-bootstrap5
+    "sortedm2m",
+    "esi",
+    "allianceauth.framework",
+    "allianceauth.authentication",
+    "allianceauth.services",
+    "allianceauth.eveonline",
+    "allianceauth.groupmanagement",
+    "allianceauth.notifications",
+    "allianceauth.thirdparty.navhelper",
+    "allianceauth.analytics",
+    "allianceauth.menu",
+    "allianceauth.theme",
+    "allianceauth.theme.darkly",
+    "allianceauth.theme.flatly",
+    "allianceauth.theme.materia",
    "allianceauth.custom_css",
-    'allianceauth.crontab',
-    'sri',
+    "allianceauth.crontab",
+    "sri",
 ]

 SRI_ALGORITHM = "sha512"
 SECRET_KEY = "wow I'm a really bad default secret key"

 # Celery configuration
-BROKER_URL = 'redis://localhost:6379/0'
+BROKER_URL = "redis://localhost:6379/0"
 CELERYBEAT_SCHEDULER = "allianceauth.crontab.schedulers.OffsetDatabaseScheduler"
 CELERYBEAT_SCHEDULE = {
-    'esi_cleanup_callbackredirect': {
-        'task': 'esi.tasks.cleanup_callbackredirect',
-        'schedule': crontab(minute='0', hour='*/4'),
+    "esi_cleanup_callbackredirect": {
+        "task": "esi.tasks.cleanup_callbackredirect",
+        "schedule": crontab(minute="0", hour="*/4"),
    },
-    'esi_cleanup_token': {
-        'task': 'esi.tasks.cleanup_token',
-        'schedule': crontab(minute='0', hour='0'),
+    "esi_cleanup_token": {
+        "task": "esi.tasks.cleanup_token",
+        "schedule": crontab(minute="0", hour="0"),
+        "apply_offset": True,
    },
-    'run_model_update': {
-        'task': 'allianceauth.eveonline.tasks.run_model_update',
-        'schedule': crontab(minute='0', hour="*/6"),
-        'apply_offset': True
+    "run_model_update": {
+        "task": "allianceauth.eveonline.tasks.run_model_update",
+        "schedule": crontab(minute="0", hour="*/6"),
+        "apply_offset": True,
    },
-    'check_all_character_ownership': {
-        'task': 'allianceauth.authentication.tasks.check_all_character_ownership',
-        'schedule': crontab(minute='0', hour='*/4'),
-        'apply_offset': True
+    "check_all_character_ownership": {
+        "task": "allianceauth.authentication.tasks.check_all_character_ownership",
+        "schedule": crontab(minute="0", hour="*/4"),
+        "apply_offset": True,
+    },
+    "analytics_daily_stats": {
+        "task": "allianceauth.analytics.tasks.analytics_daily_stats",
+        "schedule": crontab(minute="0", hour="2"),
    },
-    'analytics_daily_stats': {
-        'task': 'allianceauth.analytics.tasks.analytics_daily_stats',
-        'schedule': crontab(minute='0', hour='2'),
-    }
 }


@ -84,22 +85,20 @@ PROJECT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 BASE_DIR = os.path.dirname(PROJECT_DIR)

 MIDDLEWARE = [
-    'django.middleware.security.SecurityMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'allianceauth.authentication.middleware.UserSettingsMiddleware',
-    'django.middleware.locale.LocaleMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    "django.middleware.security.SecurityMiddleware",
+    "django.contrib.sessions.middleware.SessionMiddleware",
+    "allianceauth.authentication.middleware.UserSettingsMiddleware",
+    "django.middleware.locale.LocaleMiddleware",
+    "django.middleware.common.CommonMiddleware",
+    "django.middleware.csrf.CsrfViewMiddleware",
+    "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.contrib.messages.middleware.MessageMiddleware",
+    "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]

-ROOT_URLCONF = 'allianceauth.urls'
+ROOT_URLCONF = "allianceauth.urls"

-LOCALE_PATHS = (
-    os.path.join(BASE_DIR, 'locale/'),
-)
+LOCALE_PATHS = (os.path.join(BASE_DIR, "locale/"),)

 LANGUAGES = (  # Sorted by Language Code alphabetical order + English at top
    ("en", _("English")),
@ -119,7 +118,12 @@ LANGUAGES = (  # Sorted by Language Code alphabetical order + English at top

 # Django's language codes are different from some of the libraries we use,
 # so we need to map them.
+# When adding a new language, please remember to add it to the mapping
+# and add the language files to their respective directories under `allianceauth/static/allianceauth/libs/`.
 LANGUAGE_MAPPING = {
+    # See https://github.com/DataTables/Plugins/tree/master/i18n for available languages
+    # (We use the JSON files)
+    # `allianceauth/static/allianceauth/libs/DataTables/Plugins/{version}/i18n/` for the files
    "DataTables": {
        "cs-cz": "cs",
        "de": "de-DE",
@ -134,6 +138,8 @@ LANGUAGE_MAPPING = {
        "uk": "uk",
        "zh-hans": "zh-HANT",
    },
+    # See https://github.com/moment/moment/tree/master/locale for available languages
+    # `allianceauth/static/allianceauth/libs/moment.js/{version}/locale/` for the files
    "MomentJS": {
        "cs-cz": "cs",
        "de": "de",
@ -152,58 +158,58 @@ LANGUAGE_MAPPING = {

 TEMPLATES = [
    {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [os.path.join(PROJECT_DIR, 'templates')],
-        'APP_DIRS': True,
-        'OPTIONS': {
-            'context_processors': [
-                'django.template.context_processors.debug',
-                'django.template.context_processors.request',
-                'django.contrib.auth.context_processors.auth',
-                'django.contrib.messages.context_processors.messages',
-                'django.template.context_processors.i18n',
-                'django.template.context_processors.media',
-                'django.template.context_processors.static',
-                'django.template.context_processors.tz',
-                'allianceauth.context_processors.auth_settings',
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
+        "DIRS": [os.path.join(PROJECT_DIR, "templates")],
+        "APP_DIRS": True,
+        "OPTIONS": {
+            "context_processors": [
+                "django.template.context_processors.debug",
+                "django.template.context_processors.request",
+                "django.contrib.auth.context_processors.auth",
+                "django.contrib.messages.context_processors.messages",
+                "django.template.context_processors.i18n",
+                "django.template.context_processors.media",
+                "django.template.context_processors.static",
+                "django.template.context_processors.tz",
+                "allianceauth.context_processors.auth_settings",
            ],
        },
    },
 ]

-WSGI_APPLICATION = 'allianceauth.wsgi.application'
+WSGI_APPLICATION = "allianceauth.wsgi.application"

 # Password validation
 # https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators

 AUTH_PASSWORD_VALIDATORS = [
    {
-        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+        "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
    },
    {
-        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+        "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
    },
    {
-        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+        "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",
    },
    {
-        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+        "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",
    },
 ]

 AUTHENTICATION_BACKENDS = [
-    'allianceauth.authentication.backends.StateBackend',
-    'django.contrib.auth.backends.ModelBackend'
+    "allianceauth.authentication.backends.StateBackend",
+    "django.contrib.auth.backends.ModelBackend",
 ]

 # Internationalization
 # https://docs.djangoproject.com/en/1.10/topics/i18n/

-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = "en-us"

 LANGUAGE_COOKIE_AGE = 1209600

-TIME_ZONE = 'UTC'
+TIME_ZONE = "UTC"

 USE_I18N = True

@ -211,44 +217,51 @@ USE_TZ = True

 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.10/howto/static-files/
-STATIC_URL = '/static/'
+STORAGES = {
+    "default": {
+        "BACKEND": "django.core.files.storage.FileSystemStorage",
+    },
+    "staticfiles": {
+        "BACKEND": "allianceauth.framework.staticfiles.storage.AaManifestStaticFilesStorage",
+    },
+}
+
+STATIC_URL = "/static/"
 STATICFILES_DIRS = [
-    os.path.join(PROJECT_DIR, 'static'),
+    os.path.join(PROJECT_DIR, "static"),
 ]
-STATIC_ROOT = os.path.join(BASE_DIR, 'static')
+STATIC_ROOT = os.path.join(BASE_DIR, "static")

 # Bootstrap messaging css workaround
-MESSAGE_TAGS = {
-    messages.ERROR: 'danger error'
-}
+MESSAGE_TAGS = {messages.ERROR: "danger error"}

 CACHES = {
    "default": {
        "BACKEND": "django_redis.cache.RedisCache",
-        "LOCATION": "redis://127.0.0.1:6379/1"  # change the 1 here for the DB used
+        "LOCATION": "redis://127.0.0.1:6379/1",  # change the 1 here for the DB used
    }
 }

 SESSION_ENGINE = "django.contrib.sessions.backends.cached_db"

 DEBUG = True
-ALLOWED_HOSTS = ['*']
+ALLOWED_HOSTS = ["*"]
 DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': str(os.path.join(BASE_DIR, 'alliance_auth.sqlite3')),
+    "default": {
+        "ENGINE": "django.db.backends.sqlite3",
+        "NAME": str(os.path.join(BASE_DIR, "alliance_auth.sqlite3")),
    },
 }

-SITE_NAME = 'Alliance Auth'
+SITE_NAME = "Alliance Auth"

 DEFAULT_THEME = "allianceauth.theme.flatly.auth_hooks.FlatlyThemeHook"
 DEFAULT_THEME_DARK = "allianceauth.theme.darkly.auth_hooks.DarklyThemeHook"  # Legacy AAv3 user.profile.night_mode=1

-LOGIN_URL = 'auth_login_user'  # view that handles login logic
+LOGIN_URL = "auth_login_user"  # view that handles login logic

-LOGIN_REDIRECT_URL = 'authentication:dashboard'  # default destination when logging in if no redirect specified
-LOGOUT_REDIRECT_URL = 'authentication:dashboard'  # destination after logging out
+LOGIN_REDIRECT_URL = "authentication:dashboard"  # default destination when logging in if no redirect specified
+LOGOUT_REDIRECT_URL = "authentication:dashboard"  # destination after logging out
 # Both of these redirects accept values as per the django redirect shortcut
 # https://docs.djangoproject.com/en/1.11/topics/http/shortcuts/#redirect
 # - url names eg 'authentication:dashboard'
@ -256,73 +269,71 @@ LOGOUT_REDIRECT_URL = 'authentication:dashboard'  # destination after logging ou
 # - absolute urls eg 'http://example.com/dashboard'

 # scopes required on new tokens when logging in. Cannot be blank.
-LOGIN_TOKEN_SCOPES = ['publicData']
+LOGIN_TOKEN_SCOPES = ["publicData"]

 EMAIL_TIMEOUT = 15

 # number of days email verification links are valid for
 ACCOUNT_ACTIVATION_DAYS = 1

-ESI_API_URL = 'https://esi.evetech.net/'
+ESI_API_URL = "https://esi.evetech.net/"

 LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'formatters': {
-        'verbose': {
-            'format': "[%(asctime)s] %(levelname)s [%(name)s:%(lineno)s] %(message)s",
-            'datefmt': "%d/%b/%Y %H:%M:%S"
+    "version": 1,
+    "disable_existing_loggers": False,
+    "formatters": {
+        "verbose": {
+            "format": "[%(asctime)s] %(levelname)s [%(name)s:%(lineno)s] %(message)s",
+            "datefmt": "%d/%b/%Y %H:%M:%S",
        },
-        'simple': {
-            'format': '%(levelname)s %(message)s'
+        "simple": {"format": "%(levelname)s %(message)s"},
+    },
+    "handlers": {
+        "log_file": {
+            "level": "INFO",  # edit this line to change logging level to file
+            "class": "logging.handlers.RotatingFileHandler",
+            "filename": os.path.join(BASE_DIR, "log/allianceauth.log"),
+            "formatter": "verbose",
+            "maxBytes": 1024 * 1024 * 5,  # edit this line to change max log file size
+            "backupCount": 5,  # edit this line to change number of log backups
+        },
+        "extension_file": {
+            "level": "INFO",
+            "class": "logging.handlers.RotatingFileHandler",
+            "filename": os.path.join(BASE_DIR, "log/extensions.log"),
+            "formatter": "verbose",
+            "maxBytes": 1024 * 1024 * 5,  # edit this line to change max log file size
+            "backupCount": 5,  # edit this line to change number of log backups
+        },
+        "console": {
+            "level": "DEBUG",  # edit this line to change logging level to console
+            "class": "logging.StreamHandler",
+            "formatter": "verbose",
+        },
+        "notifications": {  # creates notifications for users with logging_notifications permission
+            "level": "ERROR",  # edit this line to change logging level to notifications
+            "class": "allianceauth.notifications.handlers.NotificationHandler",
+            "formatter": "verbose",
        },
    },
-    'handlers': {
-        'log_file': {
-            'level': 'INFO',  # edit this line to change logging level to file
-            'class': 'logging.handlers.RotatingFileHandler',
-            'filename': os.path.join(BASE_DIR, 'log/allianceauth.log'),
-            'formatter': 'verbose',
-            'maxBytes': 1024 * 1024 * 5,  # edit this line to change max log file size
-            'backupCount': 5,  # edit this line to change number of log backups
+    "loggers": {
+        "allianceauth": {
+            "handlers": ["log_file", "console", "notifications"],
+            "level": "DEBUG",
        },
-        'extension_file': {
-            'level': 'INFO',
-            'class': 'logging.handlers.RotatingFileHandler',
-            'filename': os.path.join(BASE_DIR, 'log/extensions.log'),
-            'formatter': 'verbose',
-            'maxBytes': 1024 * 1024 * 5,  # edit this line to change max log file size
-            'backupCount': 5,  # edit this line to change number of log backups
+        "extensions": {
+            "handlers": ["extension_file", "console"],
+            "level": "DEBUG",
        },
-        'console': {
-            'level': 'DEBUG',  # edit this line to change logging level to console
-            'class': 'logging.StreamHandler',
-            'formatter': 'verbose',
+        "django": {
+            "handlers": ["log_file", "console"],
+            "level": "ERROR",
        },
-        'notifications': {  # creates notifications for users with logging_notifications permission
-            'level': 'ERROR',  # edit this line to change logging level to notifications
-            'class': 'allianceauth.notifications.handlers.NotificationHandler',
-            'formatter': 'verbose',
+        "esi": {
+            "handlers": ["log_file", "console"],
+            "level": "DEBUG",
        },
    },
-    'loggers': {
-        'allianceauth': {
-            'handlers': ['log_file', 'console', 'notifications'],
-            'level': 'DEBUG',
-        },
-        'extensions': {
-            'handlers': ['extension_file', 'console'],
-            'level': 'DEBUG',
-        },
-        'django': {
-            'handlers': ['log_file', 'console'],
-            'level': 'ERROR',
-        },
-        'esi': {
-            'handlers': ['log_file', 'console'],
-            'level': 'DEBUG',
-        },
-    }
 }

 DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
--- a/allianceauth/project_template/supervisor.conf
+++ b/allianceauth/project_template/supervisor.conf
@ -1,49 +1,48 @@
 [program:beat]
-command={{ celery }} -A {{ project_name }} beat
-directory={{ project_directory }}
-user=allianceserver
-stdout_logfile={{ project_directory }}/log/beat.log
-stderr_logfile={{ project_directory }}/log/beat.log
-autostart=true
-autorestart=true
-startsecs=10
-priority=998
+command = {{ celery }} -A {{ project_name }} beat
+directory = {{ project_directory }}
+user = allianceserver
+stdout_logfile = {{ project_directory }}/log/%(program_name)s.log
+stderr_logfile = {{ project_directory }}/log/%(program_name)s.log
+autostart = true
+autorestart = true
+startsecs = 10
+priority = 998

 [program:worker]
-command={{ celery }} -A {{ project_name }} worker --pool=threads --concurrency=5 -n %(program_name)s_%(process_num)02d
-directory={{ project_directory }}
-user=allianceserver
-numprocs=1
-process_name=%(program_name)s_%(process_num)02d
-stdout_logfile={{ project_directory }}/log/worker.log
-stderr_logfile={{ project_directory }}/log/worker.log
-autostart=true
-autorestart=true
-startsecs=10
+command = {{ celery }} -A {{ project_name }} worker --pool=threads --concurrency=5 -n %(program_name)s_%(process_num)02d
+directory = {{ project_directory }}
+user = allianceserver
+numprocs = 1
+process_name = %(program_name)s_%(process_num)02d
+stdout_logfile = {{ project_directory }}/log/%(program_name)s.log
+stderr_logfile = {{ project_directory }}/log/%(program_name)s.log
+autostart = true
+autorestart = true
+startsecs = 10
 stopwaitsecs = 600
-killasgroup=true
-priority=998
+killasgroup = true
+priority = 998

 {% if gunicorn %}
 [program:gunicorn]
 user = allianceserver
-directory={{ project_directory }}
-command={{ gunicorn }} {{ project_name }}.wsgi --workers=3 --timeout 120
-stdout_logfile={{ project_directory }}/log/gunicorn.log
-stderr_logfile={{ project_directory }}/log/gunicorn.log
-autostart=true
-autorestart=true
-stopsignal=INT
-
+directory = {{ project_directory }}
+command = {{ gunicorn }} {{ project_name }}.wsgi --workers=3 --timeout 120
+stdout_logfile = {{ project_directory }}/log/%(program_name)s.log
+stderr_logfile = {{ project_directory }}/log/%(program_name)s.log
+autostart = true
+autorestart = true
+stopsignal = INT
 {% endif %}

 [eventlistener:memmon]
-command={{ memmon }} -p worker_00=256MB -p gunicorn=256MB
-directory={{ project_directory }}
-events=TICK_60
-stdout_logfile={{ project_directory }}/log/memmon.log
-stderr_logfile={{ project_directory }}/log/memmon.log
+command = {{ memmon }} -p worker_00=256MB -p gunicorn=256MB
+directory = {{ project_directory }}
+events = TICK_60
+stdout_logfile = {{ project_directory }}/log/memmon.log
+stderr_logfile = {{ project_directory }}/log/memmon.log

 [group:{{ project_name }}]
-programs=beat,worker{% if gunicorn %},gunicorn{% endif %}
-priority=999
+programs = beat,worker{% if gunicorn %},gunicorn{% endif %}
+priority = 999
--- a/allianceauth/services/apps.py
+++ b/allianceauth/services/apps.py
@ -1,9 +1,11 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _


 class ServicesConfig(AppConfig):
    name = 'allianceauth.services'
    label = 'services'
+    verbose_name = _('Services')

    def ready(self):
        from . import signals
--- a/allianceauth/services/modules/discord/apps.py
+++ b/allianceauth/services/modules/discord/apps.py
@ -1,6 +1,8 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _


 class DiscordServiceConfig(AppConfig):
    name = 'allianceauth.services.modules.discord'
    label = 'discord'
+    verbose_name = _('Discord Service')
--- a/allianceauth/services/modules/discord/discord_client/client.py
+++ b/allianceauth/services/modules/discord/discord_client/client.py
@ -675,7 +675,7 @@ class DiscordClient:
        )
        logger.debug('%s: response:\n%s', uid, r.text)
        if not r.ok:
-            logger.warning(
+            logger.error(
                '%s: Discord API returned error code %d and this response: %s',
                uid,
                r.status_code,
--- a/allianceauth/services/modules/discord/models.py
+++ b/allianceauth/services/modules/discord/models.py
@ -1,5 +1,5 @@
 import logging
-from typing import Optional
+from typing import ClassVar, Optional

 from requests.exceptions import HTTPError

@ -59,7 +59,7 @@ class DiscordUser(models.Model):
        help_text='Date & time this service account was activated'
    )

-    objects = DiscordUserManager()
+    objects: ClassVar[DiscordUserManager] = DiscordUserManager()

    class Meta:
        permissions = (
--- a/allianceauth/services/modules/discord/tests/test_managers.py
+++ b/allianceauth/services/modules/discord/tests/test_managers.py
@ -439,6 +439,7 @@ class TestUserHasAccount(NoSocketsTestCase):

    def test_return_false_if_user_does_not_exist(self):
        my_user = User(username='Dummy')
+        my_user.save()
        self.assertFalse(DiscordUser.objects.user_has_account(my_user))

    def test_return_false_if_not_called_with_user_object(self):
--- a/allianceauth/services/modules/discourse/apps.py
+++ b/allianceauth/services/modules/discourse/apps.py
@ -1,6 +1,8 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _


 class DiscourseServiceConfig(AppConfig):
    name = 'allianceauth.services.modules.discourse'
    label = 'discourse'
+    verbose_name = _('Discourse Service')
--- a/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html
+++ b/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html
@ -14,7 +14,7 @@
 {% endblock %}

 {% block active %}
-    <span class="badge bg-success">
+    <span class="badge text-bg-success">
        {% translate "SSO login active" %}
    </span>
 {% endblock %}
--- a/allianceauth/services/modules/example/apps.py
+++ b/allianceauth/services/modules/example/apps.py
@ -1,6 +1,8 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _


 class ExampleServiceConfig(AppConfig):
    name = 'allianceauth.services.modules.example'
    label = 'example_service'
+    verbose_name = _('Example Service')
--- a/allianceauth/services/modules/ips4/apps.py
+++ b/allianceauth/services/modules/ips4/apps.py
@ -1,6 +1,8 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _


 class Ips4ServiceConfig(AppConfig):
    name = 'allianceauth.services.modules.ips4'
    label = 'ips4'
+    verbose_name = _('IPS4 Service')
--- a/allianceauth/services/modules/mumble/apps.py
+++ b/allianceauth/services/modules/mumble/apps.py
@ -1,6 +1,8 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _


 class MumbleServiceConfig(AppConfig):
    name = 'allianceauth.services.modules.mumble'
    label = 'mumble'
+    verbose_name = _('Mumble Service')
--- a/allianceauth/services/modules/mumble/models.py
+++ b/allianceauth/services/modules/mumble/models.py
@ -1,5 +1,6 @@
 import random
 import string
+from typing import ClassVar
 from passlib.hash import bcrypt_sha256

 from django.db import models
@ -116,7 +117,7 @@ class MumbleUser(AbstractServiceModel):
        help_text="Timestamp of the users Last Disconnection to Mumble"
    )

-    objects = MumbleManager()
+    objects: ClassVar[MumbleManager] = MumbleManager()

    def __str__(self):
        return self.username
--- a/allianceauth/services/modules/mumble/templates/services/mumble/mumble_connection_history.html
+++ b/allianceauth/services/modules/mumble/templates/services/mumble/mumble_connection_history.html
@ -8,7 +8,7 @@
 {% endblock page_title %}

 {% block header_nav_brand %}
-    <a class="navbar-brand">{% trans "Mumble History" %} - {{ mumble_url }}</a>
+    {% trans "Mumble History" %} - {{ mumble_url }}
 {% endblock header_nav_brand %}

 {% block header_nav_collapse_left %}
@ -87,7 +87,7 @@

    <script>
        $(document).ready(function () {
-            const MUMBLESTATS_DATETIME_FORMAT = 'YYYY-MM-DD, HH:mm';
+            const MUMBLESTATS_DATETIME_FORMAT = 'LLL';

            'use strict';

@ -104,15 +104,33 @@
                    { data: 'version' },
                    {
                        data: 'last_connect',
-                        render: (data) => {
-                            return moment(data).utc().format(MUMBLESTATS_DATETIME_FORMAT);
+                        render: {
+                            _: (data) => {
+                                return data === null
+                                    ? ''
+                                    : moment(data)
+                                        .utc()
+                                        .format(MUMBLESTATS_DATETIME_FORMAT);
+                            },
+                            sort: (data) => {
+                                return data === null ? '' : data;
+                            }
                        },
                        className: 'text-end',
                    },
                    {
                        data: 'last_disconnect',
-                        render: (data) => {
-                            return moment(data).utc().format(MUMBLESTATS_DATETIME_FORMAT);
+                        render: {
+                            _: (data) => {
+                                return data === null
+                                    ? ''
+                                    : moment(data)
+                                        .utc()
+                                        .format(MUMBLESTATS_DATETIME_FORMAT);
+                            },
+                            sort: (data) => {
+                                return data === null ? '' : data;
+                            }
                        },
                        className: 'text-end',
                    },
--- a/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html
+++ b/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html
@ -48,9 +48,9 @@
            </a>
        {% endif %}
    {% endif %}
-    {% if request.user.is_superuser %}
-    <a class="btn btn-primary" type="button" id="btnMumbleConnectionHistory" href="{% url 'mumble:connection_history' %}" title="{% translate 'Mumble Connection History' %}">
-        <i class="fa-solid fa-clock-rotate-left"></i> History
-    </a>
-{% endif %}
+    {% if perms.mumble.view_connection_history %}
+        <a class="btn btn-primary" type="button" id="btnMumbleConnectionHistory" href="{% url 'mumble:connection_history' %}" title="{% translate 'Mumble Connection History' %}">
+            <i class="fa-solid fa-clock-rotate-left"></i> History
+        </a>
+    {% endif %}
 {% endblock %}
--- a/allianceauth/services/modules/openfire/apps.py
+++ b/allianceauth/services/modules/openfire/apps.py
@ -1,6 +1,8 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _


 class OpenfireServiceConfig(AppConfig):
    name = 'allianceauth.services.modules.openfire'
    label = 'openfire'
+    verbose_name = _('Openfire Service')
--- a/Show More
+++ b/Show More