Version Bump 4.0.0a4

Add superlance/memmon path to the project bootstrap

See merge request allianceauth/allianceauth!1560

.gitlab-ci.yml

@@ -25,7 +25,7 @@ before_script:
 pre-commit-check:
   <<: *only-default
   stage: pre-commit
-  image: python:3.10-bullseye
+  image: python:3.11-bullseye
   variables:
     PRE_COMMIT_HOME: ${CI_PROJECT_DIR}/.cache/pre-commit
   cache:
@@ -112,6 +112,19 @@ test-pvpy-core:
         path: coverage.xml
   allow_failure: true
 
+test-3.12-core:
+  <<: *only-default
+  image: python:3.12-rc-bullseye
+  script:
+    - tox -e py312-core
+  artifacts:
+    when: always
+    reports:
+      coverage_report:
+        coverage_format: cobertura
+        path: coverage.xml
+  allow_failure: true
+
 test-3.8-all:
   <<: *only-default
   image: python:3.8-bullseye
@@ -174,9 +187,22 @@ test-pvpy-all:
         path: coverage.xml
   allow_failure: true
 
+test-3.12-all:
+  <<: *only-default
+  image: python:3.12-rc-bullseye
+  script:
+    - tox -e py312-all
+  artifacts:
+    when: always
+    reports:
+      coverage_report:
+        coverage_format: cobertura
+        path: coverage.xml
+  allow_failure: true
+
 build-test:
   stage: test
-  image: python:3.10-bullseye
+  image: python:3.11-bullseye
 
   before_script:
     - python -m pip install --upgrade pip
@@ -197,11 +223,11 @@ test-docs:
   <<: *only-default
   image: python:3.11-bullseye
   script:
-  - tox -e docs
+    - tox -e docs
 
 deploy_production:
   stage: deploy
-  image: python:3.10-bullseye
+  image: python:3.11-bullseye
 
   before_script:
     - python -m pip install --upgrade pip
@@ -217,10 +243,10 @@ deploy_production:
 
 build-image:
   before_script: []
-  image: docker:20.10.10
+  image: docker:24.0
   stage: docker
   services:
-    - docker:20.10.10-dind
+    - docker:24.0-dind
   script: |
     CURRENT_DATE=$(echo $CI_COMMIT_TIMESTAMP | head -c 10 | tr -d -)
     IMAGE_TAG=$CI_REGISTRY_IMAGE/auth:$CURRENT_DATE-$CI_COMMIT_SHORT_SHA
@@ -230,12 +256,10 @@ build-image:
     LATEST_TAG=$CI_REGISTRY_IMAGE/auth:latest
 
     docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    docker build . -t $IMAGE_TAG -f docker/Dockerfile --build-arg AUTH_VERSION=$(echo $CI_COMMIT_TAG | cut -c 2-)
+    docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-*
-    docker tag $IMAGE_TAG $CURRENT_TAG
+    docker run --privileged --rm tonistiigi/binfmt --install all
-    docker tag $IMAGE_TAG $MINOR_TAG
+    docker buildx create --use --name new-builder
-    docker tag $IMAGE_TAG $MAJOR_TAG
+    docker buildx build . --tag $IMAGE_TAG --tag $CURRENT_TAG --tag $MINOR_TAG --tag $MAJOR_TAG --tag $LATEST_TAG --file docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_VERSION=$(echo $CI_COMMIT_TAG | cut -c 2-)
-    docker tag $IMAGE_TAG $LATEST_TAG
-    docker image push --all-tags $CI_REGISTRY_IMAGE/auth
   rules:
     - if: $CI_COMMIT_TAG
       when: delayed
@@ -243,17 +267,19 @@ build-image:
 
 build-image-dev:
   before_script: []
-  image: docker:20.10.10
+  image: docker:24.0
   stage: docker
   services:
-    - docker:20.10.10-dind
+    - docker:24.0-dind
   script: |
     CURRENT_DATE=$(echo $CI_COMMIT_TIMESTAMP | head -c 10 | tr -d -)
     IMAGE_TAG=$CI_REGISTRY_IMAGE/auth:$CURRENT_DATE-$CI_COMMIT_BRANCH-$CI_COMMIT_SHORT_SHA
 
     docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    docker build . -t $IMAGE_TAG -f docker/Dockerfile --build-arg AUTH_PACKAGE=git+https://gitlab.com/allianceauth/allianceauth@$CI_COMMIT_BRANCH
+    docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-*
-    docker push $IMAGE_TAG
+    docker run --privileged --rm tonistiigi/binfmt --install all
+    docker buildx create --use --name new-builder
+    docker buildx build . --tag $IMAGE_TAG --file docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_PACKAGE=git+https://gitlab.com/allianceauth/allianceauth@$CI_COMMIT_BRANCH
   rules:
     - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == ""'
       when: manual
@@ -262,17 +288,19 @@ build-image-dev:
 
 build-image-mr:
   before_script: []
-  image: docker:20.10.10
+  image: docker:24.0
   stage: docker
   services:
-    - docker:20.10.10-dind
+    - docker:24.0-dind
   script: |
     CURRENT_DATE=$(echo $CI_COMMIT_TIMESTAMP | head -c 10 | tr -d -)
     IMAGE_TAG=$CI_REGISTRY_IMAGE/auth:$CURRENT_DATE-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME-$CI_COMMIT_SHORT_SHA
 
     docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    docker build . -t $IMAGE_TAG -f docker/Dockerfile --build-arg AUTH_PACKAGE=git+$CI_MERGE_REQUEST_SOURCE_PROJECT_URL@$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
+    docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-*
-    docker push $IMAGE_TAG
+    docker run --privileged --rm tonistiigi/binfmt --install all
+    docker buildx create --use --name new-builder
+    docker buildx build . --tag $IMAGE_TAG --file docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_PACKAGE=git+$CI_MERGE_REQUEST_SOURCE_PROJECT_URL@$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       when: manual

.pre-commit-config.yaml

@@ -66,14 +66,20 @@ repos:
             swagger\.json
           )
 
-  - repo: https://github.com/adamchainz/django-upgrade
-    rev: 1.14.0
-    hooks:
-      - id: django-upgrade
-        args: [ --target-version=4.0 ]
-
   - repo: https://github.com/asottile/pyupgrade
     rev: v3.10.1
     hooks:
       - id: pyupgrade
         args: [ --py38-plus ]
+
+  - repo: https://github.com/adamchainz/django-upgrade
+    rev: 1.14.0
+    hooks:
+      - id: django-upgrade
+        args: [--target-version=4.2]
+
+  - repo: https://github.com/asottile/setup-cfg-fmt
+    rev: v2.3.0
+    hooks:
+      - id: setup-cfg-fmt
+        args: [ --include-version-classifiers ]

.readthedocs.yml

@@ -7,11 +7,11 @@ version: 2
 
 # Set the version of Python and other tools you might need
 build:
-  os: ubuntu-22.04
+  os: ubuntu-20.04
   apt_packages:
     - redis
   tools:
-    python: "3.11"
+    python: "3.8"
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
@@ -20,7 +20,7 @@ sphinx:
 # Optionally build your docs in additional formats such as PDF and ePub
 formats: all
 
-# Python requirements required to build your docs
+# Optionally set the version of Python and requirements required to build your docs
 python:
   install:
     - method: pip

.tx/config

@@ -1,5 +1,5 @@
 [main]
-host     = https://app.transifex.com
+host     = https://www.transifex.com
 lang_map = zh-Hans: zh_Hans
 
 [o:alliance-auth:p:alliance-auth:r:django-po]

.tx/config_20230406134150.bak

@@ -0,0 +1,10 @@
+[main]
+host = https://www.transifex.com
+lang_map = zh-Hans:zh_Hans
+
+[alliance-auth.django-po]
+file_filter = allianceauth/locale/<lang>/LC_MESSAGES/django.po
+minimum_perc = 0
+source_file = allianceauth/locale/en/LC_MESSAGES/django.po
+source_lang = en
+type = PO

.tx/transifex.yml

@@ -1,10 +0,0 @@
-filters:
-  - filter_type: file
-    file_format: PO
-    source_file: allianceauth/locale/en/LC_MESSAGES/django.po
-    source_language: en
-    translation_files_expression: allianceauth/locale/<lang>/LC_MESSAGES/django.po
-
-settings:
-  language_mapping:
-    zh-Hans: zh_Hans

README.md

@@ -17,7 +17,7 @@ An auth system for EVE Online to help in-game organizations manage online servic
 - [Documentation](http://allianceauth.rtfd.io)
 - [Support](#support)
 - [Release Notes](https://gitlab.com/allianceauth/allianceauth/-/releases)
-- [Developer Team](#development-team)
+- [Developer Team](#developer-team)
 - [Contributing](#contributing)
 
 ## Overview

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__ = '3.8.1'
+__version__ = '4.0.0a4'
 __title__ = 'Alliance Auth'
 __url__ = 'https://gitlab.com/allianceauth/allianceauth'
 NAME = f'{__title__} v{__version__}'

allianceauth/analytics/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from .models import AnalyticsIdentifier, AnalyticsPath, AnalyticsTokens
+from .models import AnalyticsIdentifier, AnalyticsTokens
 
 
 @admin.register(AnalyticsIdentifier)
@@ -13,9 +13,3 @@ class AnalyticsIdentifierAdmin(admin.ModelAdmin):
 class AnalyticsTokensAdmin(admin.ModelAdmin):
     search_fields = ['name', ]
     list_display = ('name', 'type',)
-
-
-@admin.register(AnalyticsPath)
-class AnalyticsPathAdmin(admin.ModelAdmin):
-    search_fields = ['ignore_path', ]
-    list_display = ('ignore_path',)

allianceauth/analytics/apps.py

@@ -4,6 +4,3 @@ from django.apps import AppConfig
 class AnalyticsConfig(AppConfig):
     name = 'allianceauth.analytics'
     label = 'analytics'
-
-    def ready(self):
-        import allianceauth.analytics.signals

allianceauth/analytics/fixtures/disable_analytics.json

@@ -3,11 +3,10 @@
     "model": "analytics.AnalyticsTokens",
     "pk": 1,
     "fields": {
-        "name": "AA Team Public Google Analytics (Universal)",
+        "name": "AA Team Public Google Analytics (V4)",
         "type": "GA-V4",
-        "token": "UA-186249766-2",
+        "token": "G-6LYSMYK8DE",
-        "send_page_views": "False",
+        "secret": "KLlpjLZ-SRGozS5f5wb_kw",
-        "send_celery_tasks": "False",
         "send_stats": "False"
         }
     },

allianceauth/analytics/middleware.py

@@ -1,52 +0,0 @@
-from bs4 import BeautifulSoup
-
-from django.conf import settings
-from django.utils.deprecation import MiddlewareMixin
-from .models import AnalyticsTokens, AnalyticsIdentifier
-from .tasks import send_ga_tracking_web_view
-
-import re
-
-
-class AnalyticsMiddleware(MiddlewareMixin):
-    def process_response(self, request, response):
-        """Django Middleware: Process Page Views and creates Analytics Celery Tasks"""
-        if getattr(settings, "ANALYTICS_DISABLED", False):
-            return response
-        analyticstokens = AnalyticsTokens.objects.all()
-        client_id = AnalyticsIdentifier.objects.get(id=1).identifier.hex
-        try:
-            title = BeautifulSoup(
-                response.content, "html.parser").html.head.title.text
-        except AttributeError:
-            title = ''
-        for token in analyticstokens:
-            # Check if Page View Sending is Disabled
-            if token.send_page_views is False:
-                continue
-            # Check Exclusions
-            ignore = False
-            for ignore_path in token.ignore_paths.values():
-                ignore_path_regex = re.compile(ignore_path["ignore_path"])
-                if re.search(ignore_path_regex, request.path) is not None:
-                    ignore = True
-
-            if ignore is True:
-                continue
-
-            tracking_id = token.token
-            locale = request.LANGUAGE_CODE
-            path = request.path
-            try:
-                useragent = request.headers["User-Agent"]
-            except KeyError:
-                useragent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"
-
-            send_ga_tracking_web_view.s(tracking_id=tracking_id,
-                                        client_id=client_id,
-                                        page=path,
-                                        title=title,
-                                        locale=locale,
-                                        useragent=useragent).\
-                apply_async(priority=9)
-        return response

allianceauth/analytics/migrations/0007_analyticstokens_secret.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.0.6 on 2022-08-30 05:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('analytics', '0006_more_ignore_paths'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='analyticstokens',
+            name='secret',
+            field=models.CharField(blank=True, max_length=254),
+        ),
+    ]

allianceauth/analytics/migrations/0008_add_AA_GA-4_Team_Token .py

@@ -0,0 +1,64 @@
+# Generated by Django 3.1.4 on 2020-12-30 08:53
+
+from django.db import migrations
+from django.core.exceptions import ObjectDoesNotExist
+
+
+def add_aa_team_token(apps, schema_editor):
+    # We can't import the Person model directly as it may be a newer
+    # version than this migration expects. We use the historical version.
+    Tokens = apps.get_model('analytics', 'AnalyticsTokens')
+    AnalyticsPath = apps.get_model('analytics', 'AnalyticsPath')
+    token = Tokens()
+    try:
+        ua_token = Tokens.objects.get(token="UA-186249766-2")
+        original_send_page_views = ua_token.send_page_views
+        original_send_celery_tasks = ua_token.send_celery_tasks
+        original_send_stats = ua_token.send_stats
+    except ObjectDoesNotExist:
+        original_send_page_views = True
+        original_send_celery_tasks = True
+        original_send_stats = True
+
+    try:
+        user_notifications_count = AnalyticsPath.objects.get(ignore_path=r"^\/user_notifications_count\/.*",)
+    except ObjectDoesNotExist:
+        user_notifications_count = AnalyticsPath.objects.create(ignore_path=r"^\/user_notifications_count\/.*")
+
+    try:
+        admin = AnalyticsPath.objects.get(ignore_path=r"^\/admin\/.*")
+    except ObjectDoesNotExist:
+        admin = AnalyticsPath.objects.create(ignore_path=r"^\/admin\/.*")
+
+    try:
+        account_activate = AnalyticsPath.objects.get(ignore_path=r"^\/account\/activate\/.*")
+    except ObjectDoesNotExist:
+        account_activate = AnalyticsPath.objects.create(ignore_path=r"^\/account\/activate\/.*")
+
+    token.type = 'GA-V4'
+    token.token = 'G-6LYSMYK8DE'
+    token.secret = 'KLlpjLZ-SRGozS5f5wb_kw'
+    token.send_page_views = original_send_page_views
+    token.send_celery_tasks = original_send_celery_tasks
+    token.send_stats = original_send_stats
+    token.name = 'AA Team Public Google Analytics (V4)'
+    token.save()
+    token.ignore_paths.add(admin, user_notifications_count, account_activate)
+    token.save()
+
+
+def remove_aa_team_token(apps, schema_editor):
+    # Have to define some code to remove this identifier
+    # In case of migration rollback?
+    Tokens = apps.get_model('analytics', 'AnalyticsTokens')
+    token = Tokens.objects.filter(token="G-6LYSMYK8DE").delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('analytics', '0007_analyticstokens_secret'),
+    ]
+
+    operations = [migrations.RunPython(
+        add_aa_team_token, remove_aa_team_token)]

allianceauth/analytics/migrations/0009_remove_analyticstokens_ignore_paths_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.0.10 on 2023-05-08 05:24
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('analytics', '0008_add_AA_GA-4_Team_Token '),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='analyticstokens',
+            name='ignore_paths',
+        ),
+        migrations.RemoveField(
+            model_name='analyticstokens',
+            name='send_celery_tasks',
+        ),
+        migrations.RemoveField(
+            model_name='analyticstokens',
+            name='send_page_views',
+        ),
+        migrations.DeleteModel(
+            name='AnalyticsPath',
+        ),
+    ]

allianceauth/analytics/models.py

@@ -7,22 +7,19 @@ from uuid import uuid4
 
 class AnalyticsIdentifier(models.Model):
 
-    identifier = models.UUIDField(default=uuid4,
+    identifier = models.UUIDField(
-                                editable=False)
+        default=uuid4,
+        editable=False)
 
     def save(self, *args, **kwargs):
         if not self.pk and AnalyticsIdentifier.objects.exists():
             # Force a single object
             raise ValidationError('There is can be only one \
                                     AnalyticsIdentifier instance')
-        self.pk = self.id = 1 # If this happens to be deleted and recreated, force it to be 1
+        self.pk = self.id = 1  # If this happens to be deleted and recreated, force it to be 1
         return super().save(*args, **kwargs)
 
 
-class AnalyticsPath(models.Model):
-    ignore_path = models.CharField(max_length=254, default="/example/", help_text="Regex Expression, If matched no Analytics Page View is sent")
-
-
 class AnalyticsTokens(models.Model):
 
     class Analytics_Type(models.TextChoices):
@@ -32,7 +29,5 @@ class AnalyticsTokens(models.Model):
     name = models.CharField(max_length=254)
     type = models.CharField(max_length=254, choices=Analytics_Type.choices)
     token = models.CharField(max_length=254, blank=False)
-    send_page_views = models.BooleanField(default=False)
+    secret = models.CharField(max_length=254, blank=True)
-    send_celery_tasks = models.BooleanField(default=False)
     send_stats = models.BooleanField(default=False)
-    ignore_paths = models.ManyToManyField(AnalyticsPath, blank=True)

allianceauth/analytics/signals.py

@@ -1,55 +0,0 @@
-import logging
-from celery.signals import task_failure, task_success
-from django.conf import settings
-from allianceauth.analytics.tasks import analytics_event
-
-logger = logging.getLogger(__name__)
-
-
-@task_failure.connect
-def process_failure_signal(
-                        exception, traceback,
-                        sender, task_id, signal,
-                        args, kwargs, einfo, **kw):
-    logger.debug("Celery task_failure signal %s" % sender.__class__.__name__)
-    if getattr(settings, "ANALYTICS_DISABLED", False):
-        return
-
-    category = sender.__module__
-
-    if 'allianceauth.analytics' not in category:
-        if category.endswith(".tasks"):
-            category = category[:-6]
-
-        action = sender.__name__
-
-        label = f"{exception.__class__.__name__}"
-
-        analytics_event(category=category,
-                        action=action,
-                        label=label)
-
-
-@task_success.connect
-def celery_success_signal(sender, result=None, **kw):
-    logger.debug("Celery task_success signal %s" % sender.__class__.__name__)
-    if getattr(settings, "ANALYTICS_DISABLED", False):
-        return
-
-    category = sender.__module__
-
-    if 'allianceauth.analytics' not in category:
-        if category.endswith(".tasks"):
-            category = category[:-6]
-
-        action = sender.__name__
-        label = "Success"
-
-        value = 0
-        if isinstance(result, int):
-            value = result
-
-        analytics_event(category=category,
-                        action=action,
-                        label=label,
-                        value=value)

allianceauth/analytics/tasks.py

@@ -3,7 +3,6 @@ import logging
 from django.conf import settings
 from django.apps import apps
 from celery import shared_task
-from allianceauth import __version__
 from .models import AnalyticsTokens, AnalyticsIdentifier
 from .utils import (
     install_stat_addons,
@@ -12,14 +11,14 @@ from .utils import (
 
 logger = logging.getLogger(__name__)
 
-BASE_URL = "https://www.google-analytics.com/"
+BASE_URL = "https://www.google-analytics.com"
 
-DEBUG_URL = f"{BASE_URL}debug/collect"
+DEBUG_URL = f"{BASE_URL}/debug/mp/collect"
-COLLECTION_URL = f"{BASE_URL}collect"
+COLLECTION_URL = f"{BASE_URL}/mp/collect"
 
 if getattr(settings, "ANALYTICS_ENABLE_DEBUG", False) and settings.DEBUG:
-    # Force sending of analytics data during in a debug/test environemt
+    # Force sending of analytics data during in a debug/test environment
-    # Usefull for developers working on this feature.
+    # Useful for developers working on this feature.
     logger.warning(
         "You have 'ANALYTICS_ENABLE_DEBUG' Enabled! "
         "This debug instance will send analytics data!")
@@ -31,40 +30,38 @@ if settings.DEBUG is True:
     ANALYTICS_URL = DEBUG_URL
 
 
-def analytics_event(category: str,
+def analytics_event(namespace: str,
-                    action: str,
+                    task: str,
-                    label: str,
+                    label: str = "",
-                    value: int = 0,
+                    result: str = "",
+                    value: int = 1,
                     event_type: str = 'Celery'):
     """
     Send a Google Analytics Event for each token stored
     Includes check for if its enabled/disabled
 
     Args:
-        `category` (str): Celery Namespace
+        `namespace` (str): Celery Namespace
-        `action` (str): Task Name
+        `task` (str): Task Name
-        `label` (str): Optional, Task Success/Exception
+        `label` (str): Optional, additional task label
-        `value` (int): Optional, If bulk, Query size, can be a binary True/False
+        `result` (str): Optional, Task Success/Exception
+        `value` (int): Optional, If bulk, Query size, can be a Boolean
         `event_type` (str): Optional, Celery or Stats only, Default to Celery
     """
-    analyticstokens = AnalyticsTokens.objects.all()
+    for token in AnalyticsTokens.objects.filter(type='GA-V4'):
-    client_id = AnalyticsIdentifier.objects.get(id=1).identifier.hex
+        if event_type == 'Stats':
-    for token in analyticstokens:
-        if event_type == 'Celery':
-            allowed = token.send_celery_tasks
-        elif event_type == 'Stats':
             allowed = token.send_stats
         else:
             allowed = False
 
         if allowed is True:
-            tracking_id = token.token
             send_ga_tracking_celery_event.s(
-                tracking_id=tracking_id,
+                measurement_id=token.token,
-                client_id=client_id,
+                secret=token.secret,
-                category=category,
+                namespace=namespace,
-                action=action,
+                task=task,
                 label=label,
+                result=result,
                 value=value).apply_async(priority=9)
 
 
@@ -72,136 +69,104 @@ def analytics_event(category: str,
 def analytics_daily_stats():
     """Celery Task: Do not call directly
 
-    Gathers a series of daily statistics and sends analytics events containing them
+    Gathers a series of daily statistics
+    Sends analytics events containing them
     """
     users = install_stat_users()
     tokens = install_stat_tokens()
     addons = install_stat_addons()
     logger.debug("Running Daily Analytics Upload")
 
-    analytics_event(category='allianceauth.analytics',
+    analytics_event(namespace='allianceauth.analytics',
-                    action='send_install_stats',
+                    task='send_install_stats',
                     label='existence',
                     value=1,
                     event_type='Stats')
-    analytics_event(category='allianceauth.analytics',
+    analytics_event(namespace='allianceauth.analytics',
-                    action='send_install_stats',
+                    task='send_install_stats',
                     label='users',
                     value=users,
                     event_type='Stats')
-    analytics_event(category='allianceauth.analytics',
+    analytics_event(namespace='allianceauth.analytics',
-                    action='send_install_stats',
+                    task='send_install_stats',
                     label='tokens',
                     value=tokens,
                     event_type='Stats')
-    analytics_event(category='allianceauth.analytics',
+    analytics_event(namespace='allianceauth.analytics',
-                    action='send_install_stats',
+                    task='send_install_stats',
                     label='addons',
                     value=addons,
                     event_type='Stats')
 
     for appconfig in apps.get_app_configs():
-        analytics_event(category='allianceauth.analytics',
+        analytics_event(namespace='allianceauth.analytics',
-                        action='send_extension_stats',
+                        task='send_extension_stats',
                         label=appconfig.label,
                         value=1,
                         event_type='Stats')
 
 
-@shared_task()
-def send_ga_tracking_web_view(
-                            tracking_id: str,
-                            client_id: str,
-                            page: str,
-                            title: str,
-                            locale: str,
-                            useragent: str) -> requests.Response:
-
-    """Celery Task: Do not call directly
-
-    Sends Page View events to GA, Called only via analytics.middleware
-
-    Parameters
-    ----------
-    `tracking_id` (str): Unique Server Identifier
-    `client_id` (str): GA Token
-    `page` (str): Page Path
-    `title` (str): Page Title
-    `locale` (str): Browser Language
-    `useragent` (str): Browser UserAgent
-
-    Returns
-    -------
-    requests.Reponse Object
-    """
-    headers = {"User-Agent": useragent}
-
-    payload = {
-            'v': '1',
-            'tid': tracking_id,
-            'cid': client_id,
-            't': 'pageview',
-            'dp': page,
-            'dt': title,
-            'ul': locale,
-            'ua': useragent,
-            'aip': 1,
-            'an': "allianceauth",
-            'av': __version__
-            }
-
-    response = requests.post(
-                        ANALYTICS_URL, data=payload,
-                        timeout=5, headers=headers)
-    logger.debug(f"Analytics Page View HTTP{response.status_code}")
-    return response
-
-
 @shared_task()
 def send_ga_tracking_celery_event(
-                                tracking_id: str,
+        measurement_id: str,
-                                client_id: str,
+        secret: str,
-                                category: str,
+        namespace: str,
-                                action: str,
+        task: str,
-                                label: str,
+        label: str = "",
-                                value: int) -> requests.Response:
+        result: str = "",
+        value: int = 1):
     """Celery Task: Do not call directly
 
-    Sends Page View events to GA, Called only via analytics.middleware
+    Sends an events to GA
 
     Parameters
     ----------
-    `tracking_id` (str): Unique Server Identifier
+    `measurement_id` (str): GA Token
-    `client_id` (str): GA Token
+    `secret` (str): GA Authentication Secret
-    `category` (str): Celery Namespace
+    `namespace` (str): Celery Namespace
-    `action` (str): Task Name
+    `task` (str): Task Name
-    `label` (str): Optional, Task Success/Exception
+    `label` (str): Optional, additional task label
+    `result` (str): Optional, Task Success/Exception
     `value` (int): Optional, If bulk, Query size, can be a binary True/False
-
-    Returns
-    -------
-    requests.Reponse Object
     """
 
-    headers = {
+    parameters = {
-        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"}
+        'measurement_id': measurement_id,
+        'api_secret': secret
+    }
 
     payload = {
-            'v': '1',
+        'client_id': AnalyticsIdentifier.objects.get(id=1).identifier.hex,
-            'tid': tracking_id,
+        "user_properties": {
-            'cid': client_id,
+            "allianceauth_version": {
-            't': 'event',
+                "value": "allianceauth_version"
-            'ec': category,
-            'ea': action,
-            'el': label,
-            'ev': value,
-            'aip': 1,
-            'an': "allianceauth",
-            'av': __version__
             }
-
+        },
-    response = requests.post(
+        'non_personalized_ads': True,
-                        ANALYTICS_URL, data=payload,
+        "events": [{
-                        timeout=5, headers=headers)
+            "name": "celery_event",
-    logger.debug(f"Analytics Celery/Stats Event HTTP{response.status_code}")
+            "params": {
-    return response
+                    "namespace": namespace,
+                    "task": task,
+                    'result': result,
+                    'label': label,
+                    "value": value
+            }
+        }]
+    }
+    try:
+        response = requests.post(
+            ANALYTICS_URL,
+            params=parameters,
+            json=payload,
+            timeout=10)
+        response.raise_for_status()
+        logger.debug(
+            f"Analytics Celery/Stats Event HTTP{response.status_code}")
+        return response.status_code
+    except requests.exceptions.HTTPError as e:
+        logger.debug(e)
+        return response.status_code
+    except requests.exceptions.ConnectionError as e:
+        logger.debug(e)
+        return "Failed"

allianceauth/analytics/tests/test_integration.py

@@ -1,109 +0,0 @@
-from unittest.mock import patch
-from urllib.parse import parse_qs
-
-import requests_mock
-
-from django.test import override_settings
-
-from allianceauth.analytics.tasks import ANALYTICS_URL
-from allianceauth.eveonline.tasks import update_character
-from allianceauth.tests.auth_utils import AuthUtils
-from allianceauth.utils.testing import NoSocketsTestCase
-
-
-@override_settings(CELERY_ALWAYS_EAGER=True)
-@requests_mock.mock()
-class TestAnalyticsForViews(NoSocketsTestCase):
-    @override_settings(ANALYTICS_DISABLED=False)
-    def test_should_run_analytics(self, requests_mocker):
-        # given
-        requests_mocker.post(ANALYTICS_URL)
-        user = AuthUtils.create_user("Bruce Wayne")
-        self.client.force_login(user)
-        # when
-        response = self.client.get("/dashboard/")
-        # then
-        self.assertEqual(response.status_code, 200)
-        self.assertTrue(requests_mocker.called)
-
-    @override_settings(ANALYTICS_DISABLED=True)
-    def test_should_not_run_analytics(self, requests_mocker):
-        # given
-        requests_mocker.post(ANALYTICS_URL)
-        user = AuthUtils.create_user("Bruce Wayne")
-        self.client.force_login(user)
-        # when
-        response = self.client.get("/dashboard/")
-        # then
-        self.assertEqual(response.status_code, 200)
-        self.assertFalse(requests_mocker.called)
-
-
-@override_settings(CELERY_ALWAYS_EAGER=True)
-@requests_mock.mock()
-class TestAnalyticsForTasks(NoSocketsTestCase):
-    @override_settings(ANALYTICS_DISABLED=False)
-    @patch("allianceauth.eveonline.models.EveCharacter.objects.update_character")
-    def test_should_run_analytics_for_successful_task(
-        self, requests_mocker, mock_update_character
-    ):
-        # given
-        requests_mocker.post(ANALYTICS_URL)
-        user = AuthUtils.create_user("Bruce Wayne")
-        character = AuthUtils.add_main_character_2(user, "Bruce Wayne", 1001)
-        # when
-        update_character.delay(character.character_id)
-        # then
-        self.assertTrue(mock_update_character.called)
-        self.assertTrue(requests_mocker.called)
-        payload = parse_qs(requests_mocker.last_request.text)
-        self.assertListEqual(payload["el"], ["Success"])
-
-    @override_settings(ANALYTICS_DISABLED=True)
-    @patch("allianceauth.eveonline.models.EveCharacter.objects.update_character")
-    def test_should_not_run_analytics_for_successful_task(
-        self, requests_mocker, mock_update_character
-    ):
-        # given
-        requests_mocker.post(ANALYTICS_URL)
-        user = AuthUtils.create_user("Bruce Wayne")
-        character = AuthUtils.add_main_character_2(user, "Bruce Wayne", 1001)
-        # when
-        update_character.delay(character.character_id)
-        # then
-        self.assertTrue(mock_update_character.called)
-        self.assertFalse(requests_mocker.called)
-
-    @override_settings(ANALYTICS_DISABLED=False)
-    @patch("allianceauth.eveonline.models.EveCharacter.objects.update_character")
-    def test_should_run_analytics_for_failed_task(
-        self, requests_mocker, mock_update_character
-    ):
-        # given
-        requests_mocker.post(ANALYTICS_URL)
-        mock_update_character.side_effect = RuntimeError
-        user = AuthUtils.create_user("Bruce Wayne")
-        character = AuthUtils.add_main_character_2(user, "Bruce Wayne", 1001)
-        # when
-        update_character.delay(character.character_id)
-        # then
-        self.assertTrue(mock_update_character.called)
-        self.assertTrue(requests_mocker.called)
-        payload = parse_qs(requests_mocker.last_request.text)
-        self.assertNotEqual(payload["el"], ["Success"])
-
-    @override_settings(ANALYTICS_DISABLED=True)
-    @patch("allianceauth.eveonline.models.EveCharacter.objects.update_character")
-    def test_should_not_run_analytics_for_failed_task(
-        self, requests_mocker, mock_update_character
-    ):
-        # given
-        requests_mocker.post(ANALYTICS_URL)
-        mock_update_character.side_effect = RuntimeError
-        user = AuthUtils.create_user("Bruce Wayne")
-        character = AuthUtils.add_main_character_2(user, "Bruce Wayne", 1001)
-        # when
-        update_character.delay(character.character_id)
-        # then
-        self.assertTrue(mock_update_character.called)
-        self.assertFalse(requests_mocker.called)

allianceauth/analytics/tests/test_middleware.py

@@ -1,24 +0,0 @@
-from allianceauth.analytics.middleware import AnalyticsMiddleware
-from unittest.mock import Mock
-from django.http import HttpResponse
-
-from django.test.testcases import TestCase
-
-
-class TestAnalyticsMiddleware(TestCase):
-
-    def setUp(self):
-        self.middleware = AnalyticsMiddleware(HttpResponse)
-        self.request = Mock()
-        self.request.headers = {
-                "User-Agent": "AUTOMATED TEST"
-            }
-        self.request.path = '/testURL/'
-        self.request.session = {}
-        self.request.LANGUAGE_CODE = 'en'
-        self.response = Mock()
-        self.response.content = 'hello world'
-
-    def test_middleware(self):
-        response = self.middleware.process_response(self.request, self.response)
-        self.assertEqual(self.response, response)

allianceauth/analytics/tests/test_models.py

@@ -23,4 +23,5 @@ class TestAnalyticsIdentifier(TestCase):
         with self.assertRaises(ValidationError):
             AnalyticsIdentifier.objects.create(identifier=uuid_2)
         self.assertEqual(AnalyticsIdentifier.objects.count(), 1)
-        self.assertEqual(AnalyticsIdentifier.objects.get(pk=1).identifier, UUID(uuid_1))
+        self.assertEqual(AnalyticsIdentifier.objects.get(
+            pk=1).identifier, UUID(uuid_1))

allianceauth/analytics/tests/test_tasks.py

@@ -4,12 +4,11 @@ from django.test.utils import override_settings
 
 from allianceauth.analytics.tasks import (
     analytics_event,
-    send_ga_tracking_celery_event,
+    send_ga_tracking_celery_event)
-    send_ga_tracking_web_view)
 from allianceauth.utils.testing import NoSocketsTestCase
 
 
-GOOGLE_ANALYTICS_DEBUG_URL = 'https://www.google-analytics.com/debug/collect'
+GOOGLE_ANALYTICS_DEBUG_URL = 'https://www.google-analytics.com/debug/mp/collect'
 
 
 @override_settings(CELERY_ALWAYS_EAGER=True, CELERY_EAGER_PROPAGATES_EXCEPTIONS=True)
@@ -18,195 +17,53 @@ class TestAnalyticsTasks(NoSocketsTestCase):
     def test_analytics_event(self, requests_mocker):
         requests_mocker.register_uri('POST', GOOGLE_ANALYTICS_DEBUG_URL)
         analytics_event(
-                        category='allianceauth.analytics',
+            namespace='allianceauth.analytics',
-                        action='send_tests',
+            task='send_tests',
-                        label='test',
+            label='test',
-                        value=1,
+            value=1,
-                        event_type='Stats')
+            result="Success",
-
+            event_type='Stats')
-    def test_send_ga_tracking_web_view_sent(self, requests_mocker):
-        """This test sends if the event SENDS to google.
-        Not if it was successful.
-        """
-        # given
-        requests_mocker.register_uri('POST', GOOGLE_ANALYTICS_DEBUG_URL)
-        tracking_id = 'UA-186249766-2'
-        client_id = 'ab33e241fbf042b6aa77c7655a768af7'
-        page = '/index/'
-        title = 'Hello World'
-        locale = 'en'
-        useragent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"
-        # when
-        response = send_ga_tracking_web_view(
-                                            tracking_id,
-                                            client_id,
-                                            page,
-                                            title,
-                                            locale,
-                                            useragent)
-        # then
-        self.assertEqual(response.status_code, 200)
-
-    def test_send_ga_tracking_web_view_success(self, requests_mocker):
-        # given
-        requests_mocker.register_uri(
-            'POST',
-            GOOGLE_ANALYTICS_DEBUG_URL,
-            json={"hitParsingResult":[{'valid': True}]}
-        )
-        tracking_id = 'UA-186249766-2'
-        client_id = 'ab33e241fbf042b6aa77c7655a768af7'
-        page = '/index/'
-        title = 'Hello World'
-        locale = 'en'
-        useragent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"
-        # when
-        json_response = send_ga_tracking_web_view(
-                                                tracking_id,
-                                                client_id,
-                                                page,
-                                                title,
-                                                locale,
-                                                useragent).json()
-        # then
-        self.assertTrue(json_response["hitParsingResult"][0]["valid"])
-
-    def test_send_ga_tracking_web_view_invalid_token(self, requests_mocker):
-        # given
-        requests_mocker.register_uri(
-            'POST',
-            GOOGLE_ANALYTICS_DEBUG_URL,
-            json={
-                "hitParsingResult":[
-                    {
-                        'valid': False,
-                        'parserMessage': [
-                            {
-                                'messageType': 'INFO',
-                                'description': 'IP Address from this hit was anonymized to 1.132.110.0.',
-                                'messageCode': 'VALUE_MODIFIED'
-                            },
-                            {
-                                'messageType': 'ERROR',
-                                'description': "The value provided for parameter 'tid' is invalid. Please see http://goo.gl/a8d4RP#tid for details.",
-                                'messageCode': 'VALUE_INVALID', 'parameter': 'tid'
-                            }
-                        ],
-                        'hit': '/debug/collect?v=1&tid=UA-IntentionallyBadTrackingID-2&cid=ab33e241fbf042b6aa77c7655a768af7&t=pageview&dp=/index/&dt=Hello World&ul=en&ua=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36&aip=1&an=allianceauth&av=2.9.0a2'
-                    }
-                ]
-            }
-        )
-        tracking_id = 'UA-IntentionallyBadTrackingID-2'
-        client_id = 'ab33e241fbf042b6aa77c7655a768af7'
-        page = '/index/'
-        title = 'Hello World'
-        locale = 'en'
-        useragent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"
-        # when
-        json_response = send_ga_tracking_web_view(
-                                            tracking_id,
-                                            client_id,
-                                            page,
-                                            title,
-                                            locale,
-                                            useragent).json()
-        # then
-        self.assertFalse(json_response["hitParsingResult"][0]["valid"])
-        self.assertEqual(
-            json_response["hitParsingResult"][0]["parserMessage"][1]["description"],
-            "The value provided for parameter 'tid' is invalid. Please see http://goo.gl/a8d4RP#tid for details."
-        )
-
-        # [{'valid': False, 'parserMessage': [{'messageType': 'INFO', 'description': 'IP Address from this hit was anonymized to 1.132.110.0.', 'messageCode': 'VALUE_MODIFIED'}, {'messageType': 'ERROR', 'description': "The value provided for parameter 'tid' is invalid. Please see http://goo.gl/a8d4RP#tid for details.", 'messageCode': 'VALUE_INVALID', 'parameter': 'tid'}], 'hit': '/debug/collect?v=1&tid=UA-IntentionallyBadTrackingID-2&cid=ab33e241fbf042b6aa77c7655a768af7&t=pageview&dp=/index/&dt=Hello World&ul=en&ua=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36&aip=1&an=allianceauth&av=2.9.0a2'}]
 
     def test_send_ga_tracking_celery_event_sent(self, requests_mocker):
         # given
         requests_mocker.register_uri('POST', GOOGLE_ANALYTICS_DEBUG_URL)
-        tracking_id = 'UA-186249766-2'
+        token = 'G-6LYSMYK8DE'
-        client_id = 'ab33e241fbf042b6aa77c7655a768af7'
+        secret = 'KLlpjLZ-SRGozS5f5wb_kw',
         category = 'test'
         action = 'test'
         label = 'test'
         value = '1'
         # when
-        response = send_ga_tracking_celery_event(
+        task = send_ga_tracking_celery_event(
-                                                tracking_id,
+            token,
-                                                client_id,
+            secret,
-                                                category,
+            category,
-                                                action,
+            action,
-                                                label,
+            label,
-                                                value)
+            value)
         # then
-        self.assertEqual(response.status_code, 200)
+        self.assertEqual(task, 200)
 
     def test_send_ga_tracking_celery_event_success(self, requests_mocker):
         # given
         requests_mocker.register_uri(
             'POST',
             GOOGLE_ANALYTICS_DEBUG_URL,
-            json={"hitParsingResult":[{'valid': True}]}
+            json={"validationMessages": []}
         )
-        tracking_id = 'UA-186249766-2'
+        token = 'G-6LYSMYK8DE'
-        client_id = 'ab33e241fbf042b6aa77c7655a768af7'
+        secret = 'KLlpjLZ-SRGozS5f5wb_kw',
         category = 'test'
         action = 'test'
         label = 'test'
         value = '1'
         # when
-        json_response = send_ga_tracking_celery_event(
+        task = send_ga_tracking_celery_event(
-                                                    tracking_id,
+            token,
-                                                    client_id,
+            secret,
-                                                    category,
+            category,
-                                                    action,
+            action,
-                                                    label,
+            label,
-                                                    value).json()
+            value)
         # then
-        self.assertTrue(json_response["hitParsingResult"][0]["valid"])
+        self.assertTrue(task, 200)
-
-    def test_send_ga_tracking_celery_event_invalid_token(self, requests_mocker):
-        # given
-        requests_mocker.register_uri(
-            'POST',
-            GOOGLE_ANALYTICS_DEBUG_URL,
-            json={
-                "hitParsingResult":[
-                    {
-                        'valid': False,
-                        'parserMessage': [
-                            {
-                                'messageType': 'INFO',
-                                'description': 'IP Address from this hit was anonymized to 1.132.110.0.',
-                                'messageCode': 'VALUE_MODIFIED'
-                            },
-                            {
-                                'messageType': 'ERROR',
-                                'description': "The value provided for parameter 'tid' is invalid. Please see http://goo.gl/a8d4RP#tid for details.",
-                                'messageCode': 'VALUE_INVALID', 'parameter': 'tid'
-                            }
-                        ],
-                        'hit': '/debug/collect?v=1&tid=UA-IntentionallyBadTrackingID-2&cid=ab33e241fbf042b6aa77c7655a768af7&t=pageview&dp=/index/&dt=Hello World&ul=en&ua=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36&aip=1&an=allianceauth&av=2.9.0a2'
-                    }
-                ]
-            }
-        )
-        tracking_id = 'UA-IntentionallyBadTrackingID-2'
-        client_id = 'ab33e241fbf042b6aa77c7655a768af7'
-        category = 'test'
-        action = 'test'
-        label = 'test'
-        value = '1'
-        # when
-        json_response = send_ga_tracking_celery_event(
-                                                    tracking_id,
-                                                    client_id,
-                                                    category,
-                                                    action,
-                                                    label,
-                                                    value).json()
-        # then
-        self.assertFalse(json_response["hitParsingResult"][0]["valid"])
-        self.assertEqual(
-            json_response["hitParsingResult"][0]["parserMessage"][1]["description"],
-            "The value provided for parameter 'tid' is invalid. Please see http://goo.gl/a8d4RP#tid for details."
-        )

allianceauth/analytics/tests/test_utils.py

@@ -18,17 +18,17 @@ def create_testdata():
         'abc@example.com',
         'password'
     )
-    #Token.objects.all().delete()
+    # Token.objects.all().delete()
-    #Token.objects.create(
+    # Token.objects.create(
     #            character_id=101,
     #            character_name='character1',
     #            access_token='my_access_token'
-    #)
+    # )
-    #Token.objects.create(
+    # Token.objects.create(
     #            character_id=102,
     #            character_name='character2',
     #            access_token='my_access_token'
-    #)
+    # )
 
 
 class TestAnalyticsUtils(TestCase):
@@ -40,7 +40,7 @@ class TestAnalyticsUtils(TestCase):
         users = install_stat_users()
         self.assertEqual(users, expected)
 
-    #def test_install_stat_tokens(self):
+    # def test_install_stat_tokens(self):
     #    create_testdata()
     #    expected = 2
     #

allianceauth/apps.py

@@ -1,5 +1,30 @@
 from django.apps import AppConfig
+from django.core.checks import Warning, Error, register
 
 
 class AllianceAuthConfig(AppConfig):
     name = 'allianceauth'
+
+
+@register()
+def check_settings(app_configs, **kwargs):
+    from django.conf import settings
+
+    errors = []
+    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."))
+    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."))
+    if hasattr(settings, "CSRF_TRUSTED_ORIGINS"):
+        if 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."))
+    else:
+        errors.append(Error(
+            "No 'CSRF_TRUSTED_ORIGINS' found is settings, Auth may not load pages correctly until this is rectified"))
+
+    return errors

allianceauth/authentication/admin.py

@@ -288,7 +288,7 @@ class UserAdmin(BaseUserAdmin):
     Behavior of groups and characters columns can be configured via settings
     """
 
-    inlines = BaseUserAdmin.inlines + [UserProfileInline]
+    inlines = [UserProfileInline]
     ordering = ('username', )
     list_select_related = ('profile__state', 'profile__main_character')
     show_full_result_count = True

allianceauth/authentication/auth_hooks.py

@@ -0,0 +1,45 @@
+from allianceauth.hooks import DashboardItemHook
+from allianceauth import hooks
+from .views import dashboard_characters, dashboard_groups, dashboard_admin
+
+
+class UserCharactersHook(DashboardItemHook):
+    def __init__(self):
+        DashboardItemHook.__init__(
+            self,
+            dashboard_characters,
+            5
+        )
+
+
+class UserGroupsHook(DashboardItemHook):
+    def __init__(self):
+        DashboardItemHook.__init__(
+            self,
+            dashboard_groups,
+            5
+        )
+
+
+class AdminHook(DashboardItemHook):
+    def __init__(self):
+        DashboardItemHook.__init__(
+            self,
+            dashboard_admin,
+            0
+        )
+
+
+@hooks.register('dashboard_hook')
+def register_character_hook():
+    return UserCharactersHook()
+
+
+@hooks.register('dashboard_hook')
+def register_groups_hook():
+    return UserGroupsHook()
+
+
+@hooks.register('dashboard_hook')
+def register_admin_hook():
+    return AdminHook()

allianceauth/authentication/backends.py

@@ -2,6 +2,7 @@ import logging
 
 from django.contrib.auth.backends import ModelBackend
 from django.contrib.auth.models import User, Permission
+from django.contrib import messages
 
 from .models import UserProfile, CharacterOwnership, OwnershipRecord
 
@@ -40,7 +41,9 @@ class StateBackend(ModelBackend):
                 if ownership.user.profile.main_character:
                     if ownership.user.profile.main_character.character_id == token.character_id:
                         return ownership.user
-                    else:  # this is an alt, enforce main only.
+                    else:  ## this is an alt, enforce main only.
+                        if request:
+                            messages.error("Unable to authenticate with this Character, Please log in with the main character associated with this account.")
                         return None
             else:
                 logger.debug(f'{token.character_name} has changed ownership. Creating new user account.')
@@ -63,7 +66,9 @@ class StateBackend(ModelBackend):
                     user = records[0].user
                     if user.profile.main_character:
                         if user.profile.main_character.character_id != token.character_id:
-                            # this is an alt, enforce main only due to trust issues in SSO.
+                            ## this is an alt, enforce main only due to trust issues in SSO.
+                            if request:
+                                messages.error("Unable to authenticate with this Character, Please log in with the main character associated with this account. Then add this character from the dashboard.")
                             return None
 
                     token.user = user

allianceauth/authentication/decorators.py

@@ -1,3 +1,6 @@
+from django.urls import include
+from django.contrib.auth.decorators import user_passes_test
+from django.core.exceptions import PermissionDenied
 from functools import wraps
 from typing import Callable, Iterable, Optional
 

allianceauth/authentication/middleware.py

@@ -31,6 +31,7 @@ class UserSettingsMiddleware(MiddlewareMixin):
             except Exception as e:
                 logger.exception(e)
 
+            # AA v3 NIGHT_MODE
             # Set our Night mode flag from the DB
             # Null = hasnt been set by the user ever, dont act.
             #
@@ -42,4 +43,13 @@ class UserSettingsMiddleware(MiddlewareMixin):
             except Exception as e:
                 logger.exception(e)
 
+            # AA v4 Themes
+            # Null = has not been set by the user ever, dont act
+            # DEFAULT_THEME or DEFAULT_THEME_DARK will be used in get_theme()
+            try:
+                if request.user.profile.theme is not None:
+                    request.session["THEME"] = request.user.profile.theme
+            except Exception as e:
+                logger.exception(e)
+
         return response

allianceauth/authentication/migrations/0022_userprofile_theme.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.0.10 on 2023-10-07 07:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('authentication', '0021_alter_userprofile_language'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userprofile',
+            name='theme',
+            field=models.CharField(blank=True, help_text='Bootstrap 5 Themes from https://bootswatch.com/ or Community Apps', max_length=200, null=True, verbose_name='Theme'),
+        ),
+    ]

allianceauth/authentication/models.py

@@ -101,6 +101,13 @@ class UserProfile(models.Model):
         _("Night Mode"),
         blank=True,
         null=True)
+    theme = models.CharField(
+        _("Theme"),
+        max_length=200,
+        blank=True,
+        null=True,
+        help_text="Bootstrap 5 Themes from https://bootswatch.com/ or Community Apps"
+    )
 
     def assign_state(self, state=None, commit=True):
         if not state:

allianceauth/authentication/templates/authentication/dashboard.characters.html

@@ -0,0 +1,46 @@
+{% load i18n %}
+<div class="col-12 col-xl-8 align-self-stretch p-2 ps-0">
+    <div class="card">
+        <div class="card-body">
+            <div class="d-flex align-items-center">
+                <h4 class="ms-auto me-auto">
+                    {% translate "Characters" %}
+                </h4>
+            </div>
+            <div class="card-body">
+                <div style="height: 300px; overflow-y:auto;">
+                    <div class="d-flex">
+                        <a href="{% url 'authentication:add_character' %}" class="btn btn-primary flex-fill m-1" title="{% translate 'Add Character' %}">
+                            <span class="d-md-inline m-2">{% translate 'Add Character' %}</span>
+                        </a>
+                        <a href="{% url 'authentication:change_main_character' %}" class="btn btn-primary flex-fill m-1" title="{% translate 'Change Main' %}">
+                            <span class="d-md-inline m-2">{% translate 'Change Main' %}</span>
+                        </a>
+                    </div>
+                    <table class="table">
+                        <thead>
+                            <tr>
+                                <th class="text-center"></th>
+                                <th class="text-center">{% translate "Name" %}</th>
+                                <th class="text-center">{% translate "Corp" %}</th>
+                                <th class="text-center">{% translate "Alliance" %}</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {% for char in characters %}
+                                <tr>
+                                    <td class="text-center">
+                                        <img class="ra-avatar rounded-circle" src="{{ char.portrait_url_32 }}" alt="{{ char.character_name }}">
+                                    </td>
+                                    <td class="text-center">{{ char.character_name }}</td>
+                                    <td class="text-center">{{ char.corporation_name }}</td>
+                                    <td class="text-center">{{ char.alliance_name|default_if_none:"" }}</td>
+                                </tr>
+                            {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

allianceauth/authentication/templates/authentication/dashboard.groups.html

@@ -0,0 +1,20 @@
+{% load i18n %}
+<div class="col-12 col-xl-4 align-self-stretch py-2 ps-2">
+    <div class="card h-100">
+        <div class="card-body">
+            <h4 class="card-title text-center">{% translate "Membership" %}</h4>
+            <div class="card-body">
+                <div style="height: 300px; overflow-y:auto;">
+                    <h6 class="text-center">{% translate "State:" %} {{ request.user.profile.state }}</h6>
+                    <table class="table">
+                        {% for group in groups %}
+                            <tr>
+                                <td class="text-center">{{ group.name }}</td>
+                            </tr>
+                        {% endfor %}
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

allianceauth/authentication/templates/authentication/dashboard.html

@@ -1,190 +1,15 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
+{% load static %}
 {% load i18n %}
 
 {% block page_title %}{% translate "Dashboard" %}{% endblock %}
-
+{% block header_nav_brand %}
+    {% translate "Dashboard" %}
+{% endblock %}
 {% block content %}
-    <h1 class="page-header text-center">{% translate "Dashboard" %}</h1>
+    <div class="d-flex justify-content-around align-self-center flex-wrap">
-    {% if user.is_staff %}
+        {% for dash in views %}
-        {% include 'allianceauth/admin-status/include.html' %}
+            {{ dash | safe }}
-    {% endif %}
+        {% endfor %}
-    <div class="col-sm-12">
-        <div class="row vertical-flexbox-row2">
-            <div class="col-sm-6 text-center">
-                <div class="panel panel-primary" style="height:100%">
-                    <div class="panel-heading">
-                        <h3 class="panel-title">
-                            {% blocktranslate with state=request.user.profile.state %}
-                                Main Character (State: {{ state }})
-                            {% endblocktranslate %}
-                        </h3>
-                    </div>
-                    <div class="panel-body">
-                        {% if request.user.profile.main_character %}
-                            {% with request.user.profile.main_character as main %}
-                                <div class="hidden-xs">
-                                    <div class="col-lg-4 col-sm-2">
-                                        <table class="table">
-                                            <tr>
-                                                <td class="text-center">
-                                                    <img class="ra-avatar" src="{{ main.portrait_url_128 }}" alt="{{ main.character_name }}">
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td class="text-center">{{ main.character_name }}</td>
-                                            </tr>
-                                        </table>
-                                    </div>
-                                    <div class="col-lg-4 col-sm-2">
-                                        <table class="table">
-                                            <tr>
-                                                <td class="text-center">
-                                                    <img class="ra-avatar" src="{{ main.corporation_logo_url_128 }}" alt="{{ main.corporation_name }}">
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td class="text-center">{{ main.corporation_name }}</td>
-                                            </tr>
-                                        </table>
-                                    </div>
-                                    <div class="col-lg-4 col-sm-2">
-                                        {% if main.alliance_id %}
-                                            <table class="table">
-                                                <tr>
-                                                    <td class="text-center">
-                                                        <img class="ra-avatar" src="{{ main.alliance_logo_url_128 }}" alt="{{ main.alliance_name }}">
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="text-center">{{ main.alliance_name }}</td>
-                                                <tr>
-                                            </table>
-                                        {% elif main.faction_id %}
-                                            <table class="table">
-                                                <tr>
-                                                    <td class="text-center">
-                                                        <img class="ra-avatar" src="{{ main.faction_logo_url_128 }}" alt="{{ main.faction_name }}">
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="text-center">{{ main.faction_name }}</td>
-                                                <tr>
-                                            </table>
-                                        {% endif %}
-                                    </div>
-                                </div>
-                                <div class="table visible-xs-block">
-                                    <p>
-                                        <img class="ra-avatar" src="{{ main.portrait_url_64 }}" alt="{{ main.corporation_name }}">
-                                        <img class="ra-avatar" src="{{ main.corporation_logo_url_64 }}" alt="{{ main.corporation_name }}">
-                                        {% if main.alliance_id %}
-                                            <img class="ra-avatar" src="{{ main.alliance_logo_url_64 }}" alt="{{ main.alliance_name }}">
-                                        {% endif %}
-                                        {% if main.faction_id %}
-                                            <img class="ra-avatar" src="{{ main.faction_logo_url_64 }}" alt="{{ main.faction_name }}">
-                                        {% endif %}
-                                    </p>
-                                    <p>
-                                        <strong>{{ main.character_name }}</strong><br>
-                                        {{ main.corporation_name }}<br>
-                                        {% if main.alliance_id %}
-                                            {{ main.alliance_name }}<br>
-                                        {% endif %}
-                                        {% if main.faction_id %}
-                                            {{ main.faction_name }}
-                                        {% endif %}
-                                    </p>
-                                </div>
-                            {% endwith %}
-                        {% else %}
-                            <div class="alert alert-danger" role="alert">
-                                {% translate "No main character set." %}
-                            </div>
-                        {% endif %}
-                        <div class="clearfix"></div>
-                        <div class="row">
-                            <div class="col-sm-6">
-                                <p>
-                                    <a href="{% url 'authentication:add_character' %}" class="btn btn-block btn-info"
-                                    title="Add Character">{% translate 'Add Character' %}</a>
-                                </p>
-                            </div>
-                            <div class="col-sm-6">
-                                <p>
-                                    <a href="{% url 'authentication:change_main_character' %}" class="btn btn-block btn-info"
-                                    title="Change Main Character">{% translate "Change Main" %}</a>
-                                </p>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-6 text-center">
-                <div class="panel panel-success" style="height:100%">
-                    <div class="panel-heading">
-                        <h3 class="panel-title">{% translate "Group Memberships" %}</h3>
-                    </div>
-                    <div class="panel-body">
-                        <div style="height: 240px;overflow-y:auto;">
-                            <table class="table table-aa">
-                                {% for group in groups %}
-                                    <tr>
-                                        <td>{{ group.name }}</td>
-                                    </tr>
-                                {% endfor %}
-                            </table>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="clearfix"></div>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h3 class="panel-title text-center" style="text-align: center">
-                    {% translate 'Characters' %}
-                </h3>
-            </div>
-            <div class="panel-body">
-                <table class="table table-aa hidden-xs">
-                    <thead>
-                        <tr>
-                            <th class="text-center"></th>
-                            <th class="text-center">{% translate 'Name' %}</th>
-                            <th class="text-center">{% translate 'Corp' %}</th>
-                            <th class="text-center">{% translate 'Alliance' %}</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for char in characters %}
-                            <tr>
-                                <td class="text-center">
-                                    <img class="ra-avatar img-circle" src="{{ char.portrait_url_32 }}" alt="{{ char.character_name }}">
-                                </td>
-                                <td class="text-center">{{ char.character_name }}</td>
-                                <td class="text-center">{{ char.corporation_name }}</td>
-                                <td class="text-center">{{ char.alliance_name|default:"" }}</td>
-                            </tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
-                <table class="table table-aa visible-xs-block" style="width: 100%">
-                    <tbody>
-                        {% for char in characters %}
-                            <tr>
-                                <td class="text-center" style="vertical-align: middle">
-                                    <img class="ra-avatar img-circle" src="{{ char.portrait_url_32 }}" alt="{{ char.character_name }}">
-                                </td>
-                                <td class="text-center" style="vertical-align: middle; width: 100%">
-                                    <strong>{{ char.character_name }}</strong><br>
-                                    {{ char.corporation_name }}<br>
-                                    {{ char.alliance_name|default:"" }}
-                                </td>
-                            </tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
-            </div>
-        </div>
     </div>
 {% endblock %}

allianceauth/authentication/templates/authentication/tokens.html

@@ -1,16 +1,16 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
 
-{% block page_title %}{% translate "Dashboard" %}{% endblock %}
+{% block page_title %}{% translate "Dashboard" %}{% endblock page_title %}
 
 {% block content %}
     <h1 class="page-header text-center">{% translate "Token Management" %}</h1>
-    <div class="col-sm-12">
+    <div>
-        <table class="table table-aa" id="table_tokens" style="width:100%">
+        <table class="table table-aa" id="table_tokens" style="width: 100%;">
             <thead>
                 <tr>
                     <th>{% translate "Scopes" %}</th>
-                    <th class="text-right">{% translate "Actions" %}</th>
+                    <th class="text-end">{% translate "Actions" %}</th>
                     <th>{% translate "Character" %}</th>
 
                 </tr>
@@ -18,24 +18,27 @@
             <tbody>
                 {% for t in tokens %}
                     <tr>
-                        <td styl="white-space:initial;">{% for s in t.scopes.all %}<span class="label label-default">{{s.name}}</span> {% endfor %}</td>
+                        <td style="white-space:initial;">{% for s in t.scopes.all %}<span class="badge bg-secondary">{{ s.name }}</span>{% endfor %}</td>
-                        <td nowrap class="text-right"><a href="{% url 'authentication:token_delete' t.id %}" class="btn btn-danger"><i class="fas fa-trash"></i></a> <a href="{% url 'authentication:token_refresh' t.id %}" class="btn btn-success"><i class="fas fa-sync-alt"></i></a></td>
+                        <td nowrap class="text-end">
-                        <td>{{t.character_name}}</td>
+                            <a href="{% url 'authentication:token_delete' t.id %}" class="btn btn-danger"><i class="fas fa-trash"></i></a>
+                            <a href="{% url 'authentication:token_refresh' t.id %}" class="btn btn-success"><i class="fas fa-sync-alt"></i></a>
+                        </td>
+                        <td>{{ t.character_name }}</td>
                     </tr>
                 {% endfor %}
             </tbody>
         </table>
         {% 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 %}
     </div>
-{% endblock %}
+{% endblock content %}
 
 {% block extra_javascript %}
-    {% include 'bundles/datatables-js.html' %}
+    {% include "bundles/datatables-js-bs5.html" %}
-{% endblock %}
+{% endblock extra_javascript %}
 
 {% block extra_css %}
-    {% include 'bundles/datatables-css.html' %}
+    {% include "bundles/datatables-css-bs5.html" %}
-{% endblock %}
+{% endblock extra_css %}
 
 {% block extra_script %}
     $(document).ready(function(){
@@ -59,4 +62,4 @@
             "stateSave": true,
         });
     });
-{% endblock %}
+{% endblock extra_script %}

allianceauth/authentication/templates/public/base.html

@@ -7,6 +7,7 @@
         <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 overide -->
         <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.">
@@ -30,7 +31,7 @@
             }
 
             .panel-transparent {
-                background: rgba(48, 48, 48, 0.7);
+                background: rgba(48  48  48 / 0.7);
                 color: #ffffff;
                 padding-bottom: 21px;
             }

allianceauth/authentication/views.py

@@ -1,4 +1,5 @@
 import logging
+from allianceauth.hooks import get_hooks
 
 from django_registration.backends.activation.views import (
     REGISTRATION_SALT, ActivationView as BaseActivationView,
@@ -42,23 +43,51 @@ def index(request):
     return redirect('authentication:dashboard')
 
 
-@login_required
+def dashboard_groups(request):
-def dashboard(request):
     groups = request.user.groups.all()
     if _has_auto_groups:
         groups = groups\
             .filter(managedalliancegroup__isnull=True)\
             .filter(managedcorpgroup__isnull=True)
     groups = groups.order_by('name')
+
+    context = {
+        'groups': groups,
+    }
+    return render_to_string('authentication/dashboard.groups.html', context=context, request=request)
+
+
+def dashboard_characters(request):
     characters = EveCharacter.objects\
         .filter(character_ownership__user=request.user)\
         .select_related()\
         .order_by('character_name')
 
     context = {
-        'groups': groups,
         'characters': characters
     }
+    return render_to_string('authentication/dashboard.characters.html', context=context, request=request)
+
+
+def dashboard_admin(request):
+    if request.user.is_superuser:
+        return render_to_string('allianceauth/admin-status/include.html', request=request)
+    else:
+        return ""
+
+
+@login_required
+def dashboard(request):
+    _dash_items = list()
+    hooks = get_hooks('dashboard_hook')
+    items = [fn() for fn in hooks]
+    items.sort(key=lambda i: i.order)
+    for item in items:
+        _dash_items.append(item.render(request))
+
+    context = {
+        'views': _dash_items,
+    }
     return render(request, 'authentication/dashboard.html', context)
 
 
@@ -171,13 +200,7 @@ def sso_login(request, token):
             request.session['registration_uid'] = user.pk
             # Go to Step 2
             return redirect('registration_register')
-    # Logging in with an alt is not allowed due to security concerns.
+    messages.error(request, _('Unable to authenticate as the selected character.'))
-    token.delete()
-    messages.error(
-        request,
-        _('Unable to authenticate as the selected character. '
-        'Please log in with the main character associated with this account.')
-    )
     return redirect(settings.LOGIN_URL)
 
 

allianceauth/bin/allianceauth.py

@@ -12,13 +12,14 @@ class StartProject(BaseStartProject):
         parser.add_argument('--python', help='The path to the python executable.')
         parser.add_argument('--celery', help='The path to the celery executable.')
         parser.add_argument('--gunicorn', help='The path to the gunicorn executable.')
+        parser.add_argument('--memmon', help='The path to the memmon executable.')
 
 
 def create_project(parser, options, args):
     # Validate args
     if len(args) < 2:
         parser.error("Please specify a name for your Alliance Auth installation.")
-    elif len(args) > 3:
+    elif len(args) > 4:
         parser.error("Too many arguments.")
 
     # First find the path to Alliance Auth
@@ -32,6 +33,7 @@ def create_project(parser, options, args):
         'python': shutil.which('python'),
         'gunicorn': shutil.which('gunicorn'),
         'celery': shutil.which('celery'),
+        'memmon': shutil.which('memmon'),
         'extensions': ['py', 'conf', 'json'],
     }
 

allianceauth/corputils/auth_hooks.py

@@ -1,4 +1,5 @@
-from allianceauth.services.hooks import MenuItemHook, UrlHook
+from allianceauth.menu.hooks import MenuItemHook
+from allianceauth.services.hooks import UrlHook
 from django.utils.translation import gettext_lazy as _
 from allianceauth import hooks
 from allianceauth.corputils import urls

allianceauth/corputils/templates/corputils/base.html

@@ -1,37 +1,40 @@
-{% extends 'allianceauth/base.html' %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
-{% block page_title %}{% translate "Corporation Member Data" %}{% endblock %}
+{% block page_title %}
+    {% translate "Corporation Member Data" %}
+{% endblock page_title %}
 {% block content %}
-    <div class="col-lg-12">
+    <div>
         <h1 class="page-header text-center">{% translate "Corporation Member Data" %}</h1>
-        <div class="col-lg-10 col-lg-offset-1 container">
+        <nav class="navbar navbar-default">
-            <nav class="navbar navbar-default">
+            <div class="container-fluid">
-                <div class="container-fluid">
+                <ul class="nav navbar-nav">
-                    <ul class="nav navbar-nav">
+                    <li class="dropdown">
-                        <li class="dropdown">
+                        <a href="#" id="dLabel" class="dropdown-toggle" role="button" data-toggle="dropdown" aria-haspopup="false" aria-expanded="false">{% translate "Corporations" %}<span class="caret"></span></a>
-                            <a href="#" id="dLabel" class="dropdown-toggle" role="button" data-toggle="dropdown" aria-haspopup="false" aria-expanded="false">{% translate "Corporations" %}<span class="caret"></span></a>
+                        <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-                            <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+                            {% for corpstat in available %}
-                                {% for corpstat in available %}
+                                <li>
-                                    <li>
+                                    <a href="{% url 'corputils:view_corp' corpstat.corp.corporation_id %}">{{ corpstat.corp.corporation_name }}</a>
-                                        <a href="{% url 'corputils:view_corp' corpstat.corp.corporation_id %}">{{ corpstat.corp.corporation_name }}</a>
+                                </li>
-                                    </li>
+                            {% endfor %}
-                                {% endfor %}
+                        </ul>
-                            </ul>
+                    </li>
+                    {% if perms.corputils.add_corpstats %}
+                        <li>
+                            <a href="{% url 'corputils:add' %}">{% translate "Add" %}</a>
                         </li>
-                        {% if perms.corputils.add_corpstats %}
+                    {% endif %}
-                            <li>
+                </ul>
-                                <a href="{% url 'corputils:add' %}">{% translate "Add" %}</a>
+
-                            </li>
+                <form class="navbar-form navbar-right" role="search" action="{% url 'corputils:search' %}" method="GET">
-                        {% endif %}
+                    <div class="form-group">
-                    </ul>
+                        <input type="text" class="form-control" name="search_string" placeholder="{% if search_string %}{{ search_string }}{% else %}{% translate 'Search all corporations...' %}{% endif %}">
-                    <form class="navbar-form navbar-right" role="search" action="{% url 'corputils:search' %}" method="GET">
+                    </div>
-                        <div class="form-group">
+                </form>
-                            <input type="text" class="form-control" name="search_string" placeholder="{% if search_string %}{{ search_string }}{% else %}{% translate "Search all corporations..." %}{% endif %}">
+            </div>
-                        </div>
+        </nav>
-                    </form>
+
-                </div>
+        {% block member_data %}
-            </nav>
+        {% endblock member_data %}
-            {% block member_data %}{% endblock %}
-        </div>
     </div>
-{% endblock %}
+{% endblock content %}

allianceauth/corputils/templates/corputils/corpstats.html

@@ -3,177 +3,175 @@
 {% load humanize %}
 {% block member_data %}
     {% if corpstats %}
-        <div class="row">
+        <div>
-            <div class="col-lg-12 text-center">
+            <table class="table">
-                <table class="table">
+                <tr>
-                    <tr>
+                    <td class="text-center col-lg-6{% if corpstats.corp.alliance %}{% else %}col-lg-offset-3{% endif %}">
-                        <td class="text-center col-lg-6{% if corpstats.corp.alliance %}{% else %}col-lg-offset-3{% endif %}">
+                            <img class="ra-avatar" src="{{ corpstats.corp.logo_url_64 }}" alt="{{ corpstats.corp.corporation_name }}">
-                                <img class="ra-avatar" src="{{ corpstats.corp.logo_url_64 }}" alt="{{ corpstats.corp.corporation_name }}">
+                        </td>
-                            </td>
+                    {% if corpstats.corp.alliance %}
-                        {% if corpstats.corp.alliance %}
+                        <td class="text-center col-lg-6">
-                            <td class="text-center col-lg-6">
+                            <img class="ra-avatar" src="{{ corpstats.corp.alliance.logo_url_64 }}" alt="{{ corpstats.corp.alliance.alliance_name }}">
-                                <img class="ra-avatar" src="{{ corpstats.corp.alliance.logo_url_64 }}" alt="{{ corpstats.corp.alliance.alliance_name }}">
+                        </td>
-                            </td>
+                    {% endif %}
-                        {% endif %}
+                </tr>
-                    </tr>
+                <tr>
-                    <tr>
+                    <td class="text-center"><h4>{{ corpstats.corp.corporation_name }}</h4></td>
-                        <td class="text-center"><h4>{{ corpstats.corp.corporation_name }}</h4></td>
+                    {% if corpstats.corp.alliance %}
-                        {% if corpstats.corp.alliance %}
+                        <td class="text-center"><h4>{{ corpstats.corp.alliance.alliance_name }}</h4></td>
-                            <td class="text-center"><h4>{{ corpstats.corp.alliance.alliance_name }}</h4></td>
+                    {% endif %}
-                        {% endif %}
+                </tr>
-                    </tr>
+            </table>
-                </table>
-            </div>
         </div>
-        <div class="row">
+
-            <div class="col-lg-12">
+        <div>
-                <div class="panel panel-default">
+            <div class="panel panel-default">
-                    <div class="panel-heading">
+                <div class="panel-heading">
-                        <ul class="nav nav-pills pull-left">
+                    <ul class="nav nav-pills pull-left">
-                            <li class="active"><a href="#mains" data-toggle="pill">{% translate 'Mains' %} ({{ total_mains }})</a></li>
+                        <li class="active"><a href="#mains" data-toggle="pill">{% translate 'Mains' %} ({{ total_mains }})</a></li>
-                            <li><a href="#members" data-toggle="pill">{% translate 'Members' %} ({{ corpstats.member_count }})</a></li>
+                        <li><a href="#members" data-toggle="pill">{% translate 'Members' %} ({{ corpstats.member_count }})</a></li>
-                            <li><a href="#unregistered" data-toggle="pill">{% translate 'Unregistered' %} ({{ unregistered.count }})</a></li>
+                        <li><a href="#unregistered" data-toggle="pill">{% translate 'Unregistered' %} ({{ unregistered.count }})</a></li>
-                        </ul>
+                    </ul>
-                        <div class="pull-right hidden-xs">
+                    <div class="pull-right hidden-xs">
-                            {% translate "Last update:" %} {{ corpstats.last_update|naturaltime }}&nbsp;
+                        {% translate "Last update:" %} {{ corpstats.last_update|naturaltime }}&nbsp;
-                            <a class="btn btn-success" type="button" href="{% url 'corputils:update' corpstats.corp.corporation_id %}" title="Update Now">
+                        <a class="btn btn-success" type="button" href="{% url 'corputils:update' corpstats.corp.corporation_id %}" title="Update Now">
-                                <span class="glyphicon glyphicon-refresh"></span>
+                            <span class="glyphicon glyphicon-refresh"></span>
-                            </a>
+                        </a>
-                        </div>
-                        <div class="clearfix"></div>
                     </div>
-                    <div class="panel-body">
+                    <div class="clearfix"></div>
-                        <div class="tab-content">
+                </div>
-                            <div class="tab-pane fade in active" id="mains">
+
-                                {% if mains %}
+                <div class="panel-body">
-                                    <div class="table-responsive">
+                    <div class="tab-content">
-                                        <table class="table table-hover" id="table-mains">
+                        <div class="tab-pane fade in active" id="mains">
-                                            <thead>
+                            {% if mains %}
+                                <div class="table-responsive">
+                                    <table class="table table-hover" id="table-mains">
+                                        <thead>
+                                            <tr>
+                                                <th style="height:1em;"><!-- Must have text or height to prevent clipping --></th>
+                                                <th></th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            {% for id, main in mains.items %}
                                                 <tr>
-                                                    <th style="height:1em;"><!-- Must have text or height to prevent clipping --></th>
+                                                    <td class="text-center" style="vertical-align:middle">
-                                                    <th></th>
+                                                        <div class="thumbnail" style="border: 0 none; box-shadow: none; background: transparent;">
-                                                </tr>
+                                                            <img src="{{ main.main.portrait_url_64 }}" class="img-circle" alt="{{ main.main }}">
-                                            </thead>
+                                                            <div class="caption text-center">
-                                            <tbody>
+                                                                {{ main.main }}
-                                                {% for id, main in mains.items %}
-                                                    <tr>
-                                                        <td class="text-center" style="vertical-align:middle">
-                                                            <div class="thumbnail" style="border: 0 none; box-shadow: none; background: transparent;">
-                                                                <img src="{{ main.main.portrait_url_64 }}" class="img-circle" alt="{{ main.main }}">
-                                                                <div class="caption text-center">
-                                                                    {{ main.main }}
-                                                                </div>
                                                             </div>
-                                                        </td>
+                                                        </div>
-                                                        <td>
+                                                    </td>
-                                                            <table class="table table-hover">
+                                                    <td>
-                                                                {% for alt in main.alts %}
+                                                        <table class="table table-hover">
-                                                                    {% if forloop.first %}
+                                                            {% for alt in main.alts %}
-                                                                        <tr>
+                                                                {% if forloop.first %}
-                                                                            <th></th>
-                                                                            <th class="text-center">{% translate "Character" %}</th>
-                                                                            <th class="text-center">{% translate "Corporation" %}</th>
-                                                                            <th class="text-center">{% translate "Alliance" %}</th>
-                                                                            <th class="text-center"></th>
-                                                                        </tr>
-                                                                    {% endif %}
                                                                     <tr>
-                                                                        <td class="text-center" style="width:5%">
+                                                                        <th></th>
-                                                                            <div class="thumbnail" style="border: 0 none; box-shadow: none; background: transparent;">
+                                                                        <th class="text-center">{% translate "Character" %}</th>
-                                                                                <img src="{{ alt.portrait_url_32 }}" class="img-circle" alt="{{ alt.character_name }}">
+                                                                        <th class="text-center">{% translate "Corporation" %}</th>
-                                                                            </div>
+                                                                        <th class="text-center">{% translate "Alliance" %}</th>
-                                                                        </td>
+                                                                        <th class="text-center"></th>
-                                                                        <td class="text-center" style="width:30%">{{ alt.character_name }}</td>
-                                                                        <td class="text-center" style="width:30%">{{ alt.corporation_name }}</td>
-                                                                        <td class="text-center" style="width:30%">{{ alt.alliance_name }}</td>
-                                                                        <td class="text-center" style="width:5%">
-                                                                            <a href="https://zkillboard.com/character/{{ alt.character_id }}/" class="label label-danger" target="_blank">
-                                                                                {% translate "Killboard" %}
-                                                                            </a>
-                                                                        </td>
                                                                     </tr>
-                                                                {% endfor %}
+                                                                {% endif %}
-                                                            </table>
+                                                                <tr>
-                                                        </td>
+                                                                    <td class="text-center" style="width:5%">
-                                                    </tr>
+                                                                        <div class="thumbnail" style="border: 0 none; box-shadow: none; background: transparent;">
-                                                {% endfor %}
+                                                                            <img src="{{ alt.portrait_url_32 }}" class="img-circle" alt="{{ alt.character_name }}">
-                                            </tbody>
+                                                                        </div>
-                                        </table>
+                                                                    </td>
-                                    </div>
+                                                                    <td class="text-center" style="width:30%">{{ alt.character_name }}</td>
-                                {% endif %}
+                                                                    <td class="text-center" style="width:30%">{{ alt.corporation_name }}</td>
-                            </div>
+                                                                    <td class="text-center" style="width:30%">{{ alt.alliance_name }}</td>
-                            <div class="tab-pane fade" id="members">
+                                                                    <td class="text-center" style="width:5%">
-                                {% if members %}
+                                                                        <a href="https://zkillboard.com/character/{{ alt.character_id }}/" class="badge bg-danger" target="_blank">
-                                    <div class="table-responsive">
+                                                                            {% translate "Killboard" %}
-                                        <table class="table table-hover" id="table-members">
+                                                                        </a>
-                                            <thead>
+                                                                    </td>
-                                                <tr>
+                                                                </tr>
-                                                    <th></th>
+                                                            {% endfor %}
-                                                    <th class="text-center">{% translate "Character" %}</th>
+                                                        </table>
-                                                    <th class="text-center"></th>
+                                                    </td>
-                                                    <th class="text-center">{% translate "Main Character" %}</th>
-                                                    <th class="text-center">{% translate "Main Corporation" %}</th>
-                                                    <th class="text-center">{% translate "Main Alliance" %}</th>
                                                 </tr>
-                                            </thead>
+                                            {% endfor %}
-                                            <tbody>
+                                        </tbody>
-                                                {% for member in members %}
+                                    </table>
-                                                    <tr>
+                                </div>
-                                                        <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member }}"></td>
+                            {% endif %}
-                                                        <td class="text-center">{{ member }}</td>
+                        </div>
-                                                        <td class="text-center">
+                        <div class="tab-pane fade" id="members">
-                                                            <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="label label-danger" target="_blank">{% translate "Killboard" %}</a>
+                            {% if members %}
-                                                        </td>
+                                <div class="table-responsive">
-                                                        <td class="text-center">{{ member.character_ownership.user.profile.main_character.character_name }}</td>
+                                    <table class="table table-hover" id="table-members">
-                                                        <td class="text-center">{{ member.character_ownership.user.profile.main_character.corporation_name }}</td>
+                                        <thead>
-                                                        <td class="text-center">{{ member.character_ownership.user.profile.main_character.alliance_name }}</td>
+                                            <tr>
-                                                    </tr>
+                                                <th></th>
-                                                {% endfor %}
+                                                <th class="text-center">{% translate "Character" %}</th>
-                                                {% for member in unregistered %}
+                                                <th class="text-center"></th>
-                                                    <tr class="danger">
+                                                <th class="text-center">{% translate "Main Character" %}</th>
-                                                        <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member.character_name }}"></td>
+                                                <th class="text-center">{% translate "Main Corporation" %}</th>
-                                                        <td class="text-center">{{ member.character_name }}</td>
+                                                <th class="text-center">{% translate "Main Alliance" %}</th>
-                                                        <td class="text-center">
+                                            </tr>
-                                                            <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="label label-danger" target="_blank">{% translate "Killboard" %}</a>
+                                        </thead>
-                                                        </td>
+                                        <tbody>
-                                                        <td class="text-center"></td>
+                                            {% for member in members %}
-                                                        <td class="text-center"></td>
-                                                        <td class="text-center"></td>
-                                                    </tr>
-                                                {% endfor %}
-                                            </tbody>
-                                        </table>
-                                    </div>
-                                {% endif %}
-                            </div>
-                            <div class="tab-pane fade" id="unregistered">
-                                {% if unregistered %}
-                                    <div class="table-responsive">
-                                        <table class="table table-hover" id="table-unregistered">
-                                            <thead>
                                                 <tr>
-                                                    <th></th>
+                                                    <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member }}"></td>
-                                                    <th class="text-center">{% translate "Character" %}</th>
+                                                    <td class="text-center">{{ member }}</td>
-                                                    <th class="text-center"></th>
+                                                    <td class="text-center">
+                                                        <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge bg-danger" target="_blank">{% translate "Killboard" %}</a>
+                                                    </td>
+                                                    <td class="text-center">{{ member.character_ownership.user.profile.main_character.character_name }}</td>
+                                                    <td class="text-center">{{ member.character_ownership.user.profile.main_character.corporation_name }}</td>
+                                                    <td class="text-center">{{ member.character_ownership.user.profile.main_character.alliance_name }}</td>
                                                 </tr>
-                                            </thead>
+                                            {% endfor %}
-                                            <tbody>
+                                            {% for member in unregistered %}
-                                                {% for member in unregistered %}
+                                                <tr class="danger">
-                                                    <tr class="danger">
+                                                    <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member.character_name }}"></td>
-                                                        <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member.character_name }}"></td>
+                                                    <td class="text-center">{{ member.character_name }}</td>
-                                                        <td class="text-center">{{ member.character_name }}</td>
+                                                    <td class="text-center">
-                                                        <td class="text-center">
+                                                        <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="label label-danger" target="_blank">
+                                                    </td>
-                                                                {% translate "Killboard" %}
+                                                    <td class="text-center"></td>
-                                                            </a>
+                                                    <td class="text-center"></td>
-                                                        </td>
+                                                    <td class="text-center"></td>
-                                                    </tr>
+                                                </tr>
-                                                {% endfor %}
+                                            {% endfor %}
-                                            </tbody>
+                                        </tbody>
-                                        </table>
+                                    </table>
-                                    </div>
+                                </div>
-                                {% endif %}
+                            {% endif %}
-                            </div>
+                        </div>
+                        <div class="tab-pane fade" id="unregistered">
+                            {% if unregistered %}
+                                <div class="table-responsive">
+                                    <table class="table table-hover" id="table-unregistered">
+                                        <thead>
+                                            <tr>
+                                                <th></th>
+                                                <th class="text-center">{% translate "Character" %}</th>
+                                                <th class="text-center"></th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            {% for member in unregistered %}
+                                                <tr class="danger">
+                                                    <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member.character_name }}"></td>
+                                                    <td class="text-center">{{ member.character_name }}</td>
+                                                    <td class="text-center">
+                                                        <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge bg-danger" target="_blank">
+                                                            {% translate "Killboard" %}
+                                                        </a>
+                                                    </td>
+                                                </tr>
+                                            {% endfor %}
+                                        </tbody>
+                                    </table>
+                                </div>
+                            {% endif %}
                         </div>
                     </div>
                 </div>
@@ -181,12 +179,15 @@
         </div>
     {% endif %}
 {% endblock %}
+
 {% block extra_javascript %}
     {% include 'bundles/datatables-js.html' %}
 {% endblock %}
+
 {% block extra_css %}
     {% include 'bundles/datatables-css.html' %}
 {% endblock %}
+
 {% block extra_script %}
     $(document).ready(function(){
         $('#table-mains').DataTable({

allianceauth/corputils/templates/corputils/search.html

@@ -24,7 +24,7 @@
                             <td class="text-center"><img src="{{ result.1.portrait_url }}" class="img-circle" alt="{{ result.1.character_name }}"></td>
                             <td class="text-center">{{ result.1.character_name }}</td>
                             <td class="text-center">{{ result.0.corp.corporation_name }}</td>
-                            <td class="text-center"><a href="https://zkillboard.com/character/{{ result.1.character_id }}/" class="label label-danger" target="_blank">{% translate "Killboard" %}</a></td>
+                            <td class="text-center"><a href="https://zkillboard.com/character/{{ result.1.character_id }}/" class="badge bg-danger" target="_blank">{% translate "Killboard" %}</a></td>
                             <td class="text-center">{{ result.1.main_character.character_name }}</td>
                             <td class="text-center">{{ result.1.main_character.corporation_name }}</td>
                             <td class="text-center">{{ result.1.main_character.alliance_name }}</td>

allianceauth/eveonline/autogroups/tests/test_models.py

@@ -93,7 +93,7 @@ class AutogroupsConfigTestCase(TestCase):
         group_qs = Group.objects.filter(pk=group.pk)
 
         self.assertIn(group, self.member.groups.all())
-        self.assertQuerysetEqual(self.member.groups.all(), map(repr, pre_groups | group_qs), ordered=False)
+        self.assertQuerySetEqual(self.member.groups.all(), pre_groups | group_qs, ordered=False)
 
     def test_update_alliance_group_membership_no_main_character(self):
         obj = AutogroupsConfig.objects.create()
@@ -172,7 +172,7 @@ class AutogroupsConfigTestCase(TestCase):
         group_qs = Group.objects.filter(pk=group.pk)
 
         self.assertIn(group, self.member.groups.all())
-        self.assertQuerysetEqual(self.member.groups.all(), map(repr, pre_groups | group_qs), ordered=False)
+        self.assertQuerySetEqual(self.member.groups.all(), pre_groups | group_qs, ordered=False)
 
     def test_update_corp_group_membership_no_state(self):
         obj = AutogroupsConfig.objects.create(corp_groups=True)

allianceauth/eveonline/templatetags/examples.html

@@ -8,10 +8,10 @@ Needs to be called with a context containing three objects:
 
 -->
 
-{% extends 'allianceauth/base.html' %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load evelinks %}
 
-{% block page_title %}Evelinks examples{% endblock %}
+{% block page_title %}Evelinks Examples{% endblock page_title %}
 
 {% block content %}
 
@@ -25,60 +25,57 @@ Needs to be called with a context containing three objects:
 
                 <div class="col-md-4">
                     <h3>evewho</h3>
-                    <p><a href="{{ my_character|evewho_character_url}}">character from character object</a></p>
+                    <p><a href="{{ my_character|evewho_character_url }}">character from character object</a></p>
-                    <p><a href="{{ my_corporation|evewho_corporation_url}}">corporation form corporation object</a></p>
+                    <p><a href="{{ my_corporation|evewho_corporation_url }}">corporation form corporation object</a></p>
-                    <p><a href="{{ my_character|evewho_corporation_url}}">corporation from charachter object</a></p>
+                    <p><a href="{{ my_character|evewho_corporation_url }}">corporation from charachter object</a></p>
-                    <p><a href="{{ my_alliance|evewho_alliance_url}}">alliance from alliance object</a></p>
+                    <p><a href="{{ my_alliance|evewho_alliance_url }}">alliance from alliance object</a></p>
-                    <p><a href="{{ my_character|evewho_alliance_url}}">alliance from character object</a></p>
+                    <p><a href="{{ my_character|evewho_alliance_url }}">alliance from character object</a></p>
                 </div>
 
                 <div class="col-md-4">
                     <h3>dotlan</h3>
-                    <p><a href="{{ my_character|dotlan_corporation_url}}">corporation form character object</a></p>
+                    <p><a href="{{ my_character|dotlan_corporation_url }}">corporation form character object</a></p>
-                    <p><a href="{{ my_corporation|dotlan_corporation_url}}">corporation form corporation object</a></p>
+                    <p><a href="{{ my_corporation|dotlan_corporation_url }}">corporation form corporation object</a></p>
-                    <p><a href="{{ my_character|dotlan_alliance_url}}">alliance from character object</a></p>
+                    <p><a href="{{ my_character|dotlan_alliance_url }}">alliance from character object</a></p>
-                    <p><a href="{{ my_alliance|dotlan_alliance_url}}">alliance from alliance object</a></p>
+                    <p><a href="{{ my_alliance|dotlan_alliance_url }}">alliance from alliance object</a></p>
-                    <p><a href="{{ 'Black Rise'|dotlan_region_url}}">region from name string</a></p>
+                    <p><a href="{{ 'Black Rise'|dotlan_region_url }}">region from name string</a></p>
-                    <p><a href="{{ 'Tama'|dotlan_solar_system_url}}">solar system from name string</a></p>
+                    <p><a href="{{ 'Tama'|dotlan_solar_system_url }}">solar system from name string</a></p>
                 </div>
 
                 <div class="col-md-4">
                     <h3>zkillboard</h3>
-                    <p><a href="{{ my_character|zkillboard_character_url}}">character from character object</a></p>
+                    <p><a href="{{ my_character|zkillboard_character_url }}">character from character object</a></p>
-                    <p><a href="{{ my_character|zkillboard_corporation_url}}">corporation from character object</a></p>
+                    <p><a href="{{ my_character|zkillboard_corporation_url }}">corporation from character object</a></p>
-                    <p><a href="{{ my_corporation|zkillboard_corporation_url}}">corporation form corporation object</a></p>
+                    <p><a href="{{ my_corporation|zkillboard_corporation_url }}">corporation form corporation object</a></p>
-                    <p><a href="{{ my_character|zkillboard_alliance_url}}">alliance from character object</a></p>
+                    <p><a href="{{ my_character|zkillboard_alliance_url }}">alliance from character object</a></p>
-                    <p><a href="{{ my_alliance|zkillboard_alliance_url}}">alliance from alliance object</a></p>
+                    <p><a href="{{ my_alliance|zkillboard_alliance_url }}">alliance from alliance object</a></p>
-                    <p><a href="{{ 10000069|zkillboard_region_url}}">region from ID</a></p>
+                    <p><a href="{{ 10000069|zkillboard_region_url }}">region from ID</a></p>
-                    <p><a href="{{ 30002813|zkillboard_solar_system_url}}">solar sytem from ID</a></p>
+                    <p><a href="{{ 30002813|zkillboard_solar_system_url }}">solar sytem from ID</a></p>
                 </div>
             </div>
-            </div>
 
             <h2>image URLs</h2>
 
             <div class="rows">
 
                 <div class="col-md-4">
-                    <p>character from ID: <img src="{{ my_character.character_id|character_portrait_url:128}}"></p>
+                    <p>character from ID: <img src="{{ my_character.character_id|character_portrait_url:128 }}"></p>
-                    <p>character from character object: <img src="{{ my_character|character_portrait_url:128}}"></p>
+                    <p>character from character object: <img src="{{ my_character|character_portrait_url:128 }}"></p>
                 </div>
 
                 <div class="col-md-4">
-                    <p>corporation from ID: <img src="{{ my_character.corporation_id|corporation_logo_url:128}}"></p>
+                    <p>corporation from ID: <img src="{{ my_character.corporation_id|corporation_logo_url:128 }}"></p>
-                    <p>corporation from character object: <img src="{{ my_character|corporation_logo_url:128}}"></p>
+                    <p>corporation from character object: <img src="{{ my_character|corporation_logo_url:128 }}"></p>
-                    <p>corporation from corporation object: <img src="{{ my_corporation|corporation_logo_url:128}}"></p>
+                    <p>corporation from corporation object: <img src="{{ my_corporation|corporation_logo_url:128 }}"></p>
                 </div>
 
                 <div class="col-md-4">
-                    <p>alliance from ID: <img src="{{ my_character.alliance_id|alliance_logo_url:128}}"></p>
+                    <p>alliance from ID: <img src="{{ my_character.alliance_id|alliance_logo_url:128 }}"></p>
-                    <p>alliance from character object: <img src="{{ my_character|alliance_logo_url:128}}"></p>
+                    <p>alliance from character object: <img src="{{ my_character|alliance_logo_url:128 }}"></p>
-                    <p>alliance from alliance object: <img src="{{ my_alliance|alliance_logo_url:128}}"></p>
+                    <p>alliance from alliance object: <img src="{{ my_alliance|alliance_logo_url:128 }}"></p>
                 </div>
-
             </div>
-
         </div>
     </div>
 
-{% endblock %}
+{% endblock content %}

allianceauth/fleetactivitytracking/auth_hooks.py

@@ -1,7 +1,8 @@
+from allianceauth.menu.hooks import MenuItemHook
 from . import urls
 from django.utils.translation import gettext_lazy as _
 from allianceauth import hooks
-from allianceauth.services.hooks import MenuItemHook, UrlHook
+from allianceauth.services.hooks import UrlHook
 
 
 @hooks.register('menu_item_hook')

allianceauth/fleetactivitytracking/migrations/0002_auto_20160905_2220.py

@@ -2,7 +2,6 @@
 
 import datetime
 from django.db import migrations, models
-from django.utils.timezone import utc
 
 
 class Migration(migrations.Migration):
@@ -15,6 +14,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='fatlink',
             name='fatdatetime',
-            field=models.DateTimeField(default=datetime.datetime(2016, 9, 5, 22, 20, 2, 999041, tzinfo=utc)),
+            field=models.DateTimeField(default=datetime.datetime(2016, 9, 5, 22, 20, 2, 999041, tzinfo=datetime.timezone.utc)),
         ),
     ]

allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html

@@ -1,27 +1,28 @@
-{% extends 'allianceauth/base.html' %}
+{% extends 'allianceauth/base-bs5.html' %}
 {% load i18n %}
-{% block page_title %}{% translate "Fleet Participation" %}{% endblock %}
+{% block page_title %}
-
+    {% translate "Fleet Participation" %}
+{% endblock %}
 {% block content %}
-<div class="col-lg-12">
+    <div class="col-lg-12">
-    <h1 class="page-header text-center">{% translate "Character not found!" %}</h1>
+        <h1 class="page-header text-center">{% translate "Character not found!" %}</h1>
-    <div class="col-lg-12 container" id="example">
+        <div class="col-lg-12 container" id="example">
-        <div class="row">
+            <div class="row">
-            <div class="col-lg-12">
+                <div class="col-lg-12">
-                <div class="panel panel-default">
+                    <div class="panel panel-default">
-                    <div class="panel-heading">{{ character_name }}</div>
+                        <div class="panel-heading">{{ character_name }}</div>
-                    <div class="panel-body">
+                        <div class="panel-body">
-                        <div class="col-lg-2 col-sm-2">
+                            <div class="col-lg-2 col-sm-2">
-                            <img class="ra-avatar img-responsive" src="{{ character_portrait_url }}" alt="{{ character_name }}">
+                                <img class="ra-avatar img-responsive" src="{{ character_portrait_url }}" alt="{{ character_name }}">
-                        </div>
+                            </div>
-                        <div class="col-lg-10 col-sm-2">
+                            <div class="col-lg-10 col-sm-2">
-                            <div class="alert alert-danger" role="alert">{% translate "Character not registered!" %}</div>
+                                <div class="alert alert-danger" role="alert">{% translate "Character not registered!" %}</div>
-                            {% translate "This character is not associated with an auth account." %} <a href=" {% url 'authentication:add_character' %}">{% translate "Add it here" %}</a> {% translate "before attempting to click fleet attendance links." %}
+                                {% translate "This character is not associated with an auth account." %} <a href=" {% url 'authentication:add_character' %}">{% translate "Add it here" %}</a> {% translate "before attempting to click fleet attendance links." %}
+                            </div>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
     </div>
-</div>
 {% endblock %}

allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html

@@ -1,31 +1,31 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load bootstrap %}
 {% load i18n %}
-
+{% block page_title %}
-{% block page_title %}{% translate "Create Fatlink" %}{% endblock page_title %}
+    {% translate "Create Fatlink" %}
-
+{% endblock page_title %}
 {% block content %}
     <div class="col-lg-12">
         <h1 class="page-header text-center">{% translate "Create Fleet Operation" %}</h1>
-
         <div class="container-fluid">
             {% if badrequest %}
-            <div class="alert alert-danger" role="alert">{% translate "Bad request!" %}</div>
+                <div class="alert alert-danger" role="alert">{% translate "Bad request!" %}</div>
             {% endif %}
-            {% for message in errormessages %}
+            {% for message in errormessages %}<div class="alert alert-danger" role="alert">{{ message }}</div>{% endfor %}
-            <div class="alert alert-danger" role="alert">{{ message }}</div>
+            <div class="col-md-4 offset-md-4">
-            {% endfor %}
-            <div class="col-md-4 col-md-offset-4">
                 <div class="row">
-                        <form class="form-signin" role="form" action="" method="POST">
+                    <form class="form-signin" role="form" action="" method="POST">
-                            {% csrf_token %}
+                        {% csrf_token %}
-                            {{ form|bootstrap }}
+                        {{ form|bootstrap }}
-                            <br>
+                        <br>
-                            <button class="btn btn-lg btn-primary btn-block" type="submit" name="submit_fat">{% translate "Create fatlink" %}</button>
+                        <button class="btn btn-lg btn-primary btn-block"
-                        </form>
+                                type="submit"
+                                name="submit_fat">
+                            {% translate "Create fatlink" %}
+                        </button>
+                    </form>
                 </div>
             </div>
         </div>
     </div>
-
 {% endblock content %}

allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html

@@ -1,11 +1,11 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
 {% block page_title %}{% translate "Fatlink view" %}{% endblock page_title %}
 
 {% block content %}
     <div class="col-lg-12">
         <h1 class="page-header text-center">{% translate "Edit fatlink" %} "{{ fatlink }}"
-            <div class="text-right">
+            <div class="text-end">
                 <form>
                     <button type="submit" onclick="return confirm('Are you sure?')" class="btn btn-danger" name="deletefat" value="True">
                         {% translate "Delete fat" %}

allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html

@@ -1,4 +1,4 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
 
 {% block page_title %}{% translate "Personal fatlink statistics" %}{% endblock page_title %}
@@ -7,7 +7,7 @@
     <div class="col-lg-12">
         <h1 class="page-header text-center">{% blocktranslate %}Participation data statistics for {{ month }}, {{ year }}{% endblocktranslate %}
             {% if char_id %}
-            <div class="text-right">
+            <div class="text-end">
                 <a href="{% url 'fatlink:user_statistics_month' char_id previous_month|date:'Y' previous_month|date:'m' %}" class="btn btn-info">{% translate "Previous month" %}</a>
                 <a href="{% url 'fatlink:user_statistics_month' char_id next_month|date:'Y' next_month|date:'m'  %}" class="btn btn-info">{% translate "Next month" %}</a>
             </div>
@@ -33,39 +33,39 @@
             {% endfor %}
         </table>
         {%  if created_fats %}
-        <h2>
+            <h2>
-            {% blocktranslate count links=n_created_fats trimmed  %}
+                {% blocktranslate count links=n_created_fats trimmed  %}
-                {{ user }} has created one link this month.
+                    {{ user }} has created one link this month.
-            {% plural %}
+                {% plural %}
-                {{ user }} has created {{ links }} links this month.
+                    {{ user }} has created {{ links }} links this month.
-            {% endblocktranslate %}
+                {% endblocktranslate %}
-        </h2>
+            </h2>
-        {% if created_fats %}
+            {% if created_fats %}
-        <table class="table">
+                <table class="table">
-            <tr>
+                    <tr>
-                <th class="text-center">{% translate "Fleet" %}</th>
+                        <th class="text-center">{% translate "Fleet" %}</th>
-                <th class="text-center">{% translate "Creator" %}</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 "Duration" %}</th>
-                <th class="text-center">{% translate "Edit" %}</th>
+                        <th class="text-center">{% translate "Edit" %}</th>
-            </tr>
+                    </tr>
-            {% for link in created_fats %}
+                    {% for link in created_fats %}
-            <tr>
+                    <tr>
-                <td class="text-center"><a href="{%  url 'fatlink:click' link.hash %}" class="label label-primary">{{ link.fleet }}</a></td>
+                        <td class="text-center"><a href="{% url 'fatlink:click' link.hash %}" class="badge bg-primary">{{ link.fleet }}</a></td>
-                <td class="text-center">{{ link.creator.username }}</td>
+                        <td class="text-center">{{ link.creator.username }}</td>
-                <td class="text-center">{{ link.fatdatetime }}</td>
+                        <td class="text-center">{{ link.fatdatetime }}</td>
-                <td class="text-center">{{ link.duration }}</td>
+                        <td class="text-center">{{ link.duration }}</td>
-                <td class="text-center">
+                        <td class="text-center">
-                    <a href="{%  url 'fatlink:modify' link.hash %}">
+                            <a href="{%  url 'fatlink:modify' link.hash %}">
-                        <button type="button" class="btn btn-info"><span
+                                <button type="button" class="btn btn-info"><span
-                                class="glyphicon glyphicon-edit"></span></button>
+                                        class="glyphicon glyphicon-edit"></span></button>
-                    </a>
+                            </a>
-                </td>
+                        </td>
-            </tr>
+                    </tr>
-            {%  endfor %}
+                    {%  endfor %}
 
-        </table>
+                </table>
-        {% endif %}
+            {% endif %}
         {% endif %}
     </div>
 {% endblock content %}

allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html

@@ -1,35 +1,34 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
-
+{% block page_title %}
-{% block page_title %}{% translate "Personal fatlink statistics" %}{% endblock page_title %}
+    {% translate "Personal fatlink statistics" %}
-
+{% endblock page_title %}
 {% block content %}
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% blocktranslate %}Participation data statistics for {{ year }}{% endblocktranslate %}
+        <h1 class="page-header text-center">
-            <div class="text-right">
+            {% blocktranslate %}Participation data statistics for {{ year }}{% endblocktranslate %}
-                <a href="{% url 'fatlink:personal_statistics_year' previous_year %}" class="btn btn-info">{% translate "Previous year" %}</a>
+            <div class="text-end">
-                {%  if next_year %}
+                <a href="{% url "fatlink:personal_statistics_year" previous_year %}" class="btn btn-info"><i class="fa-solid fa-chevron-left"></i> {% translate "Previous year" %}</a>
-                <a href="{% url 'fatlink:personal_statistics_year' next_year  %}" class="btn btn-info">{% translate "Next year" %}</a>
+                {% if next_year %}
-                {%  endif %}
+                    <a href="{% url "fatlink:personal_statistics_year" next_year %}" class="btn btn-info">{% translate "Next year" %} <i class="fa-solid fa-chevron-right"></i></a>
+                {% endif %}
             </div>
         </h1>
-        <div class="col-lg-2 col-lg-offset-5">
+        <div class="col-lg-2 offset-lg-5">
-        <table class="table table-responsive">
+            <table class="table table-responsive">
-            <tr>
+                <tr>
-                <th class="col-md-2 text-center">{% translate "Month" %}</th>
+                    <th scope="col" class="col-md-2 text-center">{% translate "Month" %}</th>
-                <th class="col-md-2 text-center">{% translate "Fats" %}</th>
+                    <th scope="col" class="col-md-2 text-center">{% translate "Fats" %}</th>
-            </tr>
+                </tr>
-            {% for monthnr, month, n_fats in monthlystats %}
+                {% for monthnr, month, n_fats in monthlystats %}
-            <tr>
+                    <tr>
-                <td class="text-center">
+                        <td class="text-center">
-                    <a href="{% url 'fatlink:personal_statistics_month' year monthnr %}">
+                            <a href="{% url 'fatlink:personal_statistics_month' year monthnr %}">{{ month }}</a>
-                        {{ month }}
+                        </td>
-                    </a>
+                        <td class="text-center">{{ n_fats }}</td>
-                </td>
+                    </tr>
-                <td class="text-center">{{ n_fats }}</td>
+                {% endfor %}
-            </tr>
+            </table>
-            {% endfor %}
-        </table>
         </div>
     </div>
 {% endblock content %}

allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html

@@ -1,46 +1,50 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
-
+{% block page_title %}
-{% block page_title %}{% translate "Fatlink Corp Statistics" %}{% endblock page_title %}
+    {% translate "Fatlink Corp Statistics" %}
-
+{% endblock page_title %}
 {% block content %}
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% blocktranslate %}Participation data statistics for {{ month }}, {{ year }}{% endblocktranslate %}
+        <h1 class="page-header text-center">
-            <div class="text-right">
+            {% blocktranslate %}Participation data statistics for {{ month }}, {{ year }}{% endblocktranslate %}
-                <a href="{% url 'fatlink:statistics_corp_month' corpid previous_month|date:"Y" previous_month|date:"m" %}" class="btn btn-info">{% translate "Previous month" %}</a>
+            <div class="text-end">
-                {%  if next_month %}
+                <a href="{% url "fatlink:statistics_corp_month" corpid previous_month|date:"Y" previous_month|date:"m" %}" class="btn btn-info">{% translate "Previous month" %}</a>
-                <a href="{% url 'fatlink:statistics_corp_month' corpid next_month|date:"Y" next_month|date:"m" %}" class="btn btn-info">{% translate "Next month" %}</a>
+                {% if next_month %}
-                {%  endif %}
+                    <a href="{% url "fatlink:statistics_corp_month" corpid next_month|date:"Y" next_month|date:"m" %}" class="btn btn-info">{% translate "Next month" %}</a>
+                {% endif %}
             </div>
         </h1>
         {% if fatStats %}
-        <table class="table table-responsive">
+        <div class="table-responsive">
-            <tr>
+            <table class="table table-striped">
-                <th class="col-md-1"></th>
+                <tr>
-                <th class="col-md-2 text-center">{% translate "Main Character" %}</th>
+                    <th scope="col" class="col-md-1"></th>
-                <th class="col-md-2 text-center">{% translate "Characters" %}</th>
+                    <th scope="col" class="col-md-2 text-center">{% translate "Main Character" %}</th>
-                <th class="col-md-2 text-center">{% translate "Fats" %}</th>
+                    <th scope="col" class="col-md-2 text-center">{% translate "Characters" %}</th>
-                <th class="col-md-2 text-center">{% translate "Average fats" %}
+                    <th scope="col" class="col-md-2 text-center">{% translate "Fats" %}</th>
-                    <i class="glyphicon glyphicon-question-sign" rel="tooltip" title="Fats ÷ Characters"></i>
+                    <th scope="col" class="col-md-2 text-center">
-                </th>
+                        {% translate "Average fats" %}
-            </tr>
+                        <i class="fa-solid fa-question" rel="tooltip" title="Fats / Characters"></i>
-            {% for memberStat in fatStats %}
+                    </th>
-            <tr>
+                </tr>
-                <td>
+                {% for memberStat in fatStats %}
-                    <img src="{{ memberStat.mainchar.portrait_url_32 }}" class="ra-avatar img-responsive" alt="{{ memberStat.mainchar.character_name }}">
+                    <tr>
-                </td>
+                        <td>
-                <td class="text-center">{{ memberStat.mainchar.character_name }}</td>
+                            <img src="{{ memberStat.mainchar.portrait_url_32 }}" class="ra-avatar img-responsive" alt="{{ memberStat.mainchar.character_name }}">
-                <td class="text-center">{{ memberStat.n_chars }}</td>
+                        </td>
-                <td class="text-center">{{ memberStat.n_fats }}</td>
+                        <td class="text-center">{{ memberStat.mainchar.character_name }}</td>
-                <td class="text-center">{{ memberStat.avg_fat }}</td>
+                        <td class="text-center">{{ memberStat.n_chars }}</td>
-            </tr>
+                        <td class="text-center">{{ memberStat.n_fats }}</td>
-            {% endfor %}
+                        <td class="text-center">{{ memberStat.avg_fat }}</td>
-        </table>
+                    </tr>
+                {% endfor %}
+            </table>
+        </div>
         {% endif %}
     </div>
 {% endblock content %}
 {% block extra_script %}
-$(document).ready(function () {
+    $(document).ready(function () {
-    $("[rel=tooltip]").tooltip();
+        $("[rel=tooltip]").tooltip();
-});
+    });
 {% endblock extra_script %}

allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html

@@ -1,48 +1,54 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
-
+{% block page_title %}
-{% block page_title %}{% translate "Fatlink statistics" %}{% endblock page_title %}
+    {% translate "Fatlink Statistics" %}
-
+{% endblock page_title %}
 {% block content %}
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% blocktranslate %}Participation data statistics for {{ month }}, {{ year }}{% endblocktranslate %}
+        <h1 class="page-header text-center">
-            <div class="text-right">
+            {% blocktranslate %}Participation data statistics for {{ month }}, {{ year }}{% endblocktranslate %}
-                <a href="{% url 'fatlink:statistics_month' previous_month|date:"Y" previous_month|date:"m"  %}" class="btn btn-info">{% translate "Previous month" %}</a>
+            <div class="text-end">
-                {%  if next_month %}
+                <a href="{% url "fatlink:statistics_month" previous_month|date:"Y" previous_month|date:"m" %}" class="btn btn-info">{% translate "Previous month" %}</a>
-                <a href="{% url 'fatlink:statistics_month' next_month|date:"Y" next_month|date:"m"  %}" class="btn btn-info">{% translate "Next month" %}</a>
+                {% if next_month %}
-                {%  endif %}
+                    <a href="{% url 'fatlink:statistics_month' next_month|date:"Y" next_month|date:"m"  %}" class="btn btn-info">{% translate "Next month" %}</a>
+                {% endif %}
             </div>
         </h1>
         {% if fatStats %}
-        <table class="table table-responsive">
+        <div class="table-responsive">
-            <tr>
+            <table class="table table-striped">
-                <th class="col-md-1"></th>
+                <tr>
-                <th class="col-md-2 text-center">{% translate "Ticker" %}</th>
+                    <th scope="col" class="col-md-1"></th>
-                <th class="col-md-5 text-center">{% translate "Corp" %}</th>
+                    <th scope="col" class="col-md-2 text-center">{% translate "Ticker" %}</th>
-                <th class="col-md-2 text-center">{% translate "Members" %}</th>
+                    <th scope="col" class="col-md-5 text-center">{% translate "Corp" %}</th>
-                <th class="col-md-2 text-center">{% translate "Fats" %}</th>
+                    <th scope="col" class="col-md-2 text-center">{% translate "Members" %}</th>
-                <th class="col-md-2 text-center">{% translate "Average fats" %}
+                    <th scope="col" class="col-md-2 text-center">{% translate "Fats" %}</th>
-                    <i class="glyphicon glyphicon-question-sign" rel="tooltip" title="Fats ÷ Characters"></i>
+                    <th scope="col" class="col-md-2 text-center">
-                </th>
+                        {% translate "Average fats" %}
-            </tr>
+                        <i class="fa-solid fa-question" rel="tooltip" title="Fats / Characters"></i>
-            {% for corpStat in fatStats %}
+                    </th>
-            <tr>
+                </tr>
-                <td>
+                {% for corpStat in fatStats %}
-                    <img src="{{ corpStat.corp.logo_url_32 }}" class="ra-avatar img-responsive" alt="{{ corpStat.corp.corporation_name }}">
+                    <tr>
-                </td>
+                        <td>
-                <td class="text-center"><a href="{% url 'fatlink:statistics_corp' corpStat.corp.corporation_id %}">[{{ corpStat.corp.corporation_ticker }}]</a></td>
+                            <img src="{{ corpStat.corp.logo_url_32 }}" class="ra-avatar img-responsive" alt="{{ corpStat.corp.corporation_name }}">
-                <td class="text-center">{{ corpStat.corp.corporation_name }}</td>
+                        </td>
-                <td class="text-center">{{ corpStat.corp.member_count }}</td>
+                        <td class="text-center">
-                <td class="text-center">{{ corpStat.n_fats }}</td>
+                            <a href="{% url 'fatlink:statistics_corp' corpStat.corp.corporation_id %}">[{{ corpStat.corp.corporation_ticker }}]</a>
-                <td class="text-center">{{ corpStat.avg_fat }}</td>
+                        </td>
-            </tr>
+                        <td class="text-center">{{ corpStat.corp.corporation_name }}</td>
-            {% endfor %}
+                        <td class="text-center">{{ corpStat.corp.member_count }}</td>
-        </table>
+                        <td class="text-center">{{ corpStat.n_fats }}</td>
+                        <td class="text-center">{{ corpStat.avg_fat }}</td>
+                    </tr>
+                {% endfor %}
+            </table>
+        </div>
         {% endif %}
     </div>
 {% endblock content %}
 {% block extra_script %}
-$(document).ready(function () {
+    $(document).ready(function () {
-    $("[rel=tooltip]").tooltip();
+        $("[rel=tooltip]").tooltip();
-});
+    });
 {% endblock extra_script %}

allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html

@@ -1,99 +1,107 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
-
+{% block page_title %}
-{% block page_title %}{% translate "Fatlink view" %}{% endblock page_title %}
+    {% translate "Fatlink view" %}
-
+{% endblock page_title %}
 {% block content %}
     <div class="col-lg-12">
         <h1 class="page-header text-center">{% translate "Participation data" %}</h1>
-        <table class="table">
+        <div class="table-responsive">
-                <tr>
+            <table class="table table-striped">
-                    <th class="col-md-11">
-                        <h4><b>{% translate "Most recent clicked fatlinks" %}</b>
-                        </h4>
-                    </th>
-                    <th class="col-md-1">
-                        <a href="{% url 'fatlink:personal_statistics' %}" class="btn btn-info">
-                            {% translate "Personal statistics" %}
-                        </a>
-                    </th>
-                </tr>
-        </table>
-        {% if fats %}
-        <table class="table table-responsive">
-            <tr>
-                <th class="text-center">{% translate "Fleet" %}</th>
-                <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>
-            </tr>
-            {% for fat in fats %}
-            <tr>
-                <td class="text-center">{{ fat.fatlink.fleet }}</td>
-                <td class="text-center">{{ fat.character.character_name }}</td>
-                {%  if fat.station != "No Station" %}
-                <td class="text-center">{% blocktranslate %}Docked in {% endblocktranslate %}{{ fat.system }}</td>
-                {% else %}
-                <td class="text-center">{{ fat.system }}</td>
-                {% endif %}
-                <td class="text-center">{{ fat.shiptype }}</td>
-                <td class="text-center">{{ fat.fatlink.fatdatetime }}</td>
-            </tr>
-            {% endfor %}
-        </table>
-        {% else %}
-        <div class="alert alert-warning text-center">{% translate "No fleet activity on record." %}</div>
-        {% endif %}
-
-        {% if perms.auth.fleetactivitytracking%}
-            <table class="table">
                 <tr>
                     <th class="col-md-10">
-                        <h4><b>{% translate "Most recent fatlinks" %}</b>
+                        <h4>
+                            <b>{% translate "Most recent clicked fatlinks" %}</b>
                         </h4>
                     </th>
-                    <th class="col-md-1">
+                    <th class="col-md-2 align-self-end">
-                        <a href="{% url 'fatlink:statistics' %}" class="btn btn-info">
+                        <a href="{% url 'fatlink:personal_statistics' %}" class="btn btn-info"><i class="fa-solid fa-circle-info fa-fw"></i>{% translate "Personal statistics" %}</a>
-                            {% translate "View statistics" %}
-                        </a>
-                    </th>
-                    <th class="col-md-1">
-                        <a href="{% url 'fatlink:create' %}" class="btn btn-success">
-                            {% translate "Create fatlink" %}
-                        </a>
                     </th>
                 </tr>
             </table>
-        {% if fatlinks %}
+        </div>
-        <table class="table">
+        {% if fats %}
-            <tr>
+            <div class="table-responsive">
-                <th class="text-center">{% translate "Name" %}</th>
+                <table class="table table-striped">
-                <th class="text-center">{% translate "Creator" %}</th>
+                    <tr>
-                <th class="text-center">{% translate "Fleet" %}</th>
+                        <th scope="col" class="text-center">{% translate "Fleet" %}</th>
-                <th class="text-center">{% translate "Eve Time" %}</th>
+                        <th scope="col" class="text-center">{% translate "Character" %}</th>
-                <th class="text-center">{% translate "Duration" %}</th>
+                        <th scope="col" class="text-center">{% translate "System" %}</th>
-                <th class="text-center">{% translate "Edit" %}</th>
+                        <th scope="col" class="text-center">{% translate "Ship" %}</th>
-            </tr>
+                        <th scope="col" class="text-center">{% translate "Eve Time" %}</th>
-            {% for link in fatlinks %}
+                    </tr>
-            <tr>
+                    {% for fat in fats %}
-                <td class="text-center"><a href="{%  url 'fatlink:click' link.hash %}" class="label label-primary">{{ link.fleet }}</a></td>
+                        <tr>
-                <td class="text-center">{{ link.creator.username }}</td>
+                            <td class="text-center">{{ fat.fatlink.fleet }}</td>
-                <td class="text-center">{{ link.fleet }}</td>
+                            <td class="text-center">{{ fat.character.character_name }}</td>
-                <td class="text-center">{{ link.fatdatetime }}</td>
+                            {% if fat.station != "No Station" %}
-                <td class="text-center">{{ link.duration }}</td>
+                                <td class="text-center">{% translate "Docked in" %} {{ fat.system }}</td>
-                <td class="text-center">
+                            {% else %}
-                    <a href="{%  url 'fatlink:modify' link.hash %}" class="btn btn-info">
+                                <td class="text-center">{{ fat.system }}</td>
-                        <span class="glyphicon glyphicon-edit"></span>
+                            {% endif %}
-                    </a>
+                            <td class="text-center">{{ fat.shiptype }}</td>
-                </td>
+                            <td class="text-center">{{ fat.fatlink.fatdatetime }}</td>
-            </tr>
+                        </tr>
-            {%  endfor %}
+                    {% endfor %}
-
+                </table>
-        </table>
+            </div>
         {% else %}
-        <div class="alert alert-warning text-center">{% translate "No created fatlinks on record." %}</div>
+            <div class="alert alert-warning text-center">{% translate "No fleet activity on record." %}</div>
         {% endif %}
+        {% if perms.auth.fleetactivitytracking %}
+            <div class="table-responsive">
+                <table class="table table-striped">
+                    <tr>
+                        <th class="col-md-8">
+                            <h4>
+                                <b>{% translate "Most recent fatlinks" %}</b>
+                            </h4>
+                        </th>
+                        <th class="col-md-2 align-self-end">
+                            <a href="{% url 'fatlink:statistics' %}" class="btn btn-info"><i class="fa-solid fa-eye fa-fw"></i> {% translate "View statistics" %}</a>
+                        </th>
+                        <th class="col-md-2 align-self-end">
+                            <a href="{% url 'fatlink:create' %}" class="btn btn-success"><i class="fa-solid fa-plus fa-fw"></i> {% translate "Create fatlink" %}</a>
+                        </th>
+                    </tr>
+                </table>
+            </div>
+            {% if fatlinks %}
+                <div class="table-responsive">
+                    <table class="table table-striped">
+                        <tr>
+                            <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 "Duration" %}</th>
+                            <th scope="col" class="text-center">{% translate "Edit" %}</th>
+                        </tr>
+                        {% for link in fatlinks %}
+                            <tr>
+                                <td class="text-center">
+                                    <a href="{% url 'fatlink:click' link.hash %}" class="badge bg-primary">{{ link.fleet }}</a>
+                                </td>
+                                <td class="text-center">{{ link.creator.username }}</td>
+                                <td class="text-center">{{ link.fleet }}</td>
+                                <td class="text-center">{{ link.fatdatetime }}</td>
+                                <td class="text-center">
+                                    {{ link.duration }}
+                                </td>
+                                <td class="text-center">
+                                    <a href="{% url 'fatlink:modify' link.hash %}" class="btn btn-info">
+                                        <i class="fa-solid fa-pen-to-square fa-fw"></i>
+                                    </a>
+                                </td>
+                            </tr>
+                        {% endfor %}
+                    </table>
+                </div>
+            {% else %}
+                <div class="alert alert-warning text-center">
+                    {% translate "No created fatlinks on record." %}
+                </div>
+            {% endif %}
         {% endif %}
     </div>
 {% endblock content %}

allianceauth/groupmanagement/auth_hooks.py

@@ -1,6 +1,7 @@
 from django.utils.translation import gettext_lazy as _
+from allianceauth.menu.hooks import MenuItemHook
 
-from allianceauth.services.hooks import MenuItemHook, UrlHook
+from allianceauth.services.hooks import UrlHook
 from allianceauth import hooks
 
 from . import urls
@@ -33,11 +34,43 @@ class GroupManagementMenuItem(MenuItemHook):
         return ""
 
 
+"""
+            <li class="d-flex m-2 p-2 pt-0 pb-0 mt-0 mb-0">
+                <i class="fas fa-users fa-fw align-self-center me-2"></i>
+                <a class="nav-link flex-fill align-self-center {% navactive request 'groupmanagement:groups' %}" href="{% url 'groupmanagement:groups' %}">
+                    {% translate "Groups" %}
+                </a>
+            </li>
+"""
+
+
+class GroupsMenuItem(MenuItemHook):
+    def __init__(self):
+        MenuItemHook.__init__(
+            self,
+            text=_("Groups"),
+            classes="fas fa-user fa-fw",
+            url_name="groupmanagement:groups",
+            order=25,
+            navactive=[
+                "groupmanagement:groups",  # group list view
+            ],
+        )
+
+    def render(self, request):
+        return MenuItemHook.render(self, request)
+
+
 @hooks.register("menu_item_hook")
-def register_menu():
+def register_manager_menu():
     return GroupManagementMenuItem()
 
 
+@hooks.register("menu_item_hook")
+def register_groups_menu():
+    return GroupsMenuItem()
+
+
 @hooks.register("url_hook")
 def register_urls():
     return UrlHook(urls, "group", r"^groups/")

allianceauth/groupmanagement/forms.py

@@ -1,10 +1,6 @@
-import functools
-
 from django import forms
-from django.contrib.admin.widgets import FilteredSelectMultiple
+from django.contrib.auth.models import Group
-from django.contrib.auth.models import Group, User
 from django.core.exceptions import ValidationError
-from django.db.models.functions import Lower
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
 
@@ -12,39 +8,6 @@ from .models import ReservedGroupName
 
 
 class GroupAdminForm(forms.ModelForm):
-    users = forms.ModelMultipleChoiceField(
-        queryset=User.objects.order_by(Lower('username')),
-        required=False,
-        widget=FilteredSelectMultiple(verbose_name=_("Users"), is_stacked=False),
-    )
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        if self.instance and self.instance.pk:
-            self.fields["users"].initial = self.instance.user_set.all()
-
-    def save(self, commit=True):
-        group: Group = super().save(commit=False)
-
-        if commit:
-            group.save()
-
-        users = self.cleaned_data["users"]
-        if group.pk:
-            self._save_m2m_and_users(group, users)
-        else:
-            self.save_m2m = functools.partial(
-                self._save_m2m_and_users, group=group, users=users
-            )
-
-        return group
-
-    def _save_m2m_and_users(self, group, users):
-        """Save m2m relations incl. users."""
-        group.user_set.set(users)
-        self._save_m2m()
-
     def clean_name(self):
         my_name = self.cleaned_data['name']
         if ReservedGroupName.objects.filter(name__iexact=my_name).exists():

allianceauth/groupmanagement/models.py

@@ -1,7 +1,8 @@
 from typing import Set
 
 from django.conf import settings
-from django.contrib.auth.models import Group, User
+from django.contrib.auth.models import Group
+from django.contrib.auth.models import User
 from django.db import models
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
@@ -13,7 +14,7 @@ from allianceauth.notifications import notify
 class GroupRequest(models.Model):
     """Request from a user for joining or leaving a group."""
 
-    leave_request = models.BooleanField(default=False)
+    leave_request = models.BooleanField(default=0)
     user = models.ForeignKey(User, on_delete=models.CASCADE)
     group = models.ForeignKey(Group, on_delete=models.CASCADE)
 
@@ -48,7 +49,7 @@ class RequestLog(models.Model):
     request_type = models.BooleanField(null=True)
     group = models.ForeignKey(Group, on_delete=models.CASCADE)
     request_info = models.CharField(max_length=254)
-    action = models.BooleanField(default=False)
+    action = models.BooleanField(default=0)
     request_actor = models.ForeignKey(User, on_delete=models.CASCADE)
     date = models.DateTimeField(auto_now_add=True)
 

allianceauth/groupmanagement/templates/groupmanagement/audit.html

@@ -1,85 +1,75 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
+{% load static %}
 {% load i18n %}
+{% load navactive %}
 
 {% block page_title %}{{ group }} {% translate "Audit Log" %}{% endblock page_title %}
+{% block header_nav_brand %}{% translate "Audit Log" %} - {{ group.name }}{% endblock header_nav_brand %}
+
+{% block header_nav_collapse_left %}
+<li class="nav-item ">
+    <a class="nav-link {% navactive request 'groupmanagement:management' %}" href="{% url 'groupmanagement:management' %}">{% translate "Back" %}</a>
+</li>
+{% endblock %}
 
 {% block content %}
-    <div class="col-lg-12">
+    {% if entries %}
-        <br>
+        <div class="table-responsive">
-        {% include 'groupmanagement/menu.html' %}
+            <table class="table table-striped" id="log-entries">
+                <thead>
+                    <tr>
+                        <th scope="col">{% translate "Date/Time" %}</th>
+                        <th scope="col">{% translate "Requestor" %}</th>
+                        <th scope="col">{% translate "Character" %}</th>
+                        <th scope="col">{% translate "Corporation" %}</th>
+                        <th scope="col">{% translate "Type" %}</th>
+                        <th scope="col">{% translate "Action" %}</th>
+                        <th scope="col">{% translate "Actor" %}</th>
+                    </tr>
+                </thead>
 
-        <div class="panel panel-default">
+                <tbody>
-            <div class="panel-heading">
+                    {% for entry in entries %}
-                {{ group }} - {% translate "Audit Log" %}
+                        <tr>
-            </div>
+                            <td>{{ entry.date|date:"Y-M-d, H:i" }}</td>
+                            <td>{{ entry.requestor }}</td>
+                            <td>{{ entry.req_char }}</td>
+                            <td>{{ entry.req_char.corporation_name }}</td>
+                            <td>{{ entry.type_to_str }}</td>
 
-            <div class="panel-body">
+                            {% if entry.request_type is None %}
-                <p>
+                                <td>{% translate "Removed" %}</td>
-                    <a class="btn btn-default" href="{% url 'groupmanagement:membership' %}" role="button">
+                            {% else %}
-                        {% translate "Back" %}
+                                <td>{{ entry.action_to_str }}</td>
-                    </a>
+                            {% endif %}
-                </p>
 
-                {% if entries %}
+                            <td>{{ entry.request_actor }}</td>
-                    <div class="table-responsive">
+                        </tr>
-                        <table class="table table-striped" id="log-entries">
+                    {% endfor %}
-                            <thead>
+                </tbody>
-                                <tr>
+            </table>
-                                    <th scope="col">{% translate "Date/Time" %}</th>
-                                    <th scope="col">{% translate "Requestor" %}</th>
-                                    <th scope="col">{% translate "Character" %}</th>
-                                    <th scope="col">{% translate "Corporation" %}</th>
-                                    <th scope="col">{% translate "Type" %}</th>
-                                    <th scope="col">{% translate "Action" %}</th>
-                                    <th scope="col">{% translate "Actor" %}</th>
-                                </tr>
-                            </thead>
 
-                            <tbody>
+            <p class="text-muted">
-                                {% for entry in entries %}
+                {% translate "All times displayed are EVE/UTC." %}
-                                    <tr>
+            </p>
-                                        <td>{{ entry.date|date:"Y-M-d, H:i" }}</td>
-                                        <td>{{ entry.requestor }}</td>
-                                        <td>{{ entry.req_char }}</td>
-                                        <td>{{ entry.req_char.corporation_name }}</td>
-                                        <td>{{ entry.type_to_str }}</td>
-
-                                        {% if entry.request_type is None %}
-                                            <td>{% translate "Removed" %}</td>
-                                        {% else %}
-                                            <td>{{ entry.action_to_str }}</td>
-                                        {% endif %}
-
-                                        <td>{{ entry.request_actor }}</td>
-                                    </tr>
-                                {% endfor %}
-                            </tbody>
-                        </table>
-
-                        <p class="text-muted">
-                            {% translate "All times displayed are EVE/UTC." %}
-                        </p>
-                    </div>
-                {% else %}
-                    <div class="clearfix"></div>
-                    <br>
-                    <div class="alert alert-warning text-center">
-                        {% translate "No entries found for this group." %}
-                    </div>
-                {% endif %}
-            </div>
         </div>
-    </div>
+    {% else %}
+        <div class="clearfix"></div>
+        <br>
+        <div class="alert alert-warning text-center">
+            {% translate "No entries found for this group." %}
+        </div>
+    {% endif %}
 {% endblock %}
 
 {% block extra_javascript %}
-    {% include 'bundles/datatables-js.html' %}
+    {% include 'bundles/datatables-js-bs5.html' %}
     {% include 'bundles/moment-js.html' with locale=True %}
     {% include 'bundles/filterdropdown-js.html' %}
 {% endblock %}
 
 {% block extra_css %}
-    {% include 'bundles/datatables-css.html' %}
+    {% include 'bundles/datatables-css-bs5.html' %}
 {% endblock %}
 
 {% block extra_script %}

allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html

@@ -1,97 +1,86 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
+{% load static %}
 {% load i18n %}
 {% load evelinks %}
+{% load navactive %}
 
 {% block page_title %}{% translate "Group Members" %}{% endblock page_title %}
+{% block header_nav_brand %}{% translate "Group Members" %} - {{ group.name }}{% endblock header_nav_brand %}
+
+{% block header_nav_collapse_left %}
+<li class="nav-item ">
+    <a class="nav-link {% navactive request 'groupmanagement:management' %}" href="{% url 'groupmanagement:management' %}">{% translate "Back" %}</a>
+</li>
+{% endblock %}
 
 {% block content %}
-    <div class="col-lg-12">
+    {% if group.user_set %}
-        <br>
+        <div class="table-responsive">
-        {% include 'groupmanagement/menu.html' %}
+            <table class="table table-aa" id="tab_group_members">
+                <thead>
+                    <tr>
+                        <th>{% translate "Character" %}</th>
+                        <th>{% translate "Organization" %}</th>
+                        <th></th>
+                    </tr>
+                </thead>
 
-        <div class="panel panel-default">
+                <tbody>
-            <div class="panel-heading">
+                    {% for member in members %}
-                {{ group.name }} - {% translate 'Members' %}
+                        <tr>
-            </div>
+                            <td>
+                                <img src="{{ member.main_char|character_portrait_url:32 }}" class="rounded-circle" style="margin-right: 1rem;" alt="{{ member.main_char.character_name }}">
+                                {% if member.main_char %}
+                                    <a href="{{ member.main_char|evewho_character_url }}" target="_blank">
+                                        {{ member.main_char.character_name }}
+                                    </a>
+                                {% else %}
+                                    {{ member.user.username }}
+                                {% endif %}
 
-            <div class="panel-body">
+                                {% if member.is_leader %}
-                <p>
+                                    <i class="fa-solid fa-star"> title="{% translate "Group leader" %}" style="margin-left: 1rem;"></i>&nbsp;
-                    <a class="btn btn-default" href="{% url 'groupmanagement:membership' %}" role="button">
+                                {% endif %}
-                        {% translate "Back" %}
+                            </td>
-                    </a>
-                </p>
 
-                {% if group.user_set %}
+                            <td>
-                    <div class="table-responsive">
+                                {% if member.main_char %}
-                        <table class="table table-aa" id="tab_group_members">
+                                    <a href="{{ member.main_char|dotlan_corporation_url }}" target="_blank">
-                            <thead>
+                                        {{ member.main_char.corporation_name }}
-                                <tr>
+                                    </a><br>
-                                    <th>{% translate "Character" %}</th>
+                                    {{ member.main_char.alliance_name|default_if_none:"" }}
-                                    <th>{% translate "Organization" %}</th>
+                                {% else %}
-                                    <th></th>
+                                    {% translate "(unknown)" %}
-                                </tr>
+                                {% endif %}
-                            </thead>
+                            </td>
-
+                            <td class="text-end">
-                            <tbody>
+                                <a href="{% url 'groupmanagement:membership_remove' group.id member.user.id %}" class="btn btn-danger" title="{% translate "Remove from group" %}">
-                                {% for member in members %}
+                                    <i class="fa-solid fa-xmark"></i>
-                                    <tr>
+                                </a>
-                                        <td>
+                            </td>
-                                            <img src="{{ member.main_char|character_portrait_url:32 }}" class="img-circle" style="margin-right: 1rem;" alt="{{ member.main_char.character_name }}">
+                        </tr>
-                                            {% if member.main_char %}
+                    {% endfor %}
-                                                <a href="{{ member.main_char|evewho_character_url }}" target="_blank">
+                </tbody>
-                                                    {{ member.main_char.character_name }}
+            </table>
-                                                </a>
-                                            {% else %}
-                                                {{ member.user.username }}
-                                            {% endif %}
-
-                                            {% if member.is_leader %}
-                                                <i class="fas fa-star" title="{% translate "Group leader" %}" style="margin-left: 1rem;"></i>&nbsp;
-                                            {% endif %}
-                                        </td>
-
-                                        <td>
-                                            {% if member.main_char %}
-                                                <a href="{{ member.main_char|dotlan_corporation_url }}" target="_blank">
-                                                    {{ member.main_char.corporation_name }}
-                                                </a><br>
-                                                {{ member.main_char.alliance_name|default_if_none:"" }}
-                                            {% else %}
-                                                {% translate "(unknown)" %}
-                                            {% endif %}
-                                        </td>
-
-                                        <td class="text-right">
-                                            <a href="{% url 'groupmanagement:membership_remove' group.id member.user.id %}" class="btn btn-danger" title="{% translate "Remove from group" %}">
-                                                <i class="glyphicon glyphicon-remove"></i>
-                                            </a>
-                                        </td>
-                                    </tr>
-                                {% endfor %}
-                            </tbody>
-                        </table>
-
-                        <p class="text-muted">
-                            <i class="fas fa-star"></i>: {% translate "Group leader" %}
-                        </p>
-                    </div>
-                {% else %}
-                    <div class="alert alert-warning text-center">
-                        {% translate "No group members to list." %}
-                    </div>
-                {% endif %}
-            </div>
 
+            <p class="text-muted">
+                <i class="fa-solid fa-star"></i>: {% translate "Group leader" %}
+            </p>
         </div>
-    </div>
+    {% else %}
+        <div class="alert alert-warning text-center">
+            {% translate "No group members to list." %}
+        </div>
+    {% endif %}
+
 {% endblock content %}
 
 {% block extra_javascript %}
-    {% include 'bundles/datatables-js.html' %}
+    {% include 'bundles/datatables-js-bs5.html' %}
 {% endblock %}
 
 {% block extra_css %}
-    {% include 'bundles/datatables-css.html' %}
+    {% include 'bundles/datatables-css-bs5.html' %}
 {% endblock %}
 
 {% block extra_script %}

allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html

@@ -1,88 +1,86 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
+{% load static %}
 {% load i18n %}
+{% load navactive %}
 
 {% block page_title %}{% translate "Groups Membership" %}{% endblock page_title %}
+{% block header_nav_brand %}{% translate "Groups Membership" %}{% endblock header_nav_brand %}
+
 {% block extra_css %}{% endblock extra_css %}
 
+{% block header_nav_collapse_left %}
+<li class="nav-item ">
+    <a class="nav-link {% navactive request 'groupmanagement:management' %}" href="{% url 'groupmanagement:management' %}">{% translate "Join/Leave Requests" %}</a>
+</li>
+{% endblock header_nav_collapse_left %}
+
 {% block content %}
-    <div class="col-lg-12">
+    {% if groups %}
-        <br>
+        <div class="table-responsive">
-        {% include 'groupmanagement/menu.html' %}
+            <table class="table table-aa">
+                <thead>
+                    <tr>
+                        <th>{% translate "Name" %}</th>
+                        <th>{% translate "Description" %}</th>
+                        <th>{% translate "Status" %}</th>
+                        <th style="white-space: nowrap;" class="text-center">{% translate "Member Count" %}</th>
+                        <th style="min-width: 170px;"></th>
+                    </tr>
+                </thead>
 
-        <div class="panel panel-default">
+                <tbody class="align-middle">
-            <div class="panel-heading">
+                    {% for group in groups %}
-                {% translate "Groups" %}
+                        <tr>
-            </div>
+                            <td>
+                                <a href="{% url 'groupmanagement:membership' group.id %}">{{ group.name }}</a>
+                            </td>
 
-            <div class="panel-body">
+                            <td>{{ group.authgroup.description|linebreaks|urlize }}</td>
-                {% if groups %}
-                    <div class="table-responsive">
-                        <table class="table table-aa">
-                            <thead>
-                                <tr>
-                                    <th>{% translate "Name" %}</th>
-                                    <th>{% translate "Description" %}</th>
-                                    <th>{% translate "Status" %}</th>
-                                    <th style="white-space: nowrap;">{% translate "Member Count" %}</th>
-                                    <th style="min-width: 170px;"></th>
-                                </tr>
-                            </thead>
 
-                            <tbody>
+                            <td>
-                                {% for group in groups %}
+                                {% if group.authgroup.hidden %}
-                                    <tr>
+                                    <span class="badge bg-info">{% translate "Hidden" %}</span>
-                                        <td>
+                                {% endif %}
-                                            <a href="{% url 'groupmanagement:membership' group.id %}">{{ group.name }}</a>
+                                {% if group.authgroup.open %}
-                                        </td>
+                                    <span class="badge bg-success">{% translate "Open" %}</span>
+                                {% else %}
+                                    <span class="badge bg-secondary">{% translate "Requestable" %}</span>
+                                {% endif %}
+                            </td>
 
-                                        <td>{{ group.authgroup.description|linebreaks|urlize }}</td>
+                            <td class="text-center">
+                                {{ group.num_members }}
+                            </td>
 
-                                        <td>
+                            <td class="text-end">
-                                            {% if group.authgroup.hidden %}
+                                <a href="{% url 'groupmanagement:membership' group.id %}" class="btn btn-primary" title="{% translate "View Members" %}">
-                                                <span class="label label-info">{% translate "Hidden" %}</span>
+                                    <i class="far fa-eye"></i>
-                                            {% elif group.authgroup.open %}
+                                </a>
-                                                <span class="label label-success">{% translate "Open" %}</span>
-                                            {% else %}
-                                                <span class="label label-default">{% translate "Requestable" %}</span>
-                                            {% endif %}
-                                        </td>
 
-                                        <td class="text-right">
+                                <a href="{% url "groupmanagement:audit_log" group.id %}" class="btn btn-info" title="{% translate "Audit Members" %}">
-                                            {{ group.num_members }}
+                                    <i class="far fa-list-alt"></i>
-                                        </td>
+                                </a>
 
-                                        <td class="text-right">
+                                <a id="clipboard-copy" data-clipboard-text="{{ request.scheme }}://{{request.get_host}}{% url 'groupmanagement:request_add' group.id %}" class="btn btn-warning" title="{% translate "Copy Direct Join Link" %}">
-                                            <a href="{% url 'groupmanagement:membership' group.id %}" class="btn btn-primary" title="{% translate "View Members" %}">
+                                    <i class="far fa-clipboard"></i>
-                                                <i class="glyphicon glyphicon-eye-open"></i>
+                                </a>
-                                            </a>
+                            </td>
-
+                        </tr>
-                                            <a href="{% url "groupmanagement:audit_log" group.id %}" class="btn btn-info" title="{% translate "Audit Members" %}">
+                    {% endfor %}
-                                                <i class="glyphicon glyphicon-list-alt"></i>
+                </tbody>
-                                            </a>
+            </table>
-
-                                            <a id="clipboard-copy" data-clipboard-text="{{ SITE_URL }}{% url 'groupmanagement:request_add' group.id %}" class="btn btn-warning" title="{% translate "Copy Direct Join Link" %}">
-                                                <i class="glyphicon glyphicon-copy"></i>
-                                            </a>
-                                        </td>
-                                    </tr>
-                                {% endfor %}
-                            </tbody>
-                        </table>
-                    </div>
-                {% else %}
-                    <div class="alert alert-warning text-center">
-                        {% translate "No groups to list." %}
-                    </div>
-                {% endif %}
-            </div>
         </div>
-    </div>
+    {% else %}
+        <div class="alert alert-warning text-center">
+            {% translate "No groups to list." %}
+        </div>
+    {% endif %}
 {% endblock content %}
 
 {% block extra_javascript %}
-    {% include 'bundles/clipboard-js.html' %}
+    {% include "bundles/clipboard-js.html" %}
 
     <script>
         new ClipboardJS('#clipboard-copy');
     </script>
-{% endblock %}
+{% endblock extra_javascript %}

allianceauth/groupmanagement/templates/groupmanagement/groups.html

@@ -1,62 +1,93 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
+{% load static %}
 {% load i18n %}
 
 {% block page_title %}{% translate "Available Groups" %}{% endblock page_title %}
-{% block extra_css %}{% endblock extra_css %}
+{% block header_nav_brand %}{% translate "Available Groups" %}{% endblock header_nav_brand %}
 
+{% if manager_perms %}
+{% block header_nav_collapse_left %}
+<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>
+        {% endif %}
+    </a>
+</li>
+{% endblock %}
+{% endif %}
 {% block content %}
-    <div class="col-lg-12">
+    {% if groups %}
-        <h1 class="page-header text-center">{% translate "Available Groups" %}</h1>
+        <table class="table" id="groupsTable" >
-        {% if groups %}
+            <thead>
-            <table class="table table-aa">
+                <tr>
-                <thead>
+                    <th>{% translate "Name" %}</th>
-                    <tr>
+                    <th>{% translate "Description" %}</th>
-                        <th>{% translate "Name" %}</th>
+                    <th>{% translate "Leaders" %}<span class="m-1 fw-lighter badge bg-primary">{% translate "User" %}</span><span class="m-1 fw-lighter badge bg-secondary ">{% translate "Group" %}</span></th>
-                        <th>{% translate "Description" %}</th>
+                    <th></th>
-                        <th></th>
+                </tr>
-                    </tr>
+            </thead>
-                </thead>
 
-                <tbody>
+            <tbody class>
-                    {% for g in groups %}
+                {% for g in groups %}
-                        <tr>
+                    <tr>
-                            <td>{{ g.group.name }}</td>
+                        <td>{{ g.group.name }}</td>
-                            <td>{{ g.group.authgroup.description|linebreaks|urlize }}</td>
+                        <td>{{ g.group.authgroup.description|linebreaks|urlize }}</td>
-                            <td class="text-right">
+                        <td style="max-width: 30%;">
-                                {% if g.group in user.groups.all %}
+                            {% if g.group.authgroup.group_leaders.all.count %}
-                                    {% if not g.request %}
+                                {% for leader in g.group.authgroup.group_leaders.all %}{% if leader.profile.main_character %}<span class="m-1 badge bg-primary">{{leader.profile.main_character}}</span>{% endif %}{% endfor %}
-                                        <a href="{% url 'groupmanagement:request_leave' g.group.id %}" class="btn btn-danger">
+                            {% endif %}
-                                            {% translate "Leave" %}
+                            {% if g.group.authgroup.group_leaders.all.count %}
-                                        </a>
+                                {% for group in g.group.authgroup.group_leader_groups.all %}<span class="badge bg-secondary">{{group.name}}</span>{% endfor %}
-                                    {% else %}
+                            {% endif %}
-                                        <button type="button" class="btn btn-primary" disabled>
+                        </td>
-                                            {% translate "Pending" %}
+                        <td class="text-end">
-                                        </button>
+                            {% if g.group in user_groups %}
-                                    {% endif %}
+                                {% if not g.request %}
-                                {% elif not g.request %}
+                                    <a href="{% url 'groupmanagement:request_leave' g.group.id %}" class="btn btn-danger">
-                                    {% if g.group.authgroup.open %}
+                                        {% translate "Leave" %}
-                                        <a href="{% url 'groupmanagement:request_add' g.group.id %}" class="btn btn-success">
+                                    </a>
-                                            {% translate "Join" %}
-                                        </a>
-                                    {% else %}
-                                        <a href="{% url 'groupmanagement:request_add' g.group.id %}" class="btn btn-primary">
-                                            {% translate "Request" %}
-                                        </a>
-                                    {% endif %}
                                 {% else %}
                                     <button type="button" class="btn btn-primary" disabled>
                                         {% translate "Pending" %}
                                     </button>
                                 {% endif %}
-                            </td>
+                            {% elif not g.request %}
-                        </tr>
+                                {% if g.group.authgroup.open %}
-                    {% endfor %}
+                                    <a href="{% url 'groupmanagement:request_add' g.group.id %}" class="btn btn-success">
-                </tbody>
+                                        {% translate "Join" %}
-            </table>
+                                    </a>
-        {% else %}
+                                {% else %}
-            <div class="alert alert-warning text-center">
+                                    <a href="{% url 'groupmanagement:request_add' g.group.id %}" class="btn btn-primary">
-                {% translate "No groups available." %}
+                                        {% translate "Request" %}
-            </div>
+                                    </a>
-        {% endif %}
+                                {% endif %}
-    </div>
+                            {% else %}
+                                <button type="button" class="btn btn-primary" disabled>
+                                    {% translate "Pending" %}
+                                </button>
+                            {% endif %}
+                        </td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    {% else %}
+        <div class="alert alert-warning text-center">
+            {% translate "No groups available." %}
+        </div>
+    {% endif %}
 {% endblock content %}
+{% block extra_javascript %}
+    {% include 'bundles/datatables-js-bs5.html' %}
+{% endblock %}
+
+{% block extra_css %}
+    {% include 'bundles/datatables-css-bs5.html' %}
+{% endblock %}
+
+{% block extra_script %}
+    $(document).ready(function () {
+        $('#groupsTable').DataTable();
+    });
+{% endblock extra_script %}

allianceauth/groupmanagement/templates/groupmanagement/index.html

@@ -1,166 +1,158 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
+{% load static %}
 {% load i18n %}
 {% load evelinks %}
+{% load navactive %}
 
 {% block page_title %}{% translate "Groups Management" %}{% endblock page_title %}
+{% block header_nav_brand %}{% translate "Groups Management" %}{% endblock header_nav_brand %}
 
 {% block extra_css %}
-    <style>
-        .nav-tabs > li.active > a {
-            background-color: rgb(236, 240, 241) !important;
-            color: rgb(44, 62, 80);
-        }
-    </style>
 {% endblock extra_css %}
 
-{% block content %}
+{% block header_nav_collapse_left %}
-    <div class="col-lg-12">
+<li class="active">
-        <br>
+    <a class="nav-link active" id="add-tab" data-bs-toggle="tab" data-bs-target="#add" type="button" role="tab" aria-controls="addd" aria-selected="true">
-        {% include 'groupmanagement/menu.html' %}
+        {% translate "Join Requests" %}
 
-        <ul class="nav nav-tabs">
+        {% if acceptrequests %}
-            <li class="active">
+            <span class="badge bg-secondary">{{ acceptrequests|length }}</span>
-                <a data-toggle="tab" href="#add">
+        {% endif %}
-                    {% translate "Join Requests" %}
+    </a>
+</li>
 
-                    {% if acceptrequests %}
+{%  if not auto_leave %}
-                        <span class="badge">{{ acceptrequests|length }}</span>
+    <li>
-                    {% endif %}
+        <a class="nav-link" id="leave-tab" data-bs-toggle="tab" data-bs-target="#leave" type="button" role="tab" aria-controls="leave" aria-selected="false">
-                </a>
+            {% translate "Leave Requests" %}
-            </li>
 
-            {%  if not show_leave_tab %}
+            {% if leaverequests %}
-                <li>
+                <span class="badge bg-secondary">{{ leaverequests|length }}</span>
-                    <a data-toggle="tab" href="#leave">
-                        {% translate "Leave Requests" %}
-
-                        {% if leaverequests %}
-                            <span class="badge">{{ leaverequests|length }}</span>
-                        {% endif %}
-                    </a>
-                </li>
             {% endif %}
-        </ul>
+        </a>
+    </li>
+{% endif %}
+<li class="nav-item ">
+    <a class="nav-link {% navactive request 'groupmanagement:membership groupmanagement:audit_log' %}" href="{% url 'groupmanagement:membership' %}">{% translate "Group Membership" %}</a>
+</li>
 
-        <div class="panel panel-default panel-tabs-aa">
+{% endblock %}
-            <div class="panel-body">
-                <div class="tab-content">
 
-                    <div id="add" class="tab-pane active">
-                        {% if acceptrequests %}
-                            <div class="table-responsive">
-                                <table class="table table-aa">
-                                    <thead>
-                                        <tr>
-                                            <th>{% translate "Character" %}</th>
-                                            <th>{% translate "Organization" %}</th>
-                                            <th>{% translate "Group" %}</th>
-                                            <th></th>
-                                        </tr>
-                                    </thead>
 
-                                    <tbody>
+{% block content %}
-                                        {% for acceptrequest in acceptrequests %}
+<div class="tab-content">
-                                            <tr>
+    <div id="add" class="tab-pane active">
-                                                <td>
+        {% if acceptrequests %}
-                                                    <img src="{{ acceptrequest.main_char|character_portrait_url:32 }}" class="img-circle" style="margin-right: 1rem;" alt="{{ acceptrequest.main_char.character_name }}">
+            <div class="table-responsive">
-                                                    {% if acceptrequest.main_char %}
+                <table class="table table-aa">
-                                                        <a href="{{ acceptrequest.main_char|evewho_character_url }}" target="_blank">
+                    <thead>
-                                                            {{ acceptrequest.main_char.character_name }}
+                        <tr>
-                                                        </a>
+                            <th>{% translate "Character" %}</th>
-                                                    {% else %}
+                            <th>{% translate "Organization" %}</th>
-                                                        {{ acceptrequest.user.username }}
+                            <th>{% translate "Group" %}</th>
-                                                    {% endif %}
+                            <th></th>
-                                                </td>
+                        </tr>
-                                                <td>
+                    </thead>
-                                                    {% if acceptrequest.main_char %}
-                                                        <a href="{{ acceptrequest.main_char|dotlan_corporation_url }}" target="_blank">
-                                                            {{ acceptrequest.main_char.corporation_name }}
-                                                        </a><br>
-                                                        {{ acceptrequest.main_char.alliance_name|default_if_none:"" }}
-                                                    {% else %}
-                                                        {% translate "(unknown)" %}
-                                                    {% endif %}
-                                                </td>
-                                                <td>{{ acceptrequest.group.name }}</td>
-                                                <td class="text-right">
-                                                    <a href="{% url 'groupmanagement:accept_request' acceptrequest.id %}" class="btn btn-success">
-                                                        {% translate "Accept" %}
-                                                    </a>
 
-                                                    <a href="{% url 'groupmanagement:reject_request' acceptrequest.id %}" class="btn btn-danger">
+                    <tbody class="align-middle">
-                                                        {% translate "Reject" %}
+                        {% for acceptrequest in acceptrequests %}
-                                                    </a>
+                            <tr>
-                                                </td>
+                                <td>
-                                            </tr>
+                                    <img src="{{ acceptrequest.main_char|character_portrait_url:32 }}" class="rounded-circle" style="margin-right: 1rem;" alt="{{ acceptrequest.main_char.character_name }}">
-                                        {% endfor %}
+                                    {% if acceptrequest.main_char %}
-                                    </tbody>
+                                        <a href="{{ acceptrequest.main_char|evewho_character_url }}" target="_blank">
-                                </table>
+                                            {{ acceptrequest.main_char.character_name }}
-                            </div>
+                                        </a>
-                        {% else %}
+                                    {% else %}
-                            <div class="alert alert-warning text-center">{% translate "No group add requests." %}</div>
+                                        {{ acceptrequest.user.username }}
-                        {% endif %}
+                                    {% endif %}
-                    </div>
+                                </td>
+                                <td>
+                                    {% if acceptrequest.main_char %}
+                                        <a href="{{ acceptrequest.main_char|dotlan_corporation_url }}" target="_blank">
+                                            {{ acceptrequest.main_char.corporation_name }}
+                                        </a><br>
+                                        {{ acceptrequest.main_char.alliance_name|default_if_none:"" }}
+                                    {% else %}
+                                        {% translate "(unknown)" %}
+                                    {% endif %}
+                                </td>
+                                <td>{{ acceptrequest.group.name }}</td>
+                                <td class="text-end">
+                                    <a href="{% url 'groupmanagement:accept_request' acceptrequest.id %}" class="btn btn-success">
+                                        {% translate "Accept" %}
+                                    </a>
 
-                    {%  if not show_leave_tab %}
+                                    <a href="{% url 'groupmanagement:reject_request' acceptrequest.id %}" class="btn btn-danger">
-                        <div id="leave" class="tab-pane">
+                                        {% translate "Reject" %}
-                            {% if leaverequests %}
+                                    </a>
-                                <div class="table-responsive">
+                                </td>
-                                    <table class="table table-aa">
+                            </tr>
-                                        <thead>
+                        {% endfor %}
-                                            <tr>
+                    </tbody>
-                                                <th>{% translate "Character" %}</th>
+                </table>
-                                                <th>{% translate "Organization" %}</th>
-                                                <th>{% translate "Group" %}</th>
-                                                <th></th>
-                                            </tr>
-                                        </thead>
-
-                                        <tbody>
-                                            {% for leaverequest in leaverequests %}
-                                                <tr>
-                                                    <td>
-                                                        <img src="{{ leaverequest.main_char|character_portrait_url:32 }}" class="img-circle" style="margin-right: 1rem;" alt="{{ leaverequest.main_char.character_name }}">
-                                                        {% if leaverequest.main_char %}
-                                                            <a href="{{ leaverequest.main_char|evewho_character_url }}" target="_blank">
-                                                                {{ leaverequest.main_char.character_name }}
-                                                            </a>
-                                                        {% else %}
-                                                            {{ leaverequest.user.username }}
-                                                        {% endif %}
-                                                    </td>
-                                                    <td>
-                                                        {% if leaverequest.main_char %}
-                                                            <a href="{{ leaverequest.main_char|dotlan_corporation_url }}" target="_blank">
-                                                                {{ leaverequest.main_char.corporation_name }}
-                                                            </a><br>
-                                                            {{ leaverequest.main_char.alliance_name|default_if_none:"" }}
-                                                        {% else %}
-                                                            {% translate "(unknown)" %}
-                                                        {% endif %}
-                                                    </td>
-                                                    <td>{{ leaverequest.group.name }}</td>
-                                                    <td class="text-right">
-                                                        <a href="{% url 'groupmanagement:leave_accept_request' leaverequest.id %}" class="btn btn-success">
-                                                            {% translate "Accept" %}
-                                                        </a>
-
-                                                        <a href="{% url 'groupmanagement:leave_reject_request' leaverequest.id %}" class="btn btn-danger">
-                                                            {% translate "Reject" %}
-                                                        </a>
-                                                    </td>
-                                                </tr>
-                                            {% endfor %}
-                                        </tbody>
-                                    </table>
-                                </div>
-                            {% else %}
-                                <div class="alert alert-warning text-center">{% translate "No group leave requests." %}</div>
-                            {% endif %}
-                        </div>
-                    {% endif %}
-                </div>
             </div>
-        </div>
+        {% else %}
+            <div class="alert alert-warning text-center">{% translate "No group add requests." %}</div>
+        {% endif %}
     </div>
+
+    {%  if not auto_leave %}
+        <div id="leave" class="tab-pane">
+            {% if leaverequests %}
+                <div class="table-responsive">
+                    <table class="table table-aa">
+                        <thead>
+                            <tr>
+                                <th>{% translate "Character" %}</th>
+                                <th>{% translate "Organization" %}</th>
+                                <th>{% translate "Group" %}</th>
+                                <th></th>
+                            </tr>
+                        </thead>
+
+                        <tbody class="align-middle">
+                            {% for leaverequest in leaverequests %}
+                                <tr>
+                                    <td>
+                                        <img src="{{ leaverequest.main_char|character_portrait_url:32 }}" class="rounded-circle" style="margin-right: 1rem;" alt="{{ leaverequest.main_char.character_name }}">
+                                        {% if leaverequest.main_char %}
+                                            <a href="{{ leaverequest.main_char|evewho_character_url }}" target="_blank">
+                                                {{ leaverequest.main_char.character_name }}
+                                            </a>
+                                        {% else %}
+                                            {{ leaverequest.user.username }}
+                                        {% endif %}
+                                    </td>
+                                    <td>
+                                        {% if leaverequest.main_char %}
+                                            <a href="{{ leaverequest.main_char|dotlan_corporation_url }}" target="_blank">
+                                                {{ leaverequest.main_char.corporation_name }}
+                                            </a><br>
+                                            {{ leaverequest.main_char.alliance_name|default_if_none:"" }}
+                                        {% else %}
+                                            {% translate "(unknown)" %}
+                                        {% endif %}
+                                    </td>
+                                    <td>{{ leaverequest.group.name }}</td>
+                                    <td class="text-end">
+                                        <a href="{% url 'groupmanagement:leave_accept_request' leaverequest.id %}" class="btn btn-success">
+                                            {% translate "Accept" %}
+                                        </a>
+
+                                        <a href="{% url 'groupmanagement:leave_reject_request' leaverequest.id %}" class="btn btn-danger">
+                                            {% translate "Reject" %}
+                                        </a>
+                                    </td>
+                                </tr>
+                            {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
+            {% else %}
+                <div class="alert alert-warning text-center">{% translate "No group leave requests." %}</div>
+            {% endif %}
+        </div>
+    {% endif %}
+</div>
 {% endblock content %}

allianceauth/groupmanagement/templates/groupmanagement/menu.html

@@ -1,27 +1,10 @@
 {% load i18n %}
 {% load navactive %}
 
-<nav class="navbar navbar-default">
-    <div class="container-fluid">
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
-                <span class="sr-only">{% translate "Toggle navigation" %}</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <a class="navbar-brand" href="{% url 'groupmanagement:management' %}">{% translate "Group Management" %}</a>
-        </div>
 
-        <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+<li class="nav-item ">
-            <ul class="nav navbar-nav">
+    <a class="nav-link {% navactive request 'groupmanagement:management' %}" href="{% url 'groupmanagement:management' %}">{% translate "Group Requests" %}</a>
-                <li class="{% navactive request 'groupmanagement:management' %}">
+</li>
-                    <a href="{% url 'groupmanagement:management' %}">{% translate "Group Requests" %}</a>
+<li class="nav-item ">
-                </li>
+    <a class="nav-link {% navactive request 'groupmanagement:membership groupmanagement:audit_log' %}" href="{% url 'groupmanagement:membership' %}">{% translate "Group Membership" %}</a>
-                <li class="{% navactive request 'groupmanagement:membership groupmanagement:audit_log' %}">
+</li>
-                    <a href="{% url 'groupmanagement:membership' %}">{% translate "Group Membership" %}</a>
-                </li>
-            </ul>
-        </div>
-    </div>
-</nav>

allianceauth/groupmanagement/tests/test_admin.py

@@ -6,22 +6,22 @@ from django.conf import settings
 from django.contrib import admin
 from django.contrib.admin.sites import AdminSite
 from django.contrib.auth.models import User
-from django.test import Client, RequestFactory, TestCase, override_settings
+from django.test import TestCase, RequestFactory, Client, override_settings
 
 from allianceauth.authentication.models import CharacterOwnership, State
 from allianceauth.eveonline.models import (
-    EveAllianceInfo, EveCharacter, EveCorporationInfo,
+    EveCharacter, EveCorporationInfo, EveAllianceInfo
 )
 from allianceauth.tests.auth_utils import AuthUtils
 
-from ..admin import Group, GroupAdmin, HasLeaderFilter
-from ..models import ReservedGroupName
 from . import get_admin_change_view_url
+from ..admin import HasLeaderFilter, GroupAdmin, Group
+from ..models import ReservedGroupName
+
 
 if 'allianceauth.eveonline.autogroups' in settings.INSTALLED_APPS:
     _has_auto_groups = True
     from allianceauth.eveonline.autogroups.models import AutogroupsConfig
-
     from ..admin import IsAutoGroupFilter
 else:
     _has_auto_groups = False
@@ -621,16 +621,21 @@ class TestGroupAdmin2(TestCase):
         response = self.client.post(
             f"/admin/groupmanagement/group/{group.pk}/change/",
             data={
-                "name": group.name,
+                "name": f"{group.name}",
-                "users": [user_member.pk, user_guest.pk],
+                "authgroup-TOTAL_FORMS": "1",
-                "authgroup-TOTAL_FORMS": 1,
+                "authgroup-INITIAL_FORMS": "1",
-                "authgroup-INITIAL_FORMS": 1,
+                "authgroup-MIN_NUM_FORMS": "0",
-                "authgroup-MIN_NUM_FORMS": 0,
+                "authgroup-MAX_NUM_FORMS": "1",
-                "authgroup-MAX_NUM_FORMS": 1,
+                "authgroup-0-description": "",
-                "authgroup-0-states": member_state.pk,
+                "authgroup-0-states": f"{member_state.pk}",
                 "authgroup-0-internal": "on",
                 "authgroup-0-hidden": "on",
-                "authgroup-0-group": group.pk,
+                "authgroup-0-group": f"{group.pk}",
+                "authgroup-__prefix__-description": "",
+                "authgroup-__prefix__-internal": "on",
+                "authgroup-__prefix__-hidden": "on",
+                "authgroup-__prefix__-group": f"{group.pk}",
+                "_save": "Save"
             }
         )
         # then
@@ -639,85 +644,6 @@ class TestGroupAdmin2(TestCase):
         self.assertIn(group, user_member.groups.all())
         self.assertNotIn(group, user_guest.groups.all())
 
-    def test_should_add_user_to_existing_group(self):
-        # given
-        user_bruce = AuthUtils.create_user("Bruce Wayne")
-        user_lex = AuthUtils.create_user("Lex Luthor")
-        group = Group.objects.create(name="dummy")
-        user_bruce.groups.add(group)
-        self.client.force_login(self.superuser)
-        # when
-        response = self.client.post(
-            f"/admin/groupmanagement/group/{group.pk}/change/",
-            data={
-                "name": group.name,
-                "users": [user_bruce.pk, user_lex.pk],
-                "authgroup-TOTAL_FORMS": 1,
-                "authgroup-INITIAL_FORMS": 1,
-                "authgroup-MIN_NUM_FORMS": 0,
-                "authgroup-MAX_NUM_FORMS": 1,
-                "authgroup-0-internal": "on",
-                "authgroup-0-hidden": "on",
-                "authgroup-0-group": group.pk,
-            }
-        )
-        # then
-        self.assertEqual(response.status_code, 302)
-        self.assertEqual(response.url, "/admin/groupmanagement/group/")
-        self.assertIn(group, user_bruce.groups.all())
-        self.assertIn(group, user_lex.groups.all())
-
-    def test_should_remove_user_from_existing_group(self):
-        # given
-        user_bruce = AuthUtils.create_user("Bruce Wayne")
-        user_lex = AuthUtils.create_user("Lex Luthor")
-        group = Group.objects.create(name="dummy")
-        user_bruce.groups.add(group)
-        user_lex.groups.add(group)
-        self.client.force_login(self.superuser)
-        # when
-        response = self.client.post(
-            f"/admin/groupmanagement/group/{group.pk}/change/",
-            data={
-                "name": group.name,
-                "users": user_bruce.pk,
-                "authgroup-TOTAL_FORMS": 1,
-                "authgroup-INITIAL_FORMS": 1,
-                "authgroup-MIN_NUM_FORMS": 0,
-                "authgroup-MAX_NUM_FORMS": 1,
-                "authgroup-0-internal": "on",
-                "authgroup-0-hidden": "on",
-                "authgroup-0-group": group.pk,
-            }
-        )
-        # then
-        self.assertEqual(response.status_code, 302)
-        self.assertEqual(response.url, "/admin/groupmanagement/group/")
-        self.assertIn(group, user_bruce.groups.all())
-        self.assertNotIn(group, user_lex.groups.all())
-
-    def test_should_include_user_when_creating_group(self):
-        # given
-        user_bruce = AuthUtils.create_user("Bruce Wayne")
-        self.client.force_login(self.superuser)
-        # when
-        response = self.client.post(
-            "/admin/groupmanagement/group/add/",
-            data={
-                "name": "new group",
-                "users": user_bruce.pk,
-                "authgroup-TOTAL_FORMS": 1,
-                "authgroup-INITIAL_FORMS": 0,
-                "authgroup-MIN_NUM_FORMS": 0,
-                "authgroup-MAX_NUM_FORMS": 1,
-            }
-        )
-        # then
-        self.assertEqual(response.status_code, 302)
-        self.assertEqual(response.url, "/admin/groupmanagement/group/")
-        group = Group.objects.get(name="new group")
-        self.assertIn(group, user_bruce.groups.all())
-
 
 class TestReservedGroupNameAdmin(TestCase):
     @classmethod

allianceauth/groupmanagement/tests/test_views.py

@@ -1,7 +1,6 @@
 from django.test import RequestFactory, TestCase, override_settings
 from django.urls import reverse
 
-from allianceauth.groupmanagement.models import Group, GroupRequest
 from allianceauth.tests.auth_utils import AuthUtils
 
 from .. import views
@@ -17,7 +16,6 @@ class TestViews(TestCase):
         self.factory = RequestFactory()
         self.user = AuthUtils.create_user('Peter Parker')
         self.user_with_manage_permission = AuthUtils.create_user('Bruce Wayne')
-        self.group = Group.objects.create(name="Example group")
 
         # set permissions
         AuthUtils.add_permission_to_user_by_name(
@@ -66,7 +64,7 @@ class TestViews(TestCase):
         content = response_content_to_str(response)
 
         self.assertEqual(response.status_code, 200)
-        self.assertIn('<a data-toggle="tab" href="#leave">', content)
+        self.assertIn('id="leave-tab" data-bs-toggle="tab" data-bs-target="#leave"', content)
         self.assertIn('<div id="leave" class="tab-pane">', content)
 
     @override_settings(GROUPMANAGEMENT_AUTO_LEAVE=True)
@@ -83,21 +81,5 @@ class TestViews(TestCase):
         content = response_content_to_str(response)
 
         self.assertEqual(response.status_code, 200)
-        self.assertNotIn('<a data-toggle="tab" href="#leave">', content)
+        self.assertNotIn('id="leave-tab" data-bs-toggle="tab" data-bs-target="#leave"', content)
         self.assertNotIn('<div id="leave" class="tab-pane">', content)
-
-    @override_settings(GROUPMANAGEMENT_AUTO_LEAVE=True)
-    def test_should_not_hide_leave_requests_tab_when_there_are_open_requests(self):
-        # given
-        request = self.factory.get(reverse('groupmanagement:management'))
-        request.user = self.user_with_manage_permission
-        GroupRequest.objects.create(user=self.user, group=self.group, leave_request=True)
-
-        # when
-        response = views.group_management(request)
-
-        # then
-        content = response_content_to_str(response)
-        self.assertEqual(response.status_code, 200)
-        self.assertIn('<a data-toggle="tab" href="#leave">', content)
-        self.assertIn('<div id="leave" class="tab-pane">', content)

allianceauth/groupmanagement/views.py

@@ -2,12 +2,13 @@ import logging
 
 from django.conf import settings
 from django.contrib import messages
-from django.contrib.auth.decorators import login_required, user_passes_test
+from django.contrib.auth.decorators import login_required
+from django.contrib.auth.decorators import user_passes_test
 from django.contrib.auth.models import Group
 from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
 from django.db.models import Count
 from django.http import Http404
-from django.shortcuts import get_object_or_404, redirect, render
+from django.shortcuts import render, redirect, get_object_or_404
 from django.utils.translation import gettext_lazy as _
 
 from allianceauth.notifications import notify
@@ -15,6 +16,7 @@ from allianceauth.notifications import notify
 from .managers import GroupManager
 from .models import GroupRequest, RequestLog
 
+
 logger = logging.getLogger(__name__)
 
 
@@ -43,15 +45,10 @@ def group_management(request):
     logger.debug("Providing user {} with {} acceptrequests and {} leaverequests.".format(
         request.user, len(acceptrequests), len(leaverequests)))
 
-    show_leave_tab = (
-        getattr(settings, 'GROUPMANAGEMENT_AUTO_LEAVE', False)
-        and not GroupRequest.objects.filter(leave_request=True).exists()
-    )
-
     render_items = {
         'acceptrequests': acceptrequests,
         'leaverequests': leaverequests,
-        'show_leave_tab': show_leave_tab,
+        'auto_leave': getattr(settings, 'GROUPMANAGEMENT_AUTO_LEAVE', False),
     }
 
     return render(request, 'groupmanagement/index.html', context=render_items)
@@ -90,7 +87,7 @@ def group_membership_audit(request, group_id):
 
     except ObjectDoesNotExist:
         raise Http404("Group does not exist")
-    render_items = {'group': group.name}
+    render_items = {'group': group}
     entries = RequestLog.objects.filter(group=group).order_by('-date')
     render_items['entries'] = entries
 
@@ -314,8 +311,10 @@ def groups_view(request):
     groups_qs = GroupManager.get_joinable_groups_for_user(
         request.user, include_hidden=False
     )
-    groups_qs = groups_qs.order_by('name')
+    groups_qs = groups_qs.order_by('name').select_related("authgroup").prefetch_related('authgroup__group_leaders', 'authgroup__group_leaders__profile__main_character', 'authgroup__group_leader_groups')
     groups = []
+
+    ## TODO see about making this faster
     for group in groups_qs:
         group_request = GroupRequest.objects\
             .filter(user=request.user)\
@@ -325,7 +324,14 @@ def groups_view(request):
             'request': group_request[0] if group_request else None
         })
 
-    context = {'groups': groups}
+    count = 0
+    perms = GroupManager.can_manage_groups(request.user)
+    if perms:
+        count = GroupManager.pending_requests_count_for_user(request.user)
+
+    user_groups_list = list(request.user.groups.all())
+    context = {'groups': groups, "manager_perms": perms, "req_count":count, "user_groups": user_groups_list}
+
     return render(request, 'groupmanagement/groups.html', context=context)
 
 

allianceauth/hooks.py

@@ -91,7 +91,7 @@ def get_app_modules():
 
 
 def get_app_submodules(module_name):
-    """
+    """pyt
     Get a specific sub module of the app
     :param module_name: module name to get
     :return: name, module tuple
@@ -122,3 +122,17 @@ def get_hooks(name):
     """
     register_all_hooks()
     return _hooks.get(name, [])
+
+
+class DashboardItemHook:
+    def __init__(self, view_function, order:int=10):
+        self.view_function = view_function
+        self.order = order
+
+    def render(self, request):
+        try:
+            logger.debug(f"Rendering {self.view_function} to dashboard")
+            return self.view_function(request)
+        except Exception as e:
+            logger.exception(f"Rendering {self.view_function} failed!")
+            return ""

allianceauth/hrapplications/auth_hooks.py

@@ -1,7 +1,8 @@
 from django.utils.translation import gettext_lazy as _
 
 from allianceauth import hooks
-from allianceauth.services.hooks import MenuItemHook, UrlHook
+from allianceauth.menu.hooks import MenuItemHook
+from allianceauth.services.hooks import UrlHook
 
 from . import urls
 from .models import Application

allianceauth/hrapplications/templates/hrapplications/corpchoice.html

@@ -1,4 +1,4 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
 
 {% block page_title %}{% translate "Choose a Corp" %}{% endblock page_title %}

allianceauth/hrapplications/templates/hrapplications/create.html

@@ -1,4 +1,4 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
 
 {% block page_title %}{% translate "Apply To" %} {{ corp.corporation_name }}{% endblock page_title %}

allianceauth/hrapplications/templates/hrapplications/management.html

@@ -8,7 +8,7 @@
 {% block content %}
     <div class="col-lg-12">
         <h1 class="page-header text-center">{% translate "Personal Applications" %}
-            <div class="text-right">
+            <div class="text-end">
                 {% if create %}
                     <a href="{% url 'hrapplications:create_view' %}">
                         <button type="button" class="btn btn-success">{% translate "Create Application" %}</button>
@@ -33,11 +33,11 @@
                             <td class="text-center">{{ personal_app.form.corp.corporation_name }}</td>
                             <td class="text-center">
                                 {% if personal_app.approved == None %}
-                                    <div class="label label-warning">{% translate "Pending" %}</div>
+                                    <div class="badge bg-warning">{% translate "Pending" %}</div>
                                 {% elif  personal_app.approved == True %}
-                                    <div class="label label-success">{% translate "Approved" %}</div>
+                                    <div class="badge bg-success">{% translate "Approved" %}</div>
                                 {% else %}
-                                    <div class="label label-danger">{% translate "Rejected" %}</div>
+                                    <div class="badge bg-danger">{% translate "Rejected" %}</div>
                                 {% endif %}
                             </td>
                             <td class="text-center">
@@ -58,7 +58,7 @@
         {% endif %}
         {% if perms.auth.human_resources %}
             <h1 class="page-header text-center">{% translate "Application Management" %}
-                <div class="text-right">
+                <div class="text-end">
                     <!-- Button trigger modal -->
                     <button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#myModal">
                         {% translate "Search Applications" %}
@@ -91,14 +91,14 @@
                                         <td class="text-center">
                                             {% if app.approved == None %}
                                                 {% if app.reviewer_str %}
-                                                    <div class="label label-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
+                                                    <div class="badge bg-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
                                                 {% else %}
-                                                    <div class="label label-warning">{% translate "Pending" %}</div>
+                                                    <div class="badge bg-warning">{% translate "Pending" %}</div>
                                                 {% endif %}
                                             {% elif  app.approved == True %}
-                                                <div class="label label-success">{% translate "Approved" %}</div>
+                                                <div class="badge bg-success">{% translate "Approved" %}</div>
                                             {% else %}
-                                                <div class="label label-danger">{% translate "Rejected" %}</div>
+                                                <div class="badge bg-danger">{% translate "Rejected" %}</div>
                                             {% endif %}
                                         </td>
                                         <td class="text-center">
@@ -135,14 +135,14 @@
                                         <td class="text-center">
                                             {% if app.approved == None %}
                                                 {% if app.reviewer_str %}
-                                                    <div class="label label-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
+                                                    <div class="badge bg-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
                                                 {% else %}
-                                                    <div class="label label-warning">{% translate "Pending" %}</div>
+                                                    <div class="badge bg-warning">{% translate "Pending" %}</div>
                                                 {% endif %}
                                             {% elif  app.approved == True %}
-                                                <div class="label label-success">{% translate "Approved" %}</div>
+                                                <div class="badge bg-success">{% translate "Approved" %}</div>
                                             {% else %}
-                                                <div class="label label-danger">{% translate "Rejected" %}</div>
+                                                <div class="badge bg-danger">{% translate "Rejected" %}</div>
                                             {% endif %}
                                         </td>
                                         <td class="text-center">

allianceauth/hrapplications/templates/hrapplications/searchview.html

@@ -9,7 +9,7 @@
     <div class="col-lg-12">
         {% if perms.auth.human_resources %}
             <h1 class="page-header text-center">{% translate "Application Search Results" %}
-                <div class="text-right">
+                <div class="text-end">
                     <!-- Button trigger modal -->
                     <button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#myModal">
                         {% translate "Search Applications" %}
@@ -34,11 +34,11 @@
                             <td class="text-center">{{ app.form.corp }}</td>
                             <td class="text-center">
                                 {% if app.approved == None %}
-                                    <div class="label label-warning">{% translate "Pending" %}</div>
+                                    <div class="badge bg-warning">{% translate "Pending" %}</div>
                                 {% elif  app.approved == True %}
-                                    <div class="label label-success">{% translate "Approved" %}</div>
+                                    <div class="badge bg-success">{% translate "Approved" %}</div>
                                 {% else %}
-                                    <div class="label label-danger">{% translate "Rejected" %}</div>
+                                    <div class="badge bg-danger">{% translate "Rejected" %}</div>
                                 {% endif %}
                             </td>
                             <td class="text-center">

allianceauth/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-17 18:50+1000\n"
+"POT-Creation-Date: 2022-10-09 18:20+1000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Google Analytics V4"
 msgstr ""
 
-#: allianceauth/authentication/decorators.py:49
+#: allianceauth/authentication/decorators.py:37
 msgid "A main character is required to perform that action. Add one below."
 msgstr ""
 
@@ -39,68 +39,63 @@ msgstr ""
 msgid "You are not allowed to add or remove these restricted groups: %s"
 msgstr ""
 
-#: allianceauth/authentication/models.py:71
+#: allianceauth/authentication/models.py:80
 msgid "English"
 msgstr ""
 
-#: allianceauth/authentication/models.py:72
+#: allianceauth/authentication/models.py:81
 msgid "German"
 msgstr ""
 
-#: allianceauth/authentication/models.py:73
+#: allianceauth/authentication/models.py:82
 msgid "Spanish"
 msgstr ""
 
-#: allianceauth/authentication/models.py:74
+#: allianceauth/authentication/models.py:83
 msgid "Chinese Simplified"
 msgstr ""
 
-#: allianceauth/authentication/models.py:75
+#: allianceauth/authentication/models.py:84
 msgid "Russian"
 msgstr ""
 
-#: allianceauth/authentication/models.py:76
+#: allianceauth/authentication/models.py:85
 msgid "Korean"
 msgstr ""
 
-#: allianceauth/authentication/models.py:77
+#: allianceauth/authentication/models.py:86
 msgid "French"
 msgstr ""
 
-#: allianceauth/authentication/models.py:78
+#: allianceauth/authentication/models.py:87
 msgid "Japanese"
 msgstr ""
 
-#: allianceauth/authentication/models.py:79
+#: allianceauth/authentication/models.py:88
 msgid "Italian"
 msgstr ""
 
-#: allianceauth/authentication/models.py:80
+#: allianceauth/authentication/models.py:91
-msgid "Ukrainian"
-msgstr ""
-
-#: allianceauth/authentication/models.py:96
 msgid "Language"
 msgstr ""
 
-#: allianceauth/authentication/models.py:101
+#: allianceauth/authentication/models.py:96
 #: allianceauth/templates/allianceauth/night-toggle.html:6
 msgid "Night Mode"
 msgstr ""
 
-#: allianceauth/authentication/models.py:115
+#: allianceauth/authentication/models.py:110
 #, python-format
 msgid "State changed to: %s"
 msgstr ""
 
-#: allianceauth/authentication/models.py:116
+#: allianceauth/authentication/models.py:111
 #, python-format
 msgid "Your user's state is now: %(state)s"
 msgstr ""
 
 #: allianceauth/authentication/templates/authentication/dashboard.html:4
 #: allianceauth/authentication/templates/authentication/dashboard.html:7
-#: allianceauth/authentication/templates/authentication/tokens.html:4
 #: allianceauth/templates/allianceauth/side-menu.html:10
 msgid "Dashboard"
 msgstr ""
@@ -156,49 +151,8 @@ msgstr ""
 msgid "Alliance"
 msgstr ""
 
-#: allianceauth/authentication/templates/authentication/tokens.html:7
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:62
-msgid "Token Management"
-msgstr ""
-
-#: allianceauth/authentication/templates/authentication/tokens.html:12
-msgid "Scopes"
-msgstr ""
-
-#: allianceauth/authentication/templates/authentication/tokens.html:13
-#: allianceauth/hrapplications/templates/hrapplications/management.html:28
-#: allianceauth/hrapplications/templates/hrapplications/management.html:83
-#: allianceauth/hrapplications/templates/hrapplications/management.html:127
-#: allianceauth/hrapplications/templates/hrapplications/searchview.html:27
-#: allianceauth/hrapplications/templates/hrapplications/view.html:73
-#: allianceauth/srp/templates/srp/data.html:101
-#: allianceauth/srp/templates/srp/management.html:44
-msgid "Actions"
-msgstr ""
-
-#: allianceauth/authentication/templates/authentication/tokens.html:14
-#: allianceauth/corputils/templates/corputils/corpstats.html:74
-#: allianceauth/corputils/templates/corputils/corpstats.html:112
-#: allianceauth/corputils/templates/corputils/corpstats.html:156
-#: allianceauth/corputils/templates/corputils/search.html:13
-#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html:22
-#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:26
-#: allianceauth/groupmanagement/templates/groupmanagement/audit.html:30
-#: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:29
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:55
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:112
-msgid "Character"
-msgstr ""
-
-#: allianceauth/authentication/templates/authentication/tokens.html:28
-msgid ""
-"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."
-msgstr ""
-
 #: allianceauth/authentication/templates/public/login.html:6
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:69
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:58
 msgid "Login"
 msgstr ""
 
@@ -230,49 +184,47 @@ msgstr ""
 msgid "Invalid or expired activation link."
 msgstr ""
 
-#: allianceauth/authentication/views.py:118
+#: allianceauth/authentication/views.py:77
 #, python-format
 msgid ""
 "Cannot change main character to %(char)s: character owned by a different "
 "account."
 msgstr ""
 
-#: allianceauth/authentication/views.py:124
+#: allianceauth/authentication/views.py:83
 #, python-format
 msgid "Changed main character to %(char)s"
 msgstr ""
 
-#: allianceauth/authentication/views.py:133
+#: allianceauth/authentication/views.py:92
 #, python-format
 msgid "Added %(name)s to your account."
 msgstr ""
 
-#: allianceauth/authentication/views.py:135
+#: allianceauth/authentication/views.py:94
 #, python-format
 msgid "Failed to add %(name)s to your account: they already have an account."
 msgstr ""
 
-#: allianceauth/authentication/views.py:178
+#: allianceauth/authentication/views.py:133
-msgid ""
+msgid "Unable to authenticate as the selected character."
-"Unable to authenticate as the selected character. Please log in with the "
-"main character associated with this account."
 msgstr ""
 
-#: allianceauth/authentication/views.py:244
+#: allianceauth/authentication/views.py:197
 msgid "Registration token has expired."
 msgstr ""
 
-#: allianceauth/authentication/views.py:302
+#: allianceauth/authentication/views.py:252
 msgid ""
 "Sent confirmation email. Please follow the link to confirm your email "
 "address."
 msgstr ""
 
-#: allianceauth/authentication/views.py:307
+#: allianceauth/authentication/views.py:257
 msgid "Confirmed your email address. Please login to continue."
 msgstr ""
 
-#: allianceauth/authentication/views.py:312
+#: allianceauth/authentication/views.py:262
 msgid "Registration of new accounts is not allowed at this time."
 msgstr ""
 
@@ -315,6 +267,19 @@ msgstr ""
 msgid "Last update:"
 msgstr ""
 
+#: allianceauth/corputils/templates/corputils/corpstats.html:74
+#: allianceauth/corputils/templates/corputils/corpstats.html:112
+#: allianceauth/corputils/templates/corputils/corpstats.html:156
+#: allianceauth/corputils/templates/corputils/search.html:13
+#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html:22
+#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:26
+#: allianceauth/groupmanagement/templates/groupmanagement/audit.html:30
+#: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:29
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:55
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:112
+msgid "Character"
+msgstr ""
+
 #: allianceauth/corputils/templates/corputils/corpstats.html:75
 #: allianceauth/corputils/templates/corputils/search.html:14
 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:31
@@ -646,41 +611,36 @@ msgstr ""
 msgid "Group Management"
 msgstr ""
 
-#: allianceauth/groupmanagement/forms.py:18
+#: allianceauth/groupmanagement/forms.py:15
-#: allianceauth/permissions_tool/templates/permissions_tool/overview.html:35
-msgid "Users"
-msgstr ""
-
-#: allianceauth/groupmanagement/forms.py:52
 msgid "This name has been reserved and can not be used for groups."
 msgstr ""
 
-#: allianceauth/groupmanagement/forms.py:62
+#: allianceauth/groupmanagement/forms.py:25
 msgid "(auto)"
 msgstr ""
 
-#: allianceauth/groupmanagement/forms.py:71
+#: allianceauth/groupmanagement/forms.py:34
 msgid "There already exists a group with that name."
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:104
+#: allianceauth/groupmanagement/models.py:105
 msgid ""
 "Internal group, users cannot see, join or request to join this group."
 "<br>Used for groups such as Members, Corp_*, Alliance_* etc.<br><b>Overrides "
 "Hidden and Open options when selected.</b>"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:112
+#: allianceauth/groupmanagement/models.py:113
 msgid "Group is hidden from users but can still join with the correct link."
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:118
+#: allianceauth/groupmanagement/models.py:119
 msgid ""
 "Group is open and users will be automatically added upon request.<br>If the "
 "group is not open users will need their request manually approved."
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:125
+#: allianceauth/groupmanagement/models.py:126
 msgid ""
 "Group is public. Any registered user is able to join this group, with "
 "visibility based on the other options set for this group.<br>Auth will not "
@@ -688,65 +648,65 @@ msgid ""
 "authenticated."
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:134
+#: allianceauth/groupmanagement/models.py:135
 msgid ""
 "Group is restricted. This means that adding or removing users for this group "
 "requires a superuser admin."
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:143
+#: allianceauth/groupmanagement/models.py:144
 msgid ""
 "Group leaders can process requests for this group. Use the <code>auth."
 "group_management</code> permission to allow a user to manage all groups.<br>"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:153
+#: allianceauth/groupmanagement/models.py:154
 msgid ""
 "Members of leader groups can process requests for this group. Use the "
 "<code>auth.group_management</code> permission to allow a user to manage all "
 "groups.<br>"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:162
+#: allianceauth/groupmanagement/models.py:163
 msgid ""
 "States listed here will have the ability to join this group provided they "
 "have the proper permissions.<br>"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:170
+#: allianceauth/groupmanagement/models.py:171
 msgid ""
 "Short description <i>(max. 512 characters)</i> of the group shown to users."
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:177
+#: allianceauth/groupmanagement/models.py:178
 msgid "Can request non-public groups"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:208
+#: allianceauth/groupmanagement/models.py:209
 msgid "name"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:211
+#: allianceauth/groupmanagement/models.py:212
 msgid "Name that can not be used for groups."
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:214
+#: allianceauth/groupmanagement/models.py:215
 msgid "reason"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:214
+#: allianceauth/groupmanagement/models.py:215
 msgid "Reason why this name is reserved."
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:217
+#: allianceauth/groupmanagement/models.py:218
 msgid "created by"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:222
+#: allianceauth/groupmanagement/models.py:223
 msgid "created at"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:222
+#: allianceauth/groupmanagement/models.py:223
 msgid "Date when this entry was created"
 msgstr ""
 
@@ -973,86 +933,86 @@ msgstr ""
 msgid "Group Membership"
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:166
+#: allianceauth/groupmanagement/views.py:163
 #, python-format
 msgid "Removed user %(user)s from group %(group)s."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:168
+#: allianceauth/groupmanagement/views.py:165
 msgid "User does not exist in that group"
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:171
+#: allianceauth/groupmanagement/views.py:168
 msgid "Group does not exist"
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:198
+#: allianceauth/groupmanagement/views.py:195
 #, python-format
 msgid "Accepted application from %(mainchar)s to %(group)s."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:204
+#: allianceauth/groupmanagement/views.py:201
-#: allianceauth/groupmanagement/views.py:235
+#: allianceauth/groupmanagement/views.py:232
 #, python-format
 msgid ""
 "An unhandled error occurred while processing the application from "
 "%(mainchar)s to %(group)s."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:229
+#: allianceauth/groupmanagement/views.py:226
 #, python-format
 msgid "Rejected application from %(mainchar)s to %(group)s."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:264
+#: allianceauth/groupmanagement/views.py:261
 #, python-format
 msgid "Accepted application from %(mainchar)s to leave %(group)s."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:269
+#: allianceauth/groupmanagement/views.py:266
-#: allianceauth/groupmanagement/views.py:301
+#: allianceauth/groupmanagement/views.py:298
 #, python-format
 msgid ""
 "An unhandled error occurred while processing the application from "
 "%(mainchar)s to leave %(group)s."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:295
+#: allianceauth/groupmanagement/views.py:292
 #, python-format
 msgid "Rejected application from %(mainchar)s to leave %(group)s."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:339
+#: allianceauth/groupmanagement/views.py:336
-#: allianceauth/groupmanagement/views.py:349
+#: allianceauth/groupmanagement/views.py:346
 msgid "You cannot join that group"
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:344
+#: allianceauth/groupmanagement/views.py:341
 msgid "You are already a member of that group."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:361
+#: allianceauth/groupmanagement/views.py:358
 msgid "You already have a pending application for that group."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:370
+#: allianceauth/groupmanagement/views.py:367
 #, python-format
 msgid "Applied to group %(group)s."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:380
+#: allianceauth/groupmanagement/views.py:377
 msgid "You cannot leave that group"
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:384
+#: allianceauth/groupmanagement/views.py:381
 msgid "You are not a member of that group"
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:396
+#: allianceauth/groupmanagement/views.py:393
 msgid "You already have a pending leave request for that group."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:412
+#: allianceauth/groupmanagement/views.py:409
 #, python-format
 msgid "Applied to leave group %(group)s."
 msgstr ""
@@ -1114,6 +1074,16 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
+#: allianceauth/hrapplications/templates/hrapplications/management.html:28
+#: allianceauth/hrapplications/templates/hrapplications/management.html:83
+#: allianceauth/hrapplications/templates/hrapplications/management.html:127
+#: allianceauth/hrapplications/templates/hrapplications/searchview.html:27
+#: allianceauth/hrapplications/templates/hrapplications/view.html:73
+#: allianceauth/srp/templates/srp/data.html:101
+#: allianceauth/srp/templates/srp/management.html:44
+msgid "Actions"
+msgstr ""
+
 #: allianceauth/hrapplications/templates/hrapplications/management.html:38
 #: allianceauth/hrapplications/templates/hrapplications/management.html:99
 #: allianceauth/hrapplications/templates/hrapplications/management.html:143
@@ -1452,6 +1422,10 @@ msgstr ""
 msgid "Code Name"
 msgstr ""
 
+#: allianceauth/permissions_tool/templates/permissions_tool/overview.html:35
+msgid "Users"
+msgstr ""
+
 #: allianceauth/permissions_tool/templates/permissions_tool/overview.html:41
 msgid "States"
 msgstr ""
@@ -2172,11 +2146,11 @@ msgid ""
 msgstr ""
 
 #: allianceauth/templates/allianceauth/admin-status/overview.html:95
-msgid "running"
+#, python-format
-msgstr ""
+msgid ""
-
+"\n"
-#: allianceauth/templates/allianceauth/admin-status/overview.html:96
+"                        %(queue_length)s queued tasks\n"
-msgid "queued"
+"                        "
 msgstr ""
 
 #: allianceauth/templates/allianceauth/top-menu-admin.html:9
@@ -2192,11 +2166,11 @@ msgid "AA Support Discord"
 msgstr ""
 
 #: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:10
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:16
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:14
 msgid "User Menu"
 msgstr ""
 
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:67
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:56
 msgid "Logout"
 msgstr ""
 
@@ -2252,30 +2226,22 @@ msgid "Objective"
 msgstr ""
 
 #: allianceauth/timerboard/form.py:64
-msgid "Absolute Timer"
-msgstr ""
-
-#: allianceauth/timerboard/form.py:65
-msgid "Date and Time"
-msgstr ""
-
-#: allianceauth/timerboard/form.py:66
 msgid "Days Remaining"
 msgstr ""
 
-#: allianceauth/timerboard/form.py:67
+#: allianceauth/timerboard/form.py:65
 msgid "Hours Remaining"
 msgstr ""
 
-#: allianceauth/timerboard/form.py:69
+#: allianceauth/timerboard/form.py:67
 msgid "Minutes Remaining"
 msgstr ""
 
-#: allianceauth/timerboard/form.py:71
+#: allianceauth/timerboard/form.py:69
 msgid "Important"
 msgstr ""
 
-#: allianceauth/timerboard/form.py:72
+#: allianceauth/timerboard/form.py:70
 msgid "Corp-Restricted"
 msgstr ""
 

allianceauth/locale/es/LC_MESSAGES/django.po

@@ -4,10 +4,10 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Fegpawn Kaundur, 2023
+# frank1210 <francolopez_16@hotmail.com>, 2021
-# frank1210 <francolopez_16@hotmail.com>, 2023
+# Joel Falknau <ozirascal@gmail.com>, 2021
 # Young Anexo, 2023
-# Joel Falknau <ozirascal@gmail.com>, 2023
+# Fegpawn Kaundur, 2023
 # trenus, 2023
 # 
 #, fuzzy
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-17 18:50+1000\n"
+"POT-Creation-Date: 2022-10-09 18:20+1000\n"
-"PO-Revision-Date: 2023-11-08 13:50+0000\n"
+"PO-Revision-Date: 2020-02-18 03:14+0000\n"
 "Last-Translator: trenus, 2023\n"
 "Language-Team: Spanish (https://app.transifex.com/alliance-auth/teams/107430/es/)\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr "Google Analytics Universal"
 msgid "Google Analytics V4"
 msgstr "Google Analytics V4"
 
-#: allianceauth/authentication/decorators.py:49
+#: allianceauth/authentication/decorators.py:37
 msgid "A main character is required to perform that action. Add one below."
 msgstr ""
 "Se necesita un personaje principal para realizar esa acción. Añade uno a "
@@ -48,68 +48,63 @@ msgstr "E-mail"
 msgid "You are not allowed to add or remove these restricted groups: %s"
 msgstr "No puedes añadir o eliminar estos grupos restringidos: %s"
 
-#: allianceauth/authentication/models.py:71
+#: allianceauth/authentication/models.py:80
 msgid "English"
 msgstr "Inglés"
 
-#: allianceauth/authentication/models.py:72
+#: allianceauth/authentication/models.py:81
 msgid "German"
 msgstr "Alemán"
 
-#: allianceauth/authentication/models.py:73
+#: allianceauth/authentication/models.py:82
 msgid "Spanish"
 msgstr "Español"
 
-#: allianceauth/authentication/models.py:74
+#: allianceauth/authentication/models.py:83
 msgid "Chinese Simplified"
 msgstr "Chino Simplificado"
 
-#: allianceauth/authentication/models.py:75
+#: allianceauth/authentication/models.py:84
 msgid "Russian"
 msgstr "Ruso"
 
-#: allianceauth/authentication/models.py:76
+#: allianceauth/authentication/models.py:85
 msgid "Korean"
 msgstr "Coreano"
 
-#: allianceauth/authentication/models.py:77
+#: allianceauth/authentication/models.py:86
 msgid "French"
 msgstr "Francés"
 
-#: allianceauth/authentication/models.py:78
+#: allianceauth/authentication/models.py:87
 msgid "Japanese"
 msgstr "Japonés"
 
-#: allianceauth/authentication/models.py:79
+#: allianceauth/authentication/models.py:88
 msgid "Italian"
 msgstr "Italiano"
 
-#: allianceauth/authentication/models.py:80
+#: allianceauth/authentication/models.py:91
-msgid "Ukrainian"
-msgstr ""
-
-#: allianceauth/authentication/models.py:96
 msgid "Language"
 msgstr "Idioma"
 
-#: allianceauth/authentication/models.py:101
+#: allianceauth/authentication/models.py:96
 #: allianceauth/templates/allianceauth/night-toggle.html:6
 msgid "Night Mode"
 msgstr "Modo Nocturno"
 
-#: allianceauth/authentication/models.py:115
+#: allianceauth/authentication/models.py:110
 #, python-format
 msgid "State changed to: %s"
 msgstr "Estado cambiado a: %s"
 
-#: allianceauth/authentication/models.py:116
+#: allianceauth/authentication/models.py:111
 #, python-format
 msgid "Your user's state is now: %(state)s"
 msgstr "El estado de su usuario es ahora: %(state)s"
 
 #: allianceauth/authentication/templates/authentication/dashboard.html:4
 #: allianceauth/authentication/templates/authentication/dashboard.html:7
-#: allianceauth/authentication/templates/authentication/tokens.html:4
 #: allianceauth/templates/allianceauth/side-menu.html:10
 msgid "Dashboard"
 msgstr "Página principal"
@@ -167,50 +162,8 @@ msgstr "Corporación"
 msgid "Alliance"
 msgstr "Allianza"
 
-#: allianceauth/authentication/templates/authentication/tokens.html:7
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:62
-msgid "Token Management"
-msgstr ""
-
-#: allianceauth/authentication/templates/authentication/tokens.html:12
-msgid "Scopes"
-msgstr ""
-
-#: allianceauth/authentication/templates/authentication/tokens.html:13
-#: allianceauth/hrapplications/templates/hrapplications/management.html:28
-#: allianceauth/hrapplications/templates/hrapplications/management.html:83
-#: allianceauth/hrapplications/templates/hrapplications/management.html:127
-#: allianceauth/hrapplications/templates/hrapplications/searchview.html:27
-#: allianceauth/hrapplications/templates/hrapplications/view.html:73
-#: allianceauth/srp/templates/srp/data.html:101
-#: allianceauth/srp/templates/srp/management.html:44
-msgid "Actions"
-msgstr "Acciones"
-
-#: allianceauth/authentication/templates/authentication/tokens.html:14
-#: allianceauth/corputils/templates/corputils/corpstats.html:74
-#: allianceauth/corputils/templates/corputils/corpstats.html:112
-#: allianceauth/corputils/templates/corputils/corpstats.html:156
-#: allianceauth/corputils/templates/corputils/search.html:13
-#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html:22
-#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:26
-#: allianceauth/groupmanagement/templates/groupmanagement/audit.html:30
-#: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:29
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:55
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:112
-msgid "Character"
-msgstr "Personaje"
-
-#: allianceauth/authentication/templates/authentication/tokens.html:28
-msgid ""
-"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."
-msgstr ""
-
 #: allianceauth/authentication/templates/public/login.html:6
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:69
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:58
 msgid "Login"
 msgstr "Ingresar"
 
@@ -244,7 +197,7 @@ msgstr "Registrar"
 msgid "Invalid or expired activation link."
 msgstr "Enlace de activacion expirado o invalido"
 
-#: allianceauth/authentication/views.py:118
+#: allianceauth/authentication/views.py:77
 #, python-format
 msgid ""
 "Cannot change main character to %(char)s: character owned by a different "
@@ -253,47 +206,45 @@ msgstr ""
 "No se puede cambiar de personaje principal a %(char)s: personaje "
 "perteneciente a otra cuenta."
 
-#: allianceauth/authentication/views.py:124
+#: allianceauth/authentication/views.py:83
 #, python-format
 msgid "Changed main character to %(char)s"
 msgstr "Se ha cambiado tu personaje principal ha %(char)s"
 
-#: allianceauth/authentication/views.py:133
+#: allianceauth/authentication/views.py:92
 #, python-format
 msgid "Added %(name)s to your account."
 msgstr "Se ha agregado a %(name)s a tu cuenta"
 
-#: allianceauth/authentication/views.py:135
+#: allianceauth/authentication/views.py:94
 #, python-format
 msgid "Failed to add %(name)s to your account: they already have an account."
 msgstr ""
 "Se fallo en agregar a %(name)s a tu cuenta: Ya se encuentra registrado en "
 "otra cuenta."
 
-#: allianceauth/authentication/views.py:178
+#: allianceauth/authentication/views.py:133
-msgid ""
+msgid "Unable to authenticate as the selected character."
-"Unable to authenticate as the selected character. Please log in with the "
+msgstr "Imposible validar con el personaje seleccionado."
-"main character associated with this account."
-msgstr ""
 
-#: allianceauth/authentication/views.py:244
+#: allianceauth/authentication/views.py:197
 msgid "Registration token has expired."
 msgstr "El token de registracion expiro."
 
-#: allianceauth/authentication/views.py:302
+#: allianceauth/authentication/views.py:252
 msgid ""
 "Sent confirmation email. Please follow the link to confirm your email "
 "address."
 msgstr ""
 "Confirmacion de mail enviada. Por favor siga el enlace para confirmar "
 
-#: allianceauth/authentication/views.py:307
+#: allianceauth/authentication/views.py:257
 msgid "Confirmed your email address. Please login to continue."
 msgstr ""
 "Se ha confirmado su direccion de mail. Por favor igrese su token para "
 "continuar."
 
-#: allianceauth/authentication/views.py:312
+#: allianceauth/authentication/views.py:262
 msgid "Registration of new accounts is not allowed at this time."
 msgstr "En este momento no se permite el registro de nuevas cuentas."
 
@@ -336,6 +287,19 @@ msgstr "Sin registro"
 msgid "Last update:"
 msgstr "Ultima Actualizacion:"
 
+#: allianceauth/corputils/templates/corputils/corpstats.html:74
+#: allianceauth/corputils/templates/corputils/corpstats.html:112
+#: allianceauth/corputils/templates/corputils/corpstats.html:156
+#: allianceauth/corputils/templates/corputils/search.html:13
+#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html:22
+#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:26
+#: allianceauth/groupmanagement/templates/groupmanagement/audit.html:30
+#: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:29
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:55
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:112
+msgid "Character"
+msgstr "Personaje"
+
 #: allianceauth/corputils/templates/corputils/corpstats.html:75
 #: allianceauth/corputils/templates/corputils/search.html:14
 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:31
@@ -672,24 +636,19 @@ msgstr ""
 msgid "Group Management"
 msgstr "Manejo de Grupo"
 
-#: allianceauth/groupmanagement/forms.py:18
+#: allianceauth/groupmanagement/forms.py:15
-#: allianceauth/permissions_tool/templates/permissions_tool/overview.html:35
-msgid "Users"
-msgstr "Usuarios"
-
-#: allianceauth/groupmanagement/forms.py:52
 msgid "This name has been reserved and can not be used for groups."
 msgstr "Este nombre ha sido reservado y no puede utilizarse para grupos."
 
-#: allianceauth/groupmanagement/forms.py:62
+#: allianceauth/groupmanagement/forms.py:25
 msgid "(auto)"
 msgstr "(auto)"
 
-#: allianceauth/groupmanagement/forms.py:71
+#: allianceauth/groupmanagement/forms.py:34
 msgid "There already exists a group with that name."
 msgstr "Ya existe un grupo con ese nombre."
 
-#: allianceauth/groupmanagement/models.py:104
+#: allianceauth/groupmanagement/models.py:105
 msgid ""
 "Internal group, users cannot see, join or request to join this "
 "group.<br>Used for groups such as Members, Corp_*, Alliance_* "
@@ -699,13 +658,13 @@ msgstr ""
 "grupo.<br>Se utiliza para grupos como Miembros, Corp_*, Alliance_*, "
 "etc.<br><b>Anula las opciones Oculto y Abierto cuando se selecciona.</b>"
 
-#: allianceauth/groupmanagement/models.py:112
+#: allianceauth/groupmanagement/models.py:113
 msgid "Group is hidden from users but can still join with the correct link."
 msgstr ""
 "El grupo está oculto para los usuarios, pero aún pueden unirse con el enlace"
 " correcto."
 
-#: allianceauth/groupmanagement/models.py:118
+#: allianceauth/groupmanagement/models.py:119
 msgid ""
 "Group is open and users will be automatically added upon request.<br>If the "
 "group is not open users will need their request manually approved."
@@ -714,7 +673,7 @@ msgstr ""
 "soliciten.<br>Si el grupo no está abierto, los usuarios necesitarán que su "
 "solicitud sea aprobada manualmente."
 
-#: allianceauth/groupmanagement/models.py:125
+#: allianceauth/groupmanagement/models.py:126
 msgid ""
 "Group is public. Any registered user is able to join this group, with "
 "visibility based on the other options set for this group.<br>Auth will not "
@@ -726,7 +685,7 @@ msgstr ""
 "grupo.<br>Auth no eliminará automáticamente a los usuarios de este grupo "
 "cuando ya no estén autenticados."
 
-#: allianceauth/groupmanagement/models.py:134
+#: allianceauth/groupmanagement/models.py:135
 msgid ""
 "Group is restricted. This means that adding or removing users for this group"
 " requires a superuser admin."
@@ -734,7 +693,7 @@ msgstr ""
 "El grupo está restringido. Esto significa que para añadir o eliminar "
 "usuarios de este grupo se requiere un superusuario administrador."
 
-#: allianceauth/groupmanagement/models.py:143
+#: allianceauth/groupmanagement/models.py:144
 msgid ""
 "Group leaders can process requests for this group. Use the "
 "<code>auth.group_management</code> permission to allow a user to manage all "
@@ -744,7 +703,7 @@ msgstr ""
 " permiso <code>auth.group_management</code> para permitir que un usuario "
 "gestione todos los grupos.<br>"
 
-#: allianceauth/groupmanagement/models.py:153
+#: allianceauth/groupmanagement/models.py:154
 msgid ""
 "Members of leader groups can process requests for this group. Use the "
 "<code>auth.group_management</code> permission to allow a user to manage all "
@@ -754,7 +713,7 @@ msgstr ""
 "grupo. Utilice el <code>permiso auth.group_management</code> para permitir "
 "que un usuario gestione todos los grupos.<br>"
 
-#: allianceauth/groupmanagement/models.py:162
+#: allianceauth/groupmanagement/models.py:163
 msgid ""
 "States listed here will have the ability to join this group provided they "
 "have the proper permissions.<br>"
@@ -762,42 +721,42 @@ msgstr ""
 "Los estados que figuren en esta lista podrán unirse a este grupo siempre que"
 " dispongan de los permisos adecuados.<br>"
 
-#: allianceauth/groupmanagement/models.py:170
+#: allianceauth/groupmanagement/models.py:171
 msgid ""
 "Short description <i>(max. 512 characters)</i> of the group shown to users."
 msgstr ""
 "Breve descripción <i>(máx. 512 caracteres)</i> del grupo que se muestra a "
 "los usuarios."
 
-#: allianceauth/groupmanagement/models.py:177
+#: allianceauth/groupmanagement/models.py:178
 msgid "Can request non-public groups"
 msgstr "Se pueden solicitar grupos no públicos"
 
-#: allianceauth/groupmanagement/models.py:208
+#: allianceauth/groupmanagement/models.py:209
 msgid "name"
 msgstr "nombre"
 
-#: allianceauth/groupmanagement/models.py:211
+#: allianceauth/groupmanagement/models.py:212
 msgid "Name that can not be used for groups."
 msgstr "Nombre que no se puede utilizar para los grupos."
 
-#: allianceauth/groupmanagement/models.py:214
+#: allianceauth/groupmanagement/models.py:215
 msgid "reason"
 msgstr "razón"
 
-#: allianceauth/groupmanagement/models.py:214
+#: allianceauth/groupmanagement/models.py:215
 msgid "Reason why this name is reserved."
 msgstr "Razón por la que este nombre está reservado."
 
-#: allianceauth/groupmanagement/models.py:217
+#: allianceauth/groupmanagement/models.py:218
 msgid "created by"
 msgstr "creado por"
 
-#: allianceauth/groupmanagement/models.py:222
+#: allianceauth/groupmanagement/models.py:223
 msgid "created at"
 msgstr "creado en"
 
-#: allianceauth/groupmanagement/models.py:222
+#: allianceauth/groupmanagement/models.py:223
 msgid "Date when this entry was created"
 msgstr "Fecha de creación de esta entrada"
 
@@ -1024,26 +983,26 @@ msgstr "Solicitudes de Grupo"
 msgid "Group Membership"
 msgstr "Membresia de Grupo"
 
-#: allianceauth/groupmanagement/views.py:166
+#: allianceauth/groupmanagement/views.py:163
 #, python-format
 msgid "Removed user %(user)s from group %(group)s."
 msgstr "El usuario %(user)s fue removido del grupo %(group)s"
 
-#: allianceauth/groupmanagement/views.py:168
+#: allianceauth/groupmanagement/views.py:165
 msgid "User does not exist in that group"
 msgstr "El usuario no existe en ese grupos"
 
-#: allianceauth/groupmanagement/views.py:171
+#: allianceauth/groupmanagement/views.py:168
 msgid "Group does not exist"
 msgstr "El grupo no existe"
 
-#: allianceauth/groupmanagement/views.py:198
+#: allianceauth/groupmanagement/views.py:195
 #, python-format
 msgid "Accepted application from %(mainchar)s to %(group)s."
 msgstr "Solicitud aceptada de %(mainchar)s a %(group)s"
 
-#: allianceauth/groupmanagement/views.py:204
+#: allianceauth/groupmanagement/views.py:201
-#: allianceauth/groupmanagement/views.py:235
+#: allianceauth/groupmanagement/views.py:232
 #, python-format
 msgid ""
 "An unhandled error occurred while processing the application from "
@@ -1052,18 +1011,18 @@ msgstr ""
 "Ocurrio un error cuando se intento procesar la informacion de %(mainchar)s "
 "al grupo %(group)s."
 
-#: allianceauth/groupmanagement/views.py:229
+#: allianceauth/groupmanagement/views.py:226
 #, python-format
 msgid "Rejected application from %(mainchar)s to %(group)s."
 msgstr "Se rechazo la solicitud de %(mainchar)s al grupo %(group)s."
 
-#: allianceauth/groupmanagement/views.py:264
+#: allianceauth/groupmanagement/views.py:261
 #, python-format
 msgid "Accepted application from %(mainchar)s to leave %(group)s."
 msgstr "Se acepto la solicitud de %(mainchar)s para dejar el grupo %(group)s."
 
-#: allianceauth/groupmanagement/views.py:269
+#: allianceauth/groupmanagement/views.py:266
-#: allianceauth/groupmanagement/views.py:301
+#: allianceauth/groupmanagement/views.py:298
 #, python-format
 msgid ""
 "An unhandled error occurred while processing the application from "
@@ -1072,43 +1031,43 @@ msgstr ""
 "Se ha producido un error al procesar la solicitud de %(mainchar)s para "
 "abandonar %(group)s."
 
-#: allianceauth/groupmanagement/views.py:295
+#: allianceauth/groupmanagement/views.py:292
 #, python-format
 msgid "Rejected application from %(mainchar)s to leave %(group)s."
 msgstr ""
 "Se rechazo la solicitud de %(mainchar)s para dejar el grupo %(group)s."
 
-#: allianceauth/groupmanagement/views.py:339
+#: allianceauth/groupmanagement/views.py:336
-#: allianceauth/groupmanagement/views.py:349
+#: allianceauth/groupmanagement/views.py:346
 msgid "You cannot join that group"
 msgstr "No puedes unirte a ese grupo"
 
-#: allianceauth/groupmanagement/views.py:344
+#: allianceauth/groupmanagement/views.py:341
 msgid "You are already a member of that group."
 msgstr "Ya eres miembro de ese grupo."
 
-#: allianceauth/groupmanagement/views.py:361
+#: allianceauth/groupmanagement/views.py:358
 msgid "You already have a pending application for that group."
 msgstr "Ya tiene una solicitud pendiente para ese grupo."
 
-#: allianceauth/groupmanagement/views.py:370
+#: allianceauth/groupmanagement/views.py:367
 #, python-format
 msgid "Applied to group %(group)s."
 msgstr "Solicitud enviada al grupo %(group)s."
 
-#: allianceauth/groupmanagement/views.py:380
+#: allianceauth/groupmanagement/views.py:377
 msgid "You cannot leave that group"
 msgstr "No puedes dejar el grupos"
 
-#: allianceauth/groupmanagement/views.py:384
+#: allianceauth/groupmanagement/views.py:381
 msgid "You are not a member of that group"
 msgstr "No eres miembro de ese grupo"
 
-#: allianceauth/groupmanagement/views.py:396
+#: allianceauth/groupmanagement/views.py:393
 msgid "You already have a pending leave request for that group."
 msgstr "Ya tiene una solicitud de baja pendiente para ese grupo."
 
-#: allianceauth/groupmanagement/views.py:412
+#: allianceauth/groupmanagement/views.py:409
 #, python-format
 msgid "Applied to leave group %(group)s."
 msgstr "Solicitaste dejar el grupo %(group)s."
@@ -1170,6 +1129,16 @@ msgstr "Crear Solicitud"
 msgid "Username"
 msgstr "Usuario"
 
+#: allianceauth/hrapplications/templates/hrapplications/management.html:28
+#: allianceauth/hrapplications/templates/hrapplications/management.html:83
+#: allianceauth/hrapplications/templates/hrapplications/management.html:127
+#: allianceauth/hrapplications/templates/hrapplications/searchview.html:27
+#: allianceauth/hrapplications/templates/hrapplications/view.html:73
+#: allianceauth/srp/templates/srp/data.html:101
+#: allianceauth/srp/templates/srp/management.html:44
+msgid "Actions"
+msgstr "Acciones"
+
 #: allianceauth/hrapplications/templates/hrapplications/management.html:38
 #: allianceauth/hrapplications/templates/hrapplications/management.html:99
 #: allianceauth/hrapplications/templates/hrapplications/management.html:143
@@ -1508,6 +1477,10 @@ msgstr "Modelo"
 msgid "Code Name"
 msgstr "Nombre codigo"
 
+#: allianceauth/permissions_tool/templates/permissions_tool/overview.html:35
+msgid "Users"
+msgstr "Usuarios"
+
 #: allianceauth/permissions_tool/templates/permissions_tool/overview.html:41
 msgid "States"
 msgstr "Estados"
@@ -2246,12 +2219,14 @@ msgstr ""
 "Estado de %(total)s tareas procesadas • últimos %(latest)s"
 
 #: allianceauth/templates/allianceauth/admin-status/overview.html:95
-msgid "running"
+#, python-format
-msgstr ""
+msgid ""
-
+"\n"
-#: allianceauth/templates/allianceauth/admin-status/overview.html:96
+"                        %(queue_length)s queued tasks\n"
-msgid "queued"
+"                        "
 msgstr ""
+"\n"
+"%(queue_length)s tareas en cola"
 
 #: allianceauth/templates/allianceauth/top-menu-admin.html:9
 msgid "Admin"
@@ -2266,11 +2241,11 @@ msgid "AA Support Discord"
 msgstr "Soporte Discord AA"
 
 #: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:10
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:16
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:14
 msgid "User Menu"
 msgstr "Menú de usuario"
 
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:67
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:56
 msgid "Logout"
 msgstr "Salir"
 
@@ -2326,30 +2301,22 @@ msgid "Objective"
 msgstr "Objetivo"
 
 #: allianceauth/timerboard/form.py:64
-msgid "Absolute Timer"
-msgstr ""
-
-#: allianceauth/timerboard/form.py:65
-msgid "Date and Time"
-msgstr ""
-
-#: allianceauth/timerboard/form.py:66
 msgid "Days Remaining"
 msgstr "Dias restantes"
 
-#: allianceauth/timerboard/form.py:67
+#: allianceauth/timerboard/form.py:65
 msgid "Hours Remaining"
 msgstr "Horas Restantes"
 
-#: allianceauth/timerboard/form.py:69
+#: allianceauth/timerboard/form.py:67
 msgid "Minutes Remaining"
 msgstr "Minutos Restantes"
 
-#: allianceauth/timerboard/form.py:71
+#: allianceauth/timerboard/form.py:69
 msgid "Important"
 msgstr "Importante"
 
-#: allianceauth/timerboard/form.py:72
+#: allianceauth/timerboard/form.py:70
 msgid "Corp-Restricted"
 msgstr "Restringido a Corp"
 

allianceauth/locale/fr_FR/LC_MESSAGES/django.po

@@ -4,23 +4,23 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Mickael Gr4vity, 2023
+# François LACROIX-DURANT <umbre@fallenstarscreations.com>, 2020
-# Idea ., 2023
+# Philippe Querin-Laporte <philippe.querin@hotmail.com>, 2020
-# rockclodbuster, 2023
+# Keven D. <theenarki@gmail.com>, 2020
-# Keven D. <theenarki@gmail.com>, 2023
+# Idea ., 2021
+# Mickael PATTE, 2021
+# Geoffrey Fabbro, 2021
 # Mohssine Daghghar, 2023
-# Philippe Querin-Laporte <philippe.querin@hotmail.com>, 2023
+# Ludovick Fortin, 2023
-# draktanar KarazGrong <umbre@fallenstarscreations.com>, 2023
-# Geoffrey Fabbro, 2023
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-17 18:50+1000\n"
+"POT-Creation-Date: 2022-10-09 18:20+1000\n"
-"PO-Revision-Date: 2023-11-08 13:50+0000\n"
+"PO-Revision-Date: 2020-02-18 03:14+0000\n"
-"Last-Translator: Geoffrey Fabbro, 2023\n"
+"Last-Translator: Ludovick Fortin, 2023\n"
 "Language-Team: French (France) (https://app.transifex.com/alliance-auth/teams/107430/fr_FR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,7 +36,7 @@ msgstr "Google Analytique Universelle"
 msgid "Google Analytics V4"
 msgstr "Google Analytics V4"
 
-#: allianceauth/authentication/decorators.py:49
+#: allianceauth/authentication/decorators.py:37
 msgid "A main character is required to perform that action. Add one below."
 msgstr ""
 "Un personnage principal est nécessaire pour effectuer cette action. Ajoutez-"
@@ -53,68 +53,63 @@ msgstr ""
 "Vous n'avez pas l’autorisation d'ajouter ou d'enlever ces groupes "
 "restreints: %s"
 
-#: allianceauth/authentication/models.py:71
+#: allianceauth/authentication/models.py:80
 msgid "English"
 msgstr "Anglais"
 
-#: allianceauth/authentication/models.py:72
+#: allianceauth/authentication/models.py:81
 msgid "German"
 msgstr "Allemand"
 
-#: allianceauth/authentication/models.py:73
+#: allianceauth/authentication/models.py:82
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: allianceauth/authentication/models.py:74
+#: allianceauth/authentication/models.py:83
 msgid "Chinese Simplified"
 msgstr "Chinois simplifié"
 
-#: allianceauth/authentication/models.py:75
+#: allianceauth/authentication/models.py:84
 msgid "Russian"
 msgstr "Russe"
 
-#: allianceauth/authentication/models.py:76
+#: allianceauth/authentication/models.py:85
 msgid "Korean"
 msgstr "Coréen"
 
-#: allianceauth/authentication/models.py:77
+#: allianceauth/authentication/models.py:86
 msgid "French"
 msgstr "Français"
 
-#: allianceauth/authentication/models.py:78
+#: allianceauth/authentication/models.py:87
 msgid "Japanese"
 msgstr "Japonais"
 
-#: allianceauth/authentication/models.py:79
+#: allianceauth/authentication/models.py:88
 msgid "Italian"
 msgstr "Italien"
 
-#: allianceauth/authentication/models.py:80
+#: allianceauth/authentication/models.py:91
-msgid "Ukrainian"
-msgstr ""
-
-#: allianceauth/authentication/models.py:96
 msgid "Language"
 msgstr "Langue"
 
-#: allianceauth/authentication/models.py:101
+#: allianceauth/authentication/models.py:96
 #: allianceauth/templates/allianceauth/night-toggle.html:6
 msgid "Night Mode"
 msgstr "Mode Nuit"
 
-#: allianceauth/authentication/models.py:115
+#: allianceauth/authentication/models.py:110
 #, python-format
 msgid "State changed to: %s"
 msgstr "État changé à: %s"
 
-#: allianceauth/authentication/models.py:116
+#: allianceauth/authentication/models.py:111
 #, python-format
 msgid "Your user's state is now: %(state)s"
 msgstr "L'état de votre personnage est maintenant: %(state)s"
 
 #: allianceauth/authentication/templates/authentication/dashboard.html:4
 #: allianceauth/authentication/templates/authentication/dashboard.html:7
-#: allianceauth/authentication/templates/authentication/tokens.html:4
 #: allianceauth/templates/allianceauth/side-menu.html:10
 msgid "Dashboard"
 msgstr "Écran de bord"
@@ -172,50 +167,8 @@ msgstr "Corpo"
 msgid "Alliance"
 msgstr "Alliance"
 
-#: allianceauth/authentication/templates/authentication/tokens.html:7
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:62
-msgid "Token Management"
-msgstr ""
-
-#: allianceauth/authentication/templates/authentication/tokens.html:12
-msgid "Scopes"
-msgstr ""
-
-#: allianceauth/authentication/templates/authentication/tokens.html:13
-#: allianceauth/hrapplications/templates/hrapplications/management.html:28
-#: allianceauth/hrapplications/templates/hrapplications/management.html:83
-#: allianceauth/hrapplications/templates/hrapplications/management.html:127
-#: allianceauth/hrapplications/templates/hrapplications/searchview.html:27
-#: allianceauth/hrapplications/templates/hrapplications/view.html:73
-#: allianceauth/srp/templates/srp/data.html:101
-#: allianceauth/srp/templates/srp/management.html:44
-msgid "Actions"
-msgstr "Actions"
-
-#: allianceauth/authentication/templates/authentication/tokens.html:14
-#: allianceauth/corputils/templates/corputils/corpstats.html:74
-#: allianceauth/corputils/templates/corputils/corpstats.html:112
-#: allianceauth/corputils/templates/corputils/corpstats.html:156
-#: allianceauth/corputils/templates/corputils/search.html:13
-#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html:22
-#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:26
-#: allianceauth/groupmanagement/templates/groupmanagement/audit.html:30
-#: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:29
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:55
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:112
-msgid "Character"
-msgstr "Personnage"
-
-#: allianceauth/authentication/templates/authentication/tokens.html:28
-msgid ""
-"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."
-msgstr ""
-
 #: allianceauth/authentication/templates/public/login.html:6
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:69
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:58
 msgid "Login"
 msgstr "Connexion"
 
@@ -249,7 +202,7 @@ msgstr "S'inscrire"
 msgid "Invalid or expired activation link."
 msgstr "Lien d'activation invalide ou expiré."
 
-#: allianceauth/authentication/views.py:118
+#: allianceauth/authentication/views.py:77
 #, python-format
 msgid ""
 "Cannot change main character to %(char)s: character owned by a different "
@@ -258,32 +211,30 @@ msgstr ""
 "Impossible de changer le personnage principal à %(char)s. Le personnage "
 "appartient à un autre compte."
 
-#: allianceauth/authentication/views.py:124
+#: allianceauth/authentication/views.py:83
 #, python-format
 msgid "Changed main character to %(char)s"
 msgstr "Changé le personnage principal à %(char)s"
 
-#: allianceauth/authentication/views.py:133
+#: allianceauth/authentication/views.py:92
 #, python-format
 msgid "Added %(name)s to your account."
 msgstr "Ajouté %(name)s à votre compte."
 
-#: allianceauth/authentication/views.py:135
+#: allianceauth/authentication/views.py:94
 #, python-format
 msgid "Failed to add %(name)s to your account: they already have an account."
 msgstr "Impossible d'ajouter %(name)s à votre compte: ils ont déjà un compte."
 
-#: allianceauth/authentication/views.py:178
+#: allianceauth/authentication/views.py:133
-msgid ""
+msgid "Unable to authenticate as the selected character."
-"Unable to authenticate as the selected character. Please log in with the "
+msgstr "Personnage principal : échec de l'identification."
-"main character associated with this account."
-msgstr ""
 
-#: allianceauth/authentication/views.py:244
+#: allianceauth/authentication/views.py:197
 msgid "Registration token has expired."
 msgstr "Le token d'enregistrement est expiré."
 
-#: allianceauth/authentication/views.py:302
+#: allianceauth/authentication/views.py:252
 msgid ""
 "Sent confirmation email. Please follow the link to confirm your email "
 "address."
@@ -291,12 +242,12 @@ msgstr ""
 "Email de confirmation envoyé. Cliquez sur le lien pour valider votre adresse"
 " email."
 
-#: allianceauth/authentication/views.py:307
+#: allianceauth/authentication/views.py:257
 msgid "Confirmed your email address. Please login to continue."
 msgstr ""
 "Votre adresse email a été confirmé. Veuillez vous connecter pour continuer."
 
-#: allianceauth/authentication/views.py:312
+#: allianceauth/authentication/views.py:262
 msgid "Registration of new accounts is not allowed at this time."
 msgstr "La création de nouveaux comptes n'est pas actuellement permise."
 
@@ -339,6 +290,19 @@ msgstr "Pas inscrit"
 msgid "Last update:"
 msgstr "Dernière mise à jour:"
 
+#: allianceauth/corputils/templates/corputils/corpstats.html:74
+#: allianceauth/corputils/templates/corputils/corpstats.html:112
+#: allianceauth/corputils/templates/corputils/corpstats.html:156
+#: allianceauth/corputils/templates/corputils/search.html:13
+#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html:22
+#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:26
+#: allianceauth/groupmanagement/templates/groupmanagement/audit.html:30
+#: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:29
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:55
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:112
+msgid "Character"
+msgstr "Personnage"
+
 #: allianceauth/corputils/templates/corputils/corpstats.html:75
 #: allianceauth/corputils/templates/corputils/search.html:14
 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:31
@@ -675,24 +639,19 @@ msgstr ""
 msgid "Group Management"
 msgstr "Gestion de groupe"
 
-#: allianceauth/groupmanagement/forms.py:18
+#: allianceauth/groupmanagement/forms.py:15
-#: allianceauth/permissions_tool/templates/permissions_tool/overview.html:35
-msgid "Users"
-msgstr "Utilisateurs"
-
-#: allianceauth/groupmanagement/forms.py:52
 msgid "This name has been reserved and can not be used for groups."
 msgstr "Ce nom a été réserver et il ne peut être utilisé pour les groupes."
 
-#: allianceauth/groupmanagement/forms.py:62
+#: allianceauth/groupmanagement/forms.py:25
 msgid "(auto)"
 msgstr "(automatique)"
 
-#: allianceauth/groupmanagement/forms.py:71
+#: allianceauth/groupmanagement/forms.py:34
 msgid "There already exists a group with that name."
 msgstr "Il existe déjà un groupe portant ce nom."
 
-#: allianceauth/groupmanagement/models.py:104
+#: allianceauth/groupmanagement/models.py:105
 msgid ""
 "Internal group, users cannot see, join or request to join this "
 "group.<br>Used for groups such as Members, Corp_*, Alliance_* "
@@ -703,13 +662,13 @@ msgstr ""
 "Corporations _*, Alliance etc.<br><b> Annule les options masquer et exposer "
 "quand sélectionner."
 
-#: allianceauth/groupmanagement/models.py:112
+#: allianceauth/groupmanagement/models.py:113
 msgid "Group is hidden from users but can still join with the correct link."
 msgstr ""
 "Le groupe est caché aux utilisateurs, mais ils peuvent toujours rejoindre "
 "avec le bon lien."
 
-#: allianceauth/groupmanagement/models.py:118
+#: allianceauth/groupmanagement/models.py:119
 msgid ""
 "Group is open and users will be automatically added upon request.<br>If the "
 "group is not open users will need their request manually approved."
@@ -718,7 +677,7 @@ msgstr ""
 " demande. <br> Si le groupe n’est pas ouvert, les utilisateurs auront besoin"
 " que leurs demandes soit approuvées manuellement."
 
-#: allianceauth/groupmanagement/models.py:125
+#: allianceauth/groupmanagement/models.py:126
 msgid ""
 "Group is public. Any registered user is able to join this group, with "
 "visibility based on the other options set for this group.<br>Auth will not "
@@ -730,7 +689,7 @@ msgstr ""
 "groupe.<br> L' Auth ne supprimera pas automatiquement les utilisateurs de ce"
 " groupe lorsqu’ils ne seront plus authentifiés."
 
-#: allianceauth/groupmanagement/models.py:134
+#: allianceauth/groupmanagement/models.py:135
 msgid ""
 "Group is restricted. This means that adding or removing users for this group"
 " requires a superuser admin."
@@ -738,62 +697,62 @@ msgstr ""
 "Le groupe est restreint. Cela signifie que l’ajout ou la suppression "
 "d’utilisateurs pour ce groupe nécessite un administrateur superutilisateur."
 
-#: allianceauth/groupmanagement/models.py:143
+#: allianceauth/groupmanagement/models.py:144
 msgid ""
 "Group leaders can process requests for this group. Use the "
 "<code>auth.group_management</code> permission to allow a user to manage all "
 "groups.<br>"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:153
+#: allianceauth/groupmanagement/models.py:154
 msgid ""
 "Members of leader groups can process requests for this group. Use the "
 "<code>auth.group_management</code> permission to allow a user to manage all "
 "groups.<br>"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:162
+#: allianceauth/groupmanagement/models.py:163
 msgid ""
 "States listed here will have the ability to join this group provided they "
 "have the proper permissions.<br>"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:170
+#: allianceauth/groupmanagement/models.py:171
 msgid ""
 "Short description <i>(max. 512 characters)</i> of the group shown to users."
 msgstr ""
 "Brève description <i> (512 caractères maximum) </i> du groupe présenté aux "
 "utilisateurs."
 
-#: allianceauth/groupmanagement/models.py:177
+#: allianceauth/groupmanagement/models.py:178
 msgid "Can request non-public groups"
 msgstr "Peut demander des groupes non publics"
 
-#: allianceauth/groupmanagement/models.py:208
+#: allianceauth/groupmanagement/models.py:209
 msgid "name"
 msgstr "Nom"
 
-#: allianceauth/groupmanagement/models.py:211
+#: allianceauth/groupmanagement/models.py:212
 msgid "Name that can not be used for groups."
 msgstr "Nom qui ne peut pas être utilisé pour les groupes."
 
-#: allianceauth/groupmanagement/models.py:214
+#: allianceauth/groupmanagement/models.py:215
 msgid "reason"
 msgstr "raison"
 
-#: allianceauth/groupmanagement/models.py:214
+#: allianceauth/groupmanagement/models.py:215
 msgid "Reason why this name is reserved."
 msgstr "Raison pour laquelle ce nom est réservé."
 
-#: allianceauth/groupmanagement/models.py:217
+#: allianceauth/groupmanagement/models.py:218
 msgid "created by"
 msgstr "créé par"
 
-#: allianceauth/groupmanagement/models.py:222
+#: allianceauth/groupmanagement/models.py:223
 msgid "created at"
 msgstr "créé à"
 
-#: allianceauth/groupmanagement/models.py:222
+#: allianceauth/groupmanagement/models.py:223
 msgid "Date when this entry was created"
 msgstr "Date de création de cette entrée"
 
@@ -1020,26 +979,26 @@ msgstr "Demandes de groupe"
 msgid "Group Membership"
 msgstr "Groupe appartenance "
 
-#: allianceauth/groupmanagement/views.py:166
+#: allianceauth/groupmanagement/views.py:163
 #, python-format
 msgid "Removed user %(user)s from group %(group)s."
 msgstr "L'utilisateur %(user)s à été retiré du groupe %(group)s."
 
-#: allianceauth/groupmanagement/views.py:168
+#: allianceauth/groupmanagement/views.py:165
 msgid "User does not exist in that group"
 msgstr "L'utilisateur n'existe pas dans ce groupe"
 
-#: allianceauth/groupmanagement/views.py:171
+#: allianceauth/groupmanagement/views.py:168
 msgid "Group does not exist"
 msgstr "Groupe non-existant"
 
-#: allianceauth/groupmanagement/views.py:198
+#: allianceauth/groupmanagement/views.py:195
 #, python-format
 msgid "Accepted application from %(mainchar)s to %(group)s."
 msgstr "Candidature de %(mainchar)s acceptée à %(group)s."
 
-#: allianceauth/groupmanagement/views.py:204
+#: allianceauth/groupmanagement/views.py:201
-#: allianceauth/groupmanagement/views.py:235
+#: allianceauth/groupmanagement/views.py:232
 #, python-format
 msgid ""
 "An unhandled error occurred while processing the application from "
@@ -1048,18 +1007,18 @@ msgstr ""
 "Une erreur inattendue est survenue durant le traitement de l'application de "
 "%(mainchar)s à %(group)s."
 
-#: allianceauth/groupmanagement/views.py:229
+#: allianceauth/groupmanagement/views.py:226
 #, python-format
 msgid "Rejected application from %(mainchar)s to %(group)s."
 msgstr "L'application de %(mainchar)s à %(group)s est rejetée."
 
-#: allianceauth/groupmanagement/views.py:264
+#: allianceauth/groupmanagement/views.py:261
 #, python-format
 msgid "Accepted application from %(mainchar)s to leave %(group)s."
 msgstr "La demande de retirer %(mainchar)s de %(group)s est acceptée."
 
-#: allianceauth/groupmanagement/views.py:269
+#: allianceauth/groupmanagement/views.py:266
-#: allianceauth/groupmanagement/views.py:301
+#: allianceauth/groupmanagement/views.py:298
 #, python-format
 msgid ""
 "An unhandled error occurred while processing the application from "
@@ -1068,42 +1027,42 @@ msgstr ""
 "Une erreur inattendue est survenue durant le traitement de la demande de "
 "retirer %(mainchar)s de %(group)s."
 
-#: allianceauth/groupmanagement/views.py:295
+#: allianceauth/groupmanagement/views.py:292
 #, python-format
 msgid "Rejected application from %(mainchar)s to leave %(group)s."
 msgstr "La remande de retirer %(mainchar)s de %(group)s a été refusée."
 
-#: allianceauth/groupmanagement/views.py:339
+#: allianceauth/groupmanagement/views.py:336
-#: allianceauth/groupmanagement/views.py:349
+#: allianceauth/groupmanagement/views.py:346
 msgid "You cannot join that group"
 msgstr "Vous ne pouvez pas joindre ce groupe."
 
-#: allianceauth/groupmanagement/views.py:344
+#: allianceauth/groupmanagement/views.py:341
 msgid "You are already a member of that group."
 msgstr "Vous faites déjà parti de ce groupe."
 
-#: allianceauth/groupmanagement/views.py:361
+#: allianceauth/groupmanagement/views.py:358
 msgid "You already have a pending application for that group."
 msgstr "Vous avez déjà une application en attente pour joindre ce groupe."
 
-#: allianceauth/groupmanagement/views.py:370
+#: allianceauth/groupmanagement/views.py:367
 #, python-format
 msgid "Applied to group %(group)s."
 msgstr "Appliqué au groupe %(group)s."
 
-#: allianceauth/groupmanagement/views.py:380
+#: allianceauth/groupmanagement/views.py:377
 msgid "You cannot leave that group"
 msgstr "Vous ne pouvez pas quitter ce groupe."
 
-#: allianceauth/groupmanagement/views.py:384
+#: allianceauth/groupmanagement/views.py:381
 msgid "You are not a member of that group"
 msgstr "Vous n'êtes pas un membre de ce groupe."
 
-#: allianceauth/groupmanagement/views.py:396
+#: allianceauth/groupmanagement/views.py:393
 msgid "You already have a pending leave request for that group."
 msgstr "Vous avec déjà une demande de quitter ce groupe en attente."
 
-#: allianceauth/groupmanagement/views.py:412
+#: allianceauth/groupmanagement/views.py:409
 #, python-format
 msgid "Applied to leave group %(group)s."
 msgstr "Appliqué pour quitter le groupe %(group)s."
@@ -1165,6 +1124,16 @@ msgstr "Créer une application"
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
+#: allianceauth/hrapplications/templates/hrapplications/management.html:28
+#: allianceauth/hrapplications/templates/hrapplications/management.html:83
+#: allianceauth/hrapplications/templates/hrapplications/management.html:127
+#: allianceauth/hrapplications/templates/hrapplications/searchview.html:27
+#: allianceauth/hrapplications/templates/hrapplications/view.html:73
+#: allianceauth/srp/templates/srp/data.html:101
+#: allianceauth/srp/templates/srp/management.html:44
+msgid "Actions"
+msgstr "Actions"
+
 #: allianceauth/hrapplications/templates/hrapplications/management.html:38
 #: allianceauth/hrapplications/templates/hrapplications/management.html:99
 #: allianceauth/hrapplications/templates/hrapplications/management.html:143
@@ -1503,6 +1472,10 @@ msgstr "Modèle"
 msgid "Code Name"
 msgstr "Nom De Code"
 
+#: allianceauth/permissions_tool/templates/permissions_tool/overview.html:35
+msgid "Users"
+msgstr "Utilisateurs"
+
 #: allianceauth/permissions_tool/templates/permissions_tool/overview.html:41
 msgid "States"
 msgstr "États"
@@ -2244,12 +2217,15 @@ msgstr ""
 "                    "
 
 #: allianceauth/templates/allianceauth/admin-status/overview.html:95
-msgid "running"
+#, python-format
-msgstr ""
+msgid ""
-
+"\n"
-#: allianceauth/templates/allianceauth/admin-status/overview.html:96
+"                        %(queue_length)s queued tasks\n"
-msgid "queued"
+"                        "
 msgstr ""
+"\n"
+"                        %(queue_length)stâches en file d'attente\n"
+"                        "
 
 #: allianceauth/templates/allianceauth/top-menu-admin.html:9
 msgid "Admin"
@@ -2264,11 +2240,11 @@ msgid "AA Support Discord"
 msgstr "Support Discord AA"
 
 #: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:10
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:16
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:14
 msgid "User Menu"
 msgstr "Menu Utilisateur"
 
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:67
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:56
 msgid "Logout"
 msgstr "Déconnexion"
 
@@ -2324,30 +2300,22 @@ msgid "Objective"
 msgstr "Objectif"
 
 #: allianceauth/timerboard/form.py:64
-msgid "Absolute Timer"
-msgstr ""
-
-#: allianceauth/timerboard/form.py:65
-msgid "Date and Time"
-msgstr ""
-
-#: allianceauth/timerboard/form.py:66
 msgid "Days Remaining"
 msgstr "Jour restants"
 
-#: allianceauth/timerboard/form.py:67
+#: allianceauth/timerboard/form.py:65
 msgid "Hours Remaining"
 msgstr "Heures restantes"
 
-#: allianceauth/timerboard/form.py:69
+#: allianceauth/timerboard/form.py:67
 msgid "Minutes Remaining"
 msgstr "Minutes restantes"
 
-#: allianceauth/timerboard/form.py:71
+#: allianceauth/timerboard/form.py:69
 msgid "Important"
 msgstr "Important"
 
-#: allianceauth/timerboard/form.py:72
+#: allianceauth/timerboard/form.py:70
 msgid "Corp-Restricted"
 msgstr "Limité à la Corporation"
 

allianceauth/locale/ja/LC_MESSAGES/django.po

@@ -4,18 +4,17 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
+# Foch Petain <brigadier.rockforward@gmail.com>, 2020
 # kotaneko, 2023
-# Foch Petain <brigadier.rockforward@gmail.com>, 2023
-# Joel Falknau <ozirascal@gmail.com>, 2023
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-17 18:50+1000\n"
+"POT-Creation-Date: 2022-10-09 18:20+1000\n"
-"PO-Revision-Date: 2023-11-08 13:50+0000\n"
+"PO-Revision-Date: 2020-02-18 03:14+0000\n"
-"Last-Translator: Joel Falknau <ozirascal@gmail.com>, 2023\n"
+"Last-Translator: kotaneko, 2023\n"
 "Language-Team: Japanese (https://app.transifex.com/alliance-auth/teams/107430/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,7 +30,7 @@ msgstr "Google ユニバーサル アナリティクス"
 msgid "Google Analytics V4"
 msgstr "Google アナリティクス 4"
 
-#: allianceauth/authentication/decorators.py:49
+#: allianceauth/authentication/decorators.py:37
 msgid "A main character is required to perform that action. Add one below."
 msgstr "実行するためにはメインキャラクターの設定が必要です。設定してください。"
 
@@ -44,68 +43,63 @@ msgstr "メールアドレス"
 msgid "You are not allowed to add or remove these restricted groups: %s"
 msgstr "これらの制限付きグループを追加または削除することはできません。%s"
 
-#: allianceauth/authentication/models.py:71
+#: allianceauth/authentication/models.py:80
 msgid "English"
 msgstr "英語"
 
-#: allianceauth/authentication/models.py:72
+#: allianceauth/authentication/models.py:81
 msgid "German"
 msgstr "ドイツ語"
 
-#: allianceauth/authentication/models.py:73
+#: allianceauth/authentication/models.py:82
 msgid "Spanish"
 msgstr "スペイン語"
 
-#: allianceauth/authentication/models.py:74
+#: allianceauth/authentication/models.py:83
 msgid "Chinese Simplified"
 msgstr "中国語 簡体字"
 
-#: allianceauth/authentication/models.py:75
+#: allianceauth/authentication/models.py:84
 msgid "Russian"
 msgstr "ロシア語"
 
-#: allianceauth/authentication/models.py:76
+#: allianceauth/authentication/models.py:85
 msgid "Korean"
 msgstr "韓国語"
 
-#: allianceauth/authentication/models.py:77
+#: allianceauth/authentication/models.py:86
 msgid "French"
 msgstr "フランス語"
 
-#: allianceauth/authentication/models.py:78
+#: allianceauth/authentication/models.py:87
 msgid "Japanese"
 msgstr "日本語"
 
-#: allianceauth/authentication/models.py:79
+#: allianceauth/authentication/models.py:88
 msgid "Italian"
 msgstr "イタリア語"
 
-#: allianceauth/authentication/models.py:80
+#: allianceauth/authentication/models.py:91
-msgid "Ukrainian"
-msgstr ""
-
-#: allianceauth/authentication/models.py:96
 msgid "Language"
 msgstr "言語"
 
-#: allianceauth/authentication/models.py:101
+#: allianceauth/authentication/models.py:96
 #: allianceauth/templates/allianceauth/night-toggle.html:6
 msgid "Night Mode"
 msgstr "ナイトモード"
 
-#: allianceauth/authentication/models.py:115
+#: allianceauth/authentication/models.py:110
 #, python-format
 msgid "State changed to: %s"
 msgstr "分類が%sに変更されました。"
 
-#: allianceauth/authentication/models.py:116
+#: allianceauth/authentication/models.py:111
 #, python-format
 msgid "Your user's state is now: %(state)s"
 msgstr "あなたの分類は%(state)sになりました。"
 
 #: allianceauth/authentication/templates/authentication/dashboard.html:4
 #: allianceauth/authentication/templates/authentication/dashboard.html:7
-#: allianceauth/authentication/templates/authentication/tokens.html:4
 #: allianceauth/templates/allianceauth/side-menu.html:10
 msgid "Dashboard"
 msgstr "ダッシュボード"
@@ -163,50 +157,8 @@ msgstr "Corp"
 msgid "Alliance"
 msgstr "Alliance"
 
-#: allianceauth/authentication/templates/authentication/tokens.html:7
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:62
-msgid "Token Management"
-msgstr ""
-
-#: allianceauth/authentication/templates/authentication/tokens.html:12
-msgid "Scopes"
-msgstr ""
-
-#: allianceauth/authentication/templates/authentication/tokens.html:13
-#: allianceauth/hrapplications/templates/hrapplications/management.html:28
-#: allianceauth/hrapplications/templates/hrapplications/management.html:83
-#: allianceauth/hrapplications/templates/hrapplications/management.html:127
-#: allianceauth/hrapplications/templates/hrapplications/searchview.html:27
-#: allianceauth/hrapplications/templates/hrapplications/view.html:73
-#: allianceauth/srp/templates/srp/data.html:101
-#: allianceauth/srp/templates/srp/management.html:44
-msgid "Actions"
-msgstr "アクション"
-
-#: allianceauth/authentication/templates/authentication/tokens.html:14
-#: allianceauth/corputils/templates/corputils/corpstats.html:74
-#: allianceauth/corputils/templates/corputils/corpstats.html:112
-#: allianceauth/corputils/templates/corputils/corpstats.html:156
-#: allianceauth/corputils/templates/corputils/search.html:13
-#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html:22
-#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:26
-#: allianceauth/groupmanagement/templates/groupmanagement/audit.html:30
-#: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:29
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:55
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:112
-msgid "Character"
-msgstr "キャラクター"
-
-#: allianceauth/authentication/templates/authentication/tokens.html:28
-msgid ""
-"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."
-msgstr ""
-
 #: allianceauth/authentication/templates/public/login.html:6
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:69
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:58
 msgid "Login"
 msgstr "ログイン"
 
@@ -238,49 +190,47 @@ msgstr "登録"
 msgid "Invalid or expired activation link."
 msgstr "アクティベーションリンクが無効か期限切れです。"
 
-#: allianceauth/authentication/views.py:118
+#: allianceauth/authentication/views.py:77
 #, python-format
 msgid ""
 "Cannot change main character to %(char)s: character owned by a different "
 "account."
 msgstr "メインキャラクターを%(char)sへ変更できません。別のアカウントによって利用されています。"
 
-#: allianceauth/authentication/views.py:124
+#: allianceauth/authentication/views.py:83
 #, python-format
 msgid "Changed main character to %(char)s"
 msgstr "メインキャラクターを%(char)sへ変更しました。"
 
-#: allianceauth/authentication/views.py:133
+#: allianceauth/authentication/views.py:92
 #, python-format
 msgid "Added %(name)s to your account."
 msgstr "%(name)sをアカウントに追加しました。"
 
-#: allianceauth/authentication/views.py:135
+#: allianceauth/authentication/views.py:94
 #, python-format
 msgid "Failed to add %(name)s to your account: they already have an account."
 msgstr "%(name)sをアカウントに追加することができません。すでに他のアカウントを持っています。"
 
-#: allianceauth/authentication/views.py:178
+#: allianceauth/authentication/views.py:133
-msgid ""
+msgid "Unable to authenticate as the selected character."
-"Unable to authenticate as the selected character. Please log in with the "
+msgstr "選択されたキャラクターの認証が行えませんでした。"
-"main character associated with this account."
-msgstr ""
 
-#: allianceauth/authentication/views.py:244
+#: allianceauth/authentication/views.py:197
 msgid "Registration token has expired."
 msgstr "Registrationトークンが有効期限切れです。"
 
-#: allianceauth/authentication/views.py:302
+#: allianceauth/authentication/views.py:252
 msgid ""
 "Sent confirmation email. Please follow the link to confirm your email "
 "address."
 msgstr "確認のメールを送信しました。メール内のリンクをご確認の上、メールアドレスの認証を完了させてください。"
 
-#: allianceauth/authentication/views.py:307
+#: allianceauth/authentication/views.py:257
 msgid "Confirmed your email address. Please login to continue."
 msgstr "メールアドレスを確認しました。続行するにはログインしてください。"
 
-#: allianceauth/authentication/views.py:312
+#: allianceauth/authentication/views.py:262
 msgid "Registration of new accounts is not allowed at this time."
 msgstr "新規アカウントの登録は、現時点ではできません。"
 
@@ -323,6 +273,19 @@ msgstr "未登録"
 msgid "Last update:"
 msgstr "最終更新:"
 
+#: allianceauth/corputils/templates/corputils/corpstats.html:74
+#: allianceauth/corputils/templates/corputils/corpstats.html:112
+#: allianceauth/corputils/templates/corputils/corpstats.html:156
+#: allianceauth/corputils/templates/corputils/search.html:13
+#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html:22
+#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:26
+#: allianceauth/groupmanagement/templates/groupmanagement/audit.html:30
+#: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:29
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:55
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:112
+msgid "Character"
+msgstr "キャラクター"
+
 #: allianceauth/corputils/templates/corputils/corpstats.html:75
 #: allianceauth/corputils/templates/corputils/search.html:14
 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:31
@@ -652,24 +615,19 @@ msgstr "{character.character_name} のフリート参加を登録できません
 msgid "Group Management"
 msgstr "グループ管理"
 
-#: allianceauth/groupmanagement/forms.py:18
+#: allianceauth/groupmanagement/forms.py:15
-#: allianceauth/permissions_tool/templates/permissions_tool/overview.html:35
-msgid "Users"
-msgstr "ユーザ"
-
-#: allianceauth/groupmanagement/forms.py:52
 msgid "This name has been reserved and can not be used for groups."
 msgstr "この名前は予約済みで、グループには使用できません。"
 
-#: allianceauth/groupmanagement/forms.py:62
+#: allianceauth/groupmanagement/forms.py:25
 msgid "(auto)"
 msgstr "(auto)"
 
-#: allianceauth/groupmanagement/forms.py:71
+#: allianceauth/groupmanagement/forms.py:34
 msgid "There already exists a group with that name."
 msgstr "その名前のグループが既に存在しています。"
 
-#: allianceauth/groupmanagement/models.py:104
+#: allianceauth/groupmanagement/models.py:105
 msgid ""
 "Internal group, users cannot see, join or request to join this "
 "group.<br>Used for groups such as Members, Corp_*, Alliance_* "
@@ -678,18 +636,18 @@ msgstr ""
 "内部グループです。ユーザーはこのグループを表示したり、参加したり、参加をリクエストしたりすることはできません。<br>Members、Corp_*、Alliance_*などのグループに使用します。選択すると、非表示"
 " オプションと 開く <br> <b> オプションが上書きされます。</b> "
 
-#: allianceauth/groupmanagement/models.py:112
+#: allianceauth/groupmanagement/models.py:113
 msgid "Group is hidden from users but can still join with the correct link."
 msgstr "グループはユーザーに表示されませんが、正しいリンク経由で参加することができます。"
 
-#: allianceauth/groupmanagement/models.py:118
+#: allianceauth/groupmanagement/models.py:119
 msgid ""
 "Group is open and users will be automatically added upon request.<br>If the "
 "group is not open users will need their request manually approved."
 msgstr ""
 "グループはオープンで、ユーザーはリクエストに応じて自動的に追加されます。<br>グループがオープンでない場合、ユーザーのリクエストは手動で承認する必要があります。"
 
-#: allianceauth/groupmanagement/models.py:125
+#: allianceauth/groupmanagement/models.py:126
 msgid ""
 "Group is public. Any registered user is able to join this group, with "
 "visibility based on the other options set for this group.<br>Auth will not "
@@ -699,13 +657,13 @@ msgstr ""
 "グループは一般公開されています。登録ユーザーなら誰でもこのグループに参加でき、このグループに設定されている他のオプションに基づいて表示されます。<br>認証されなくなっても、Auth"
 " はユーザーをこのグループから自動的に削除しません。"
 
-#: allianceauth/groupmanagement/models.py:134
+#: allianceauth/groupmanagement/models.py:135
 msgid ""
 "Group is restricted. This means that adding or removing users for this group"
 " requires a superuser admin."
 msgstr "グループは参加が制限されています。つまり、このグループのユーザーを追加または削除するには、スーパーユーザー管理者が必要です。"
 
-#: allianceauth/groupmanagement/models.py:143
+#: allianceauth/groupmanagement/models.py:144
 msgid ""
 "Group leaders can process requests for this group. Use the "
 "<code>auth.group_management</code> permission to allow a user to manage all "
@@ -714,7 +672,7 @@ msgstr ""
 "グループリーダーは、このグループのリクエストを処理できます。<code>auth.group_management </code> "
 "権限を使用して、ユーザーがすべてのグループを管理できるようにします。<br> "
 
-#: allianceauth/groupmanagement/models.py:153
+#: allianceauth/groupmanagement/models.py:154
 msgid ""
 "Members of leader groups can process requests for this group. Use the "
 "<code>auth.group_management</code> permission to allow a user to manage all "
@@ -723,46 +681,46 @@ msgstr ""
 "リーダーグループのメンバーは、このグループのリクエストを処理できます。<code>auth.group_management </code> "
 "権限を使用して、ユーザーがすべてのグループを管理できるようにします。<br> "
 
-#: allianceauth/groupmanagement/models.py:162
+#: allianceauth/groupmanagement/models.py:163
 msgid ""
 "States listed here will have the ability to join this group provided they "
 "have the proper permissions.<br>"
 msgstr "ここに記載されているStatesは、適切な許可があれば、このグループに参加できます。<br> "
 
-#: allianceauth/groupmanagement/models.py:170
+#: allianceauth/groupmanagement/models.py:171
 msgid ""
 "Short description <i>(max. 512 characters)</i> of the group shown to users."
 msgstr "ユーザーに表示されるグループの簡単な説明 <i> (最大 512 文字) </i>。"
 
-#: allianceauth/groupmanagement/models.py:177
+#: allianceauth/groupmanagement/models.py:178
 msgid "Can request non-public groups"
 msgstr "非公開グループをリクエストできる"
 
-#: allianceauth/groupmanagement/models.py:208
+#: allianceauth/groupmanagement/models.py:209
 msgid "name"
 msgstr "名前"
 
-#: allianceauth/groupmanagement/models.py:211
+#: allianceauth/groupmanagement/models.py:212
 msgid "Name that can not be used for groups."
 msgstr "グループには使用できない名前。"
 
-#: allianceauth/groupmanagement/models.py:214
+#: allianceauth/groupmanagement/models.py:215
 msgid "reason"
 msgstr "理由"
 
-#: allianceauth/groupmanagement/models.py:214
+#: allianceauth/groupmanagement/models.py:215
 msgid "Reason why this name is reserved."
 msgstr "この名前が使用予約されている理由。"
 
-#: allianceauth/groupmanagement/models.py:217
+#: allianceauth/groupmanagement/models.py:218
 msgid "created by"
 msgstr "作成者"
 
-#: allianceauth/groupmanagement/models.py:222
+#: allianceauth/groupmanagement/models.py:223
 msgid "created at"
 msgstr "作成日時"
 
-#: allianceauth/groupmanagement/models.py:222
+#: allianceauth/groupmanagement/models.py:223
 msgid "Date when this entry was created"
 msgstr "このエントリが作成された日付"
 
@@ -989,86 +947,86 @@ msgstr "グループリクエスト"
 msgid "Group Membership"
 msgstr "グループメンバーシップ"
 
-#: allianceauth/groupmanagement/views.py:166
+#: allianceauth/groupmanagement/views.py:163
 #, python-format
 msgid "Removed user %(user)s from group %(group)s."
 msgstr "%(user)sを%(group)sから削除する。"
 
-#: allianceauth/groupmanagement/views.py:168
+#: allianceauth/groupmanagement/views.py:165
 msgid "User does not exist in that group"
 msgstr "誰もグループに参加してません。"
 
-#: allianceauth/groupmanagement/views.py:171
+#: allianceauth/groupmanagement/views.py:168
 msgid "Group does not exist"
 msgstr "グループが存在しません。"
 
-#: allianceauth/groupmanagement/views.py:198
+#: allianceauth/groupmanagement/views.py:195
 #, python-format
 msgid "Accepted application from %(mainchar)s to %(group)s."
 msgstr "%(mainchar)sからの%(group)sへの参加申請を承認しました。"
 
-#: allianceauth/groupmanagement/views.py:204
+#: allianceauth/groupmanagement/views.py:201
-#: allianceauth/groupmanagement/views.py:235
+#: allianceauth/groupmanagement/views.py:232
 #, python-format
 msgid ""
 "An unhandled error occurred while processing the application from "
 "%(mainchar)s to %(group)s."
 msgstr "%(mainchar)sからの%(group)sへの参加申請を処理中にエラーが発生しました。"
 
-#: allianceauth/groupmanagement/views.py:229
+#: allianceauth/groupmanagement/views.py:226
 #, python-format
 msgid "Rejected application from %(mainchar)s to %(group)s."
 msgstr "%(mainchar)sからの%(group)sへの参加申請は拒否されました。"
 
-#: allianceauth/groupmanagement/views.py:264
+#: allianceauth/groupmanagement/views.py:261
 #, python-format
 msgid "Accepted application from %(mainchar)s to leave %(group)s."
 msgstr "%(mainchar)sからの%(group)sからの脱退申請は承認されました。"
 
-#: allianceauth/groupmanagement/views.py:269
+#: allianceauth/groupmanagement/views.py:266
-#: allianceauth/groupmanagement/views.py:301
+#: allianceauth/groupmanagement/views.py:298
 #, python-format
 msgid ""
 "An unhandled error occurred while processing the application from "
 "%(mainchar)s to leave %(group)s."
 msgstr "%(mainchar)sからの%(group)sからの脱退申請を処理中にエラーが発生しました。"
 
-#: allianceauth/groupmanagement/views.py:295
+#: allianceauth/groupmanagement/views.py:292
 #, python-format
 msgid "Rejected application from %(mainchar)s to leave %(group)s."
 msgstr "%(mainchar)sの%(group)sからの脱退申請は拒否されました。"
 
-#: allianceauth/groupmanagement/views.py:339
+#: allianceauth/groupmanagement/views.py:336
-#: allianceauth/groupmanagement/views.py:349
+#: allianceauth/groupmanagement/views.py:346
 msgid "You cannot join that group"
 msgstr "このGroupには入れません"
 
-#: allianceauth/groupmanagement/views.py:344
+#: allianceauth/groupmanagement/views.py:341
 msgid "You are already a member of that group."
 msgstr "すでにその Group に参加してます。"
 
-#: allianceauth/groupmanagement/views.py:361
+#: allianceauth/groupmanagement/views.py:358
 msgid "You already have a pending application for that group."
 msgstr "すでに参加申請を送付済みです。"
 
-#: allianceauth/groupmanagement/views.py:370
+#: allianceauth/groupmanagement/views.py:367
 #, python-format
 msgid "Applied to group %(group)s."
 msgstr "%(group)sへの参加申請を送信しました。"
 
-#: allianceauth/groupmanagement/views.py:380
+#: allianceauth/groupmanagement/views.py:377
 msgid "You cannot leave that group"
 msgstr "この Group から脱退することはできません"
 
-#: allianceauth/groupmanagement/views.py:384
+#: allianceauth/groupmanagement/views.py:381
 msgid "You are not a member of that group"
 msgstr "あなたはその Group のメンバーではありません"
 
-#: allianceauth/groupmanagement/views.py:396
+#: allianceauth/groupmanagement/views.py:393
 msgid "You already have a pending leave request for that group."
 msgstr "すでに脱退申請を送信済みです。"
 
-#: allianceauth/groupmanagement/views.py:412
+#: allianceauth/groupmanagement/views.py:409
 #, python-format
 msgid "Applied to leave group %(group)s."
 msgstr "%(group)sからの脱退申請を送信しました。"
@@ -1130,6 +1088,16 @@ msgstr "申請を作成"
 msgid "Username"
 msgstr "ユーザー名"
 
+#: allianceauth/hrapplications/templates/hrapplications/management.html:28
+#: allianceauth/hrapplications/templates/hrapplications/management.html:83
+#: allianceauth/hrapplications/templates/hrapplications/management.html:127
+#: allianceauth/hrapplications/templates/hrapplications/searchview.html:27
+#: allianceauth/hrapplications/templates/hrapplications/view.html:73
+#: allianceauth/srp/templates/srp/data.html:101
+#: allianceauth/srp/templates/srp/management.html:44
+msgid "Actions"
+msgstr "アクション"
+
 #: allianceauth/hrapplications/templates/hrapplications/management.html:38
 #: allianceauth/hrapplications/templates/hrapplications/management.html:99
 #: allianceauth/hrapplications/templates/hrapplications/management.html:143
@@ -1468,6 +1436,10 @@ msgstr "モデル"
 msgid "Code Name"
 msgstr "コードネーム"
 
+#: allianceauth/permissions_tool/templates/permissions_tool/overview.html:35
+msgid "Users"
+msgstr "ユーザ"
+
 #: allianceauth/permissions_tool/templates/permissions_tool/overview.html:41
 msgid "States"
 msgstr "States"
@@ -2198,12 +2170,15 @@ msgstr ""
 "                    "
 
 #: allianceauth/templates/allianceauth/admin-status/overview.html:95
-msgid "running"
+#, python-format
-msgstr ""
+msgid ""
-
+"\n"
-#: allianceauth/templates/allianceauth/admin-status/overview.html:96
+"                        %(queue_length)s queued tasks\n"
-msgid "queued"
+"                        "
 msgstr ""
+"\n"
+"                        %(queue_length)sキューに入っているタスク\n"
+"                        "
 
 #: allianceauth/templates/allianceauth/top-menu-admin.html:9
 msgid "Admin"
@@ -2218,11 +2193,11 @@ msgid "AA Support Discord"
 msgstr "AA サポートディスコード"
 
 #: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:10
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:16
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:14
 msgid "User Menu"
 msgstr "ユーザーメニュー"
 
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:67
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:56
 msgid "Logout"
 msgstr "ログアウト"
 
@@ -2278,30 +2253,22 @@ msgid "Objective"
 msgstr "目標"
 
 #: allianceauth/timerboard/form.py:64
-msgid "Absolute Timer"
-msgstr ""
-
-#: allianceauth/timerboard/form.py:65
-msgid "Date and Time"
-msgstr ""
-
-#: allianceauth/timerboard/form.py:66
 msgid "Days Remaining"
 msgstr "残り日数"
 
-#: allianceauth/timerboard/form.py:67
+#: allianceauth/timerboard/form.py:65
 msgid "Hours Remaining"
 msgstr "残り時間"
 
-#: allianceauth/timerboard/form.py:69
+#: allianceauth/timerboard/form.py:67
 msgid "Minutes Remaining"
 msgstr "残り分数"
 
-#: allianceauth/timerboard/form.py:71
+#: allianceauth/timerboard/form.py:69
 msgid "Important"
 msgstr "重要"
 
-#: allianceauth/timerboard/form.py:72
+#: allianceauth/timerboard/form.py:70
 msgid "Corp-Restricted"
 msgstr "コーポレーション制限付き"
 

allianceauth/locale/ko_KR/LC_MESSAGES/django.po

@@ -4,22 +4,22 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Joel Falknau <ozirascal@gmail.com>, 2023
+# None None <khd1226543@gmail.com>, 2020
-# None None <khd1226543@gmail.com>, 2023
+# Seowon Jung <seowon@hawaii.edu>, 2020
-# ThatRagingKid, 2023
+# Olgeda Choi <undead.choi@gmail.com>, 2020
-# Lahty <js03js70@gmail.com>, 2023
+# Lahty <js03js70@gmail.com>, 2020
-# Olgeda Choi <undead.choi@gmail.com>, 2023
+# Joel Falknau <ozirascal@gmail.com>, 2020
-# Seowon Jung <seowon@hawaii.edu>, 2023
+# ThatRagingKid, 2022
-# Alpha, 2023
+# jackfrost, 2022
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-17 18:50+1000\n"
+"POT-Creation-Date: 2022-10-09 18:20+1000\n"
-"PO-Revision-Date: 2023-11-08 13:50+0000\n"
+"PO-Revision-Date: 2020-02-18 03:14+0000\n"
-"Last-Translator: Alpha, 2023\n"
+"Last-Translator: jackfrost, 2022\n"
 "Language-Team: Korean (Korea) (https://app.transifex.com/alliance-auth/teams/107430/ko_KR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,7 +35,7 @@ msgstr "Google 애널리틱스 유니버설"
 msgid "Google Analytics V4"
 msgstr "Google 애널리틱스 V4"
 
-#: allianceauth/authentication/decorators.py:49
+#: allianceauth/authentication/decorators.py:37
 msgid "A main character is required to perform that action. Add one below."
 msgstr "해당 기능을 수행하려면 주 캐릭터가 요구됩니다. 아래에서 하나를 추가하시오."
 
@@ -48,68 +48,63 @@ msgstr "이메일"
 msgid "You are not allowed to add or remove these restricted groups: %s"
 msgstr ""
 
-#: allianceauth/authentication/models.py:71
+#: allianceauth/authentication/models.py:80
 msgid "English"
 msgstr "영어"
 
-#: allianceauth/authentication/models.py:72
+#: allianceauth/authentication/models.py:81
 msgid "German"
 msgstr "독일어"
 
-#: allianceauth/authentication/models.py:73
+#: allianceauth/authentication/models.py:82
 msgid "Spanish"
 msgstr "스페인어"
 
-#: allianceauth/authentication/models.py:74
+#: allianceauth/authentication/models.py:83
 msgid "Chinese Simplified"
 msgstr "간체자"
 
-#: allianceauth/authentication/models.py:75
+#: allianceauth/authentication/models.py:84
 msgid "Russian"
 msgstr "러시아어"
 
-#: allianceauth/authentication/models.py:76
+#: allianceauth/authentication/models.py:85
 msgid "Korean"
 msgstr "한국어"
 
-#: allianceauth/authentication/models.py:77
+#: allianceauth/authentication/models.py:86
 msgid "French"
 msgstr "프랑스어"
 
-#: allianceauth/authentication/models.py:78
+#: allianceauth/authentication/models.py:87
 msgid "Japanese"
 msgstr "일본어"
 
-#: allianceauth/authentication/models.py:79
+#: allianceauth/authentication/models.py:88
 msgid "Italian"
 msgstr "이탈리아어"
 
-#: allianceauth/authentication/models.py:80
+#: allianceauth/authentication/models.py:91
-msgid "Ukrainian"
-msgstr ""
-
-#: allianceauth/authentication/models.py:96
 msgid "Language"
 msgstr ""
 
-#: allianceauth/authentication/models.py:101
+#: allianceauth/authentication/models.py:96
 #: allianceauth/templates/allianceauth/night-toggle.html:6
 msgid "Night Mode"
 msgstr "야간 모드"
 
-#: allianceauth/authentication/models.py:115
+#: allianceauth/authentication/models.py:110
 #, python-format
 msgid "State changed to: %s"
 msgstr "상태가 %s로 변경됐습니다."
 
-#: allianceauth/authentication/models.py:116
+#: allianceauth/authentication/models.py:111
 #, python-format
 msgid "Your user's state is now: %(state)s"
 msgstr "사용자의 상태는 %(state)s입니다."
 
 #: allianceauth/authentication/templates/authentication/dashboard.html:4
 #: allianceauth/authentication/templates/authentication/dashboard.html:7
-#: allianceauth/authentication/templates/authentication/tokens.html:4
 #: allianceauth/templates/allianceauth/side-menu.html:10
 msgid "Dashboard"
 msgstr "대시보드"
@@ -168,50 +163,8 @@ msgstr "코퍼레이션"
 msgid "Alliance"
 msgstr "얼라이언스"
 
-#: allianceauth/authentication/templates/authentication/tokens.html:7
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:62
-msgid "Token Management"
-msgstr ""
-
-#: allianceauth/authentication/templates/authentication/tokens.html:12
-msgid "Scopes"
-msgstr ""
-
-#: allianceauth/authentication/templates/authentication/tokens.html:13
-#: allianceauth/hrapplications/templates/hrapplications/management.html:28
-#: allianceauth/hrapplications/templates/hrapplications/management.html:83
-#: allianceauth/hrapplications/templates/hrapplications/management.html:127
-#: allianceauth/hrapplications/templates/hrapplications/searchview.html:27
-#: allianceauth/hrapplications/templates/hrapplications/view.html:73
-#: allianceauth/srp/templates/srp/data.html:101
-#: allianceauth/srp/templates/srp/management.html:44
-msgid "Actions"
-msgstr "활동"
-
-#: allianceauth/authentication/templates/authentication/tokens.html:14
-#: allianceauth/corputils/templates/corputils/corpstats.html:74
-#: allianceauth/corputils/templates/corputils/corpstats.html:112
-#: allianceauth/corputils/templates/corputils/corpstats.html:156
-#: allianceauth/corputils/templates/corputils/search.html:13
-#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html:22
-#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:26
-#: allianceauth/groupmanagement/templates/groupmanagement/audit.html:30
-#: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:29
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:55
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:112
-msgid "Character"
-msgstr "캐릭터"
-
-#: allianceauth/authentication/templates/authentication/tokens.html:28
-msgid ""
-"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."
-msgstr ""
-
 #: allianceauth/authentication/templates/public/login.html:6
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:69
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:58
 msgid "Login"
 msgstr "로그인"
 
@@ -243,49 +196,47 @@ msgstr "등록"
 msgid "Invalid or expired activation link."
 msgstr "유효하지 않거나 만료된 활성화 주소"
 
-#: allianceauth/authentication/views.py:118
+#: allianceauth/authentication/views.py:77
 #, python-format
 msgid ""
 "Cannot change main character to %(char)s: character owned by a different "
 "account."
 msgstr "%(char)s를 주 캐릭터로 변경할 수 없음: 다른 계정이 해당 캐릭터를 소유하고 있습니다."
 
-#: allianceauth/authentication/views.py:124
+#: allianceauth/authentication/views.py:83
 #, python-format
 msgid "Changed main character to %(char)s"
 msgstr "주 캐릭터가 %(char)s로 변경됨"
 
-#: allianceauth/authentication/views.py:133
+#: allianceauth/authentication/views.py:92
 #, python-format
 msgid "Added %(name)s to your account."
 msgstr "계정에 %(name)s를 추가했습니다."
 
-#: allianceauth/authentication/views.py:135
+#: allianceauth/authentication/views.py:94
 #, python-format
 msgid "Failed to add %(name)s to your account: they already have an account."
 msgstr "계정에 %(name)s를 추가하지 못했습니다. 이미 다른 계정에 추가되었습니다."
 
-#: allianceauth/authentication/views.py:178
+#: allianceauth/authentication/views.py:133
-msgid ""
+msgid "Unable to authenticate as the selected character."
-"Unable to authenticate as the selected character. Please log in with the "
+msgstr "선택한 캐릭터로 인증할 수 없습니다."
-"main character associated with this account."
-msgstr ""
 
-#: allianceauth/authentication/views.py:244
+#: allianceauth/authentication/views.py:197
 msgid "Registration token has expired."
 msgstr "가입 토큰이 만료되었습니다."
 
-#: allianceauth/authentication/views.py:302
+#: allianceauth/authentication/views.py:252
 msgid ""
 "Sent confirmation email. Please follow the link to confirm your email "
 "address."
 msgstr "확인 메일 전송됨. 다음 링크를 눌러 이메일 주소를 확인하세요."
 
-#: allianceauth/authentication/views.py:307
+#: allianceauth/authentication/views.py:257
 msgid "Confirmed your email address. Please login to continue."
 msgstr "이메일 주소가 확인되었습니다. 로그인 해주세요."
 
-#: allianceauth/authentication/views.py:312
+#: allianceauth/authentication/views.py:262
 msgid "Registration of new accounts is not allowed at this time."
 msgstr "현재 새로운 계정 등록은 받지않습니다."
 
@@ -328,6 +279,19 @@ msgstr "미등록"
 msgid "Last update:"
 msgstr "마지막 업데이트:"
 
+#: allianceauth/corputils/templates/corputils/corpstats.html:74
+#: allianceauth/corputils/templates/corputils/corpstats.html:112
+#: allianceauth/corputils/templates/corputils/corpstats.html:156
+#: allianceauth/corputils/templates/corputils/search.html:13
+#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html:22
+#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:26
+#: allianceauth/groupmanagement/templates/groupmanagement/audit.html:30
+#: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:29
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:55
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:112
+msgid "Character"
+msgstr "캐릭터"
+
 #: allianceauth/corputils/templates/corputils/corpstats.html:75
 #: allianceauth/corputils/templates/corputils/search.html:14
 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:31
@@ -657,24 +621,19 @@ msgstr ""
 msgid "Group Management"
 msgstr "그룹 관리"
 
-#: allianceauth/groupmanagement/forms.py:18
+#: allianceauth/groupmanagement/forms.py:15
-#: allianceauth/permissions_tool/templates/permissions_tool/overview.html:35
-msgid "Users"
-msgstr "사용자"
-
-#: allianceauth/groupmanagement/forms.py:52
 msgid "This name has been reserved and can not be used for groups."
 msgstr "이 이름은 이미 사용되었으며 그룹의 이름으로 사용될 수 없습니다."
 
-#: allianceauth/groupmanagement/forms.py:62
+#: allianceauth/groupmanagement/forms.py:25
 msgid "(auto)"
 msgstr "(자동)"
 
-#: allianceauth/groupmanagement/forms.py:71
+#: allianceauth/groupmanagement/forms.py:34
 msgid "There already exists a group with that name."
 msgstr "이 이름을 가진 그룹이 이미 있습니다."
 
-#: allianceauth/groupmanagement/models.py:104
+#: allianceauth/groupmanagement/models.py:105
 msgid ""
 "Internal group, users cannot see, join or request to join this "
 "group.<br>Used for groups such as Members, Corp_*, Alliance_* "
@@ -683,11 +642,11 @@ msgstr ""
 "시스템 그룹, 유저들은 이 그룹을 보거나, 참여하거나, 지원할 수 없습니다. <br>멤버, 코퍼레이션_*, 얼라이언스_* 등에 "
 "사용됨.<br><b>선택된 경우 비공개와 공개 옵션을 무시함.</b>"
 
-#: allianceauth/groupmanagement/models.py:112
+#: allianceauth/groupmanagement/models.py:113
 msgid "Group is hidden from users but can still join with the correct link."
 msgstr "비공개 그룹이지만 링크를 통해 참여할 수 있음."
 
-#: allianceauth/groupmanagement/models.py:118
+#: allianceauth/groupmanagement/models.py:119
 msgid ""
 "Group is open and users will be automatically added upon request.<br>If the "
 "group is not open users will need their request manually approved."
@@ -695,7 +654,7 @@ msgstr ""
 "그룹은 공개되어 있으며 요청 시 유저는 자동적으로 추가됩니다.<br>그룹이 공개되어 있지 않은 경우, 유저는 직접 요청을 승인받아야 "
 "합니다."
 
-#: allianceauth/groupmanagement/models.py:125
+#: allianceauth/groupmanagement/models.py:126
 msgid ""
 "Group is public. Any registered user is able to join this group, with "
 "visibility based on the other options set for this group.<br>Auth will not "
@@ -705,13 +664,13 @@ msgstr ""
 "공개 그룹입니다.  등록된 모든 유저는 이 그룹에 참여할 수 있으며, 이 그룹의 설정에 따라 공개 여부가 달라집니다.<br>유저가 더 "
 "이상 인증을 하지 않을 때, Auth는 이 그룹에서 유저를 자동 추방하지 않습니다."
 
-#: allianceauth/groupmanagement/models.py:134
+#: allianceauth/groupmanagement/models.py:135
 msgid ""
 "Group is restricted. This means that adding or removing users for this group"
 " requires a superuser admin."
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:143
+#: allianceauth/groupmanagement/models.py:144
 msgid ""
 "Group leaders can process requests for this group. Use the "
 "<code>auth.group_management</code> permission to allow a user to manage all "
@@ -720,7 +679,7 @@ msgstr ""
 "그룹 리더는 이 그룹의 요청을 처리할 수 있습니다. <code>auth.group_management</code> 권한을 사용하여 "
 "사용자가 모든 그룹을 관리할 수 있도록 합니다.<br>"
 
-#: allianceauth/groupmanagement/models.py:153
+#: allianceauth/groupmanagement/models.py:154
 msgid ""
 "Members of leader groups can process requests for this group. Use the "
 "<code>auth.group_management</code> permission to allow a user to manage all "
@@ -729,46 +688,46 @@ msgstr ""
 "리더 그룹의 구성원은 이 그룹에 대한 요청을 처리할 수 있습니다. <code>1auth.group_management1</code> "
 "권한을 사용하여 사용자가 모든 그룹을 관리할 수 있도록 합니다.<br>"
 
-#: allianceauth/groupmanagement/models.py:162
+#: allianceauth/groupmanagement/models.py:163
 msgid ""
 "States listed here will have the ability to join this group provided they "
 "have the proper permissions.<br>"
 msgstr "만약 그들이 적절한 권한을 가졌다면, 여기 목록에 있는 신분 상태는 이 그룹에 가입할 수 있습니다."
 
-#: allianceauth/groupmanagement/models.py:170
+#: allianceauth/groupmanagement/models.py:171
 msgid ""
 "Short description <i>(max. 512 characters)</i> of the group shown to users."
 msgstr "사용자에게 나타나는 그룹에 대한 간단한 설명 <i>(최대 512자)</i> 입니다."
 
-#: allianceauth/groupmanagement/models.py:177
+#: allianceauth/groupmanagement/models.py:178
 msgid "Can request non-public groups"
 msgstr "공용 그룹에 가입할 수 없음"
 
-#: allianceauth/groupmanagement/models.py:208
+#: allianceauth/groupmanagement/models.py:209
 msgid "name"
 msgstr "이름"
 
-#: allianceauth/groupmanagement/models.py:211
+#: allianceauth/groupmanagement/models.py:212
 msgid "Name that can not be used for groups."
 msgstr "그룹에 사용할 수 없는 이름입니다."
 
-#: allianceauth/groupmanagement/models.py:214
+#: allianceauth/groupmanagement/models.py:215
 msgid "reason"
 msgstr "원인"
 
-#: allianceauth/groupmanagement/models.py:214
+#: allianceauth/groupmanagement/models.py:215
 msgid "Reason why this name is reserved."
 msgstr "이 이름이 예약된 이유입니다."
 
-#: allianceauth/groupmanagement/models.py:217
+#: allianceauth/groupmanagement/models.py:218
 msgid "created by"
 msgstr "생성자:"
 
-#: allianceauth/groupmanagement/models.py:222
+#: allianceauth/groupmanagement/models.py:223
 msgid "created at"
 msgstr "생성일:"
 
-#: allianceauth/groupmanagement/models.py:222
+#: allianceauth/groupmanagement/models.py:223
 msgid "Date when this entry was created"
 msgstr "이 항목이 생성된 날짜"
 
@@ -995,86 +954,86 @@ msgstr "그룹 요청"
 msgid "Group Membership"
 msgstr "참가 중인 그룹"
 
-#: allianceauth/groupmanagement/views.py:166
+#: allianceauth/groupmanagement/views.py:163
 #, python-format
 msgid "Removed user %(user)s from group %(group)s."
 msgstr "유저 %(user)s이(가) %(group)s에서 제거됨."
 
-#: allianceauth/groupmanagement/views.py:168
+#: allianceauth/groupmanagement/views.py:165
 msgid "User does not exist in that group"
 msgstr "사용자가 해당 그룹에 존재하지 않음."
 
-#: allianceauth/groupmanagement/views.py:171
+#: allianceauth/groupmanagement/views.py:168
 msgid "Group does not exist"
 msgstr "그룹이 존재하지 않음."
 
-#: allianceauth/groupmanagement/views.py:198
+#: allianceauth/groupmanagement/views.py:195
 #, python-format
 msgid "Accepted application from %(mainchar)s to %(group)s."
 msgstr "%(mainchar)s의 %(group)s 그룹 신청 수락"
 
-#: allianceauth/groupmanagement/views.py:204
+#: allianceauth/groupmanagement/views.py:201
-#: allianceauth/groupmanagement/views.py:235
+#: allianceauth/groupmanagement/views.py:232
 #, python-format
 msgid ""
 "An unhandled error occurred while processing the application from "
 "%(mainchar)s to %(group)s."
 msgstr "%(mainchar)s의 %(group)s 그룹 신청을 처리하는 중 알 수 없는 에러 발생"
 
-#: allianceauth/groupmanagement/views.py:229
+#: allianceauth/groupmanagement/views.py:226
 #, python-format
 msgid "Rejected application from %(mainchar)s to %(group)s."
 msgstr "%(mainchar)s의 %(group)s 그룹 신청 거절"
 
-#: allianceauth/groupmanagement/views.py:264
+#: allianceauth/groupmanagement/views.py:261
 #, python-format
 msgid "Accepted application from %(mainchar)s to leave %(group)s."
 msgstr "%(mainchar)s의 %(group)s 그룹 탈퇴 수락"
 
-#: allianceauth/groupmanagement/views.py:269
+#: allianceauth/groupmanagement/views.py:266
-#: allianceauth/groupmanagement/views.py:301
+#: allianceauth/groupmanagement/views.py:298
 #, python-format
 msgid ""
 "An unhandled error occurred while processing the application from "
 "%(mainchar)s to leave %(group)s."
 msgstr "%(mainchar)s의 %(group)s 그룹 탈퇴를 처리하는 중 알 수 없는 에러 발생"
 
-#: allianceauth/groupmanagement/views.py:295
+#: allianceauth/groupmanagement/views.py:292
 #, python-format
 msgid "Rejected application from %(mainchar)s to leave %(group)s."
 msgstr "%(mainchar)s의 %(group)s 그룹 탈퇴 거절"
 
-#: allianceauth/groupmanagement/views.py:339
+#: allianceauth/groupmanagement/views.py:336
-#: allianceauth/groupmanagement/views.py:349
+#: allianceauth/groupmanagement/views.py:346
 msgid "You cannot join that group"
 msgstr "해당 그룹에 참여할 수 없습니다."
 
-#: allianceauth/groupmanagement/views.py:344
+#: allianceauth/groupmanagement/views.py:341
 msgid "You are already a member of that group."
 msgstr "이미 해당 그룹에 가입되어 있습니다."
 
-#: allianceauth/groupmanagement/views.py:361
+#: allianceauth/groupmanagement/views.py:358
 msgid "You already have a pending application for that group."
 msgstr "해당 그룹에 대한 참여신청이 보류되었습니다."
 
-#: allianceauth/groupmanagement/views.py:370
+#: allianceauth/groupmanagement/views.py:367
 #, python-format
 msgid "Applied to group %(group)s."
 msgstr "%(group)s그룹에 지원하였음."
 
-#: allianceauth/groupmanagement/views.py:380
+#: allianceauth/groupmanagement/views.py:377
 msgid "You cannot leave that group"
 msgstr "해당 그룹을 떠날 수 없습니다."
 
-#: allianceauth/groupmanagement/views.py:384
+#: allianceauth/groupmanagement/views.py:381
 msgid "You are not a member of that group"
 msgstr "해당그룹의 멤버가 아닙니다."
 
-#: allianceauth/groupmanagement/views.py:396
+#: allianceauth/groupmanagement/views.py:393
 msgid "You already have a pending leave request for that group."
 msgstr "해당 그룹의 탈퇴 신청이 접수된 상태입니다."
 
-#: allianceauth/groupmanagement/views.py:412
+#: allianceauth/groupmanagement/views.py:409
 #, python-format
 msgid "Applied to leave group %(group)s."
 msgstr "%(group)s그룹의 탈퇴가 신청됨."
@@ -1136,6 +1095,16 @@ msgstr "지원서 작성"
 msgid "Username"
 msgstr "사용자명"
 
+#: allianceauth/hrapplications/templates/hrapplications/management.html:28
+#: allianceauth/hrapplications/templates/hrapplications/management.html:83
+#: allianceauth/hrapplications/templates/hrapplications/management.html:127
+#: allianceauth/hrapplications/templates/hrapplications/searchview.html:27
+#: allianceauth/hrapplications/templates/hrapplications/view.html:73
+#: allianceauth/srp/templates/srp/data.html:101
+#: allianceauth/srp/templates/srp/management.html:44
+msgid "Actions"
+msgstr "활동"
+
 #: allianceauth/hrapplications/templates/hrapplications/management.html:38
 #: allianceauth/hrapplications/templates/hrapplications/management.html:99
 #: allianceauth/hrapplications/templates/hrapplications/management.html:143
@@ -1474,6 +1443,10 @@ msgstr "모델"
 msgid "Code Name"
 msgstr "코드명"
 
+#: allianceauth/permissions_tool/templates/permissions_tool/overview.html:35
+msgid "Users"
+msgstr "사용자"
+
 #: allianceauth/permissions_tool/templates/permissions_tool/overview.html:41
 msgid "States"
 msgstr "상태"
@@ -2197,11 +2170,11 @@ msgid ""
 msgstr ""
 
 #: allianceauth/templates/allianceauth/admin-status/overview.html:95
-msgid "running"
+#, python-format
-msgstr ""
+msgid ""
-
+"\n"
-#: allianceauth/templates/allianceauth/admin-status/overview.html:96
+"                        %(queue_length)s queued tasks\n"
-msgid "queued"
+"                        "
 msgstr ""
 
 #: allianceauth/templates/allianceauth/top-menu-admin.html:9
@@ -2217,11 +2190,11 @@ msgid "AA Support Discord"
 msgstr "AA Support Discord"
 
 #: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:10
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:16
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:14
 msgid "User Menu"
 msgstr "사용자 매뉴"
 
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:67
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:56
 msgid "Logout"
 msgstr "로그아웃"
 
@@ -2277,30 +2250,22 @@ msgid "Objective"
 msgstr "목표 대상"
 
 #: allianceauth/timerboard/form.py:64
-msgid "Absolute Timer"
-msgstr ""
-
-#: allianceauth/timerboard/form.py:65
-msgid "Date and Time"
-msgstr ""
-
-#: allianceauth/timerboard/form.py:66
 msgid "Days Remaining"
 msgstr "남은 일수"
 
-#: allianceauth/timerboard/form.py:67
+#: allianceauth/timerboard/form.py:65
 msgid "Hours Remaining"
 msgstr "남은 시간"
 
-#: allianceauth/timerboard/form.py:69
+#: allianceauth/timerboard/form.py:67
 msgid "Minutes Remaining"
 msgstr "남은 분"
 
-#: allianceauth/timerboard/form.py:71
+#: allianceauth/timerboard/form.py:69
 msgid "Important"
 msgstr "중요"
 
-#: allianceauth/timerboard/form.py:72
+#: allianceauth/timerboard/form.py:70
 msgid "Corp-Restricted"
 msgstr "코퍼레이션 제한"
 

allianceauth/locale/ru/LC_MESSAGES/django.po

@@ -4,9 +4,9 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Андрей Зубков <and.vareba81@gmail.com>, 2023
+# Alexander Gess <de.alex.gess@gmail.com>, 2020
-# Yuriy K <thedjcooltv@gmail.com>, 2023
+# Yuriy K <thedjcooltv@gmail.com>, 2020
-# Alexander Gess <de.alex.gess@gmail.com>, 2023
+# Андрей Зубков <and.vareba81@gmail.com>, 2020
 # Filipp Chertiev <f@fzfx.ru>, 2023
 # 
 #, fuzzy
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-17 18:50+1000\n"
+"POT-Creation-Date: 2022-10-09 18:20+1000\n"
-"PO-Revision-Date: 2023-11-08 13:50+0000\n"
+"PO-Revision-Date: 2020-02-18 03:14+0000\n"
 "Last-Translator: Filipp Chertiev <f@fzfx.ru>, 2023\n"
 "Language-Team: Russian (https://app.transifex.com/alliance-auth/teams/107430/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr "Google Analytics Universal"
 msgid "Google Analytics V4"
 msgstr "Google Analytics V4"
 
-#: allianceauth/authentication/decorators.py:49
+#: allianceauth/authentication/decorators.py:37
 msgid "A main character is required to perform that action. Add one below."
 msgstr ""
 "Для продолжения следует указать основного персонажа. Выберите его ниже."
@@ -46,68 +46,63 @@ msgstr "Email"
 msgid "You are not allowed to add or remove these restricted groups: %s"
 msgstr "Вам не разрешено добавлять или удалять эти ограниченные группы: %s"
 
-#: allianceauth/authentication/models.py:71
+#: allianceauth/authentication/models.py:80
 msgid "English"
 msgstr "Английский"
 
-#: allianceauth/authentication/models.py:72
+#: allianceauth/authentication/models.py:81
 msgid "German"
 msgstr "Немецкий"
 
-#: allianceauth/authentication/models.py:73
+#: allianceauth/authentication/models.py:82
 msgid "Spanish"
 msgstr "Испанский"
 
-#: allianceauth/authentication/models.py:74
+#: allianceauth/authentication/models.py:83
 msgid "Chinese Simplified"
 msgstr "Китайский упрощённый"
 
-#: allianceauth/authentication/models.py:75
+#: allianceauth/authentication/models.py:84
 msgid "Russian"
 msgstr "Русский"
 
-#: allianceauth/authentication/models.py:76
+#: allianceauth/authentication/models.py:85
 msgid "Korean"
 msgstr "Корейский"
 
-#: allianceauth/authentication/models.py:77
+#: allianceauth/authentication/models.py:86
 msgid "French"
 msgstr "Французский"
 
-#: allianceauth/authentication/models.py:78
+#: allianceauth/authentication/models.py:87
 msgid "Japanese"
 msgstr "Японский"
 
-#: allianceauth/authentication/models.py:79
+#: allianceauth/authentication/models.py:88
 msgid "Italian"
 msgstr "Итальянский"
 
-#: allianceauth/authentication/models.py:80
+#: allianceauth/authentication/models.py:91
-msgid "Ukrainian"
-msgstr ""
-
-#: allianceauth/authentication/models.py:96
 msgid "Language"
 msgstr "Язык"
 
-#: allianceauth/authentication/models.py:101
+#: allianceauth/authentication/models.py:96
 #: allianceauth/templates/allianceauth/night-toggle.html:6
 msgid "Night Mode"
 msgstr "Ночной режим"
 
-#: allianceauth/authentication/models.py:115
+#: allianceauth/authentication/models.py:110
 #, python-format
 msgid "State changed to: %s"
 msgstr "Статус изменен: %s"
 
-#: allianceauth/authentication/models.py:116
+#: allianceauth/authentication/models.py:111
 #, python-format
 msgid "Your user's state is now: %(state)s"
 msgstr "Статус пилота: %(state)s"
 
 #: allianceauth/authentication/templates/authentication/dashboard.html:4
 #: allianceauth/authentication/templates/authentication/dashboard.html:7
-#: allianceauth/authentication/templates/authentication/tokens.html:4
 #: allianceauth/templates/allianceauth/side-menu.html:10
 msgid "Dashboard"
 msgstr "Панель показателей"
@@ -166,50 +161,8 @@ msgstr "Корпорация"
 msgid "Alliance"
 msgstr "Альянс"
 
-#: allianceauth/authentication/templates/authentication/tokens.html:7
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:62
-msgid "Token Management"
-msgstr ""
-
-#: allianceauth/authentication/templates/authentication/tokens.html:12
-msgid "Scopes"
-msgstr ""
-
-#: allianceauth/authentication/templates/authentication/tokens.html:13
-#: allianceauth/hrapplications/templates/hrapplications/management.html:28
-#: allianceauth/hrapplications/templates/hrapplications/management.html:83
-#: allianceauth/hrapplications/templates/hrapplications/management.html:127
-#: allianceauth/hrapplications/templates/hrapplications/searchview.html:27
-#: allianceauth/hrapplications/templates/hrapplications/view.html:73
-#: allianceauth/srp/templates/srp/data.html:101
-#: allianceauth/srp/templates/srp/management.html:44
-msgid "Actions"
-msgstr "Действия"
-
-#: allianceauth/authentication/templates/authentication/tokens.html:14
-#: allianceauth/corputils/templates/corputils/corpstats.html:74
-#: allianceauth/corputils/templates/corputils/corpstats.html:112
-#: allianceauth/corputils/templates/corputils/corpstats.html:156
-#: allianceauth/corputils/templates/corputils/search.html:13
-#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html:22
-#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:26
-#: allianceauth/groupmanagement/templates/groupmanagement/audit.html:30
-#: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:29
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:55
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:112
-msgid "Character"
-msgstr "Персонаж"
-
-#: allianceauth/authentication/templates/authentication/tokens.html:28
-msgid ""
-"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."
-msgstr ""
-
 #: allianceauth/authentication/templates/public/login.html:6
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:69
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:58
 msgid "Login"
 msgstr "Вход"
 
@@ -242,7 +195,7 @@ msgstr "Регистрация"
 msgid "Invalid or expired activation link."
 msgstr "Ссылка активации устарела"
 
-#: allianceauth/authentication/views.py:118
+#: allianceauth/authentication/views.py:77
 #, python-format
 msgid ""
 "Cannot change main character to %(char)s: character owned by a different "
@@ -250,42 +203,40 @@ msgid ""
 msgstr ""
 "Нельзя сменить основного персонажа на %(char)s: похоже, что Владелец не Вы. "
 
-#: allianceauth/authentication/views.py:124
+#: allianceauth/authentication/views.py:83
 #, python-format
 msgid "Changed main character to %(char)s"
 msgstr "Основной персонаж заменен на %(char)s"
 
-#: allianceauth/authentication/views.py:133
+#: allianceauth/authentication/views.py:92
 #, python-format
 msgid "Added %(name)s to your account."
 msgstr "Добавлен %(name)s на Ваш аккаунт."
 
-#: allianceauth/authentication/views.py:135
+#: allianceauth/authentication/views.py:94
 #, python-format
 msgid "Failed to add %(name)s to your account: they already have an account."
 msgstr "Персонаж %(name)s уже добавлен."
 
-#: allianceauth/authentication/views.py:178
+#: allianceauth/authentication/views.py:133
-msgid ""
+msgid "Unable to authenticate as the selected character."
-"Unable to authenticate as the selected character. Please log in with the "
+msgstr "Невозможно авторизировать этого персонажа. "
-"main character associated with this account."
-msgstr ""
 
-#: allianceauth/authentication/views.py:244
+#: allianceauth/authentication/views.py:197
 msgid "Registration token has expired."
 msgstr "Регистрационный токен просрочен."
 
-#: allianceauth/authentication/views.py:302
+#: allianceauth/authentication/views.py:252
 msgid ""
 "Sent confirmation email. Please follow the link to confirm your email "
 "address."
 msgstr "Отправить подтверждающее письмо. Пожалуйста, подтвердите почту.  "
 
-#: allianceauth/authentication/views.py:307
+#: allianceauth/authentication/views.py:257
 msgid "Confirmed your email address. Please login to continue."
 msgstr "Подтвердите Ваш email адрес. Зайти для подтверждения. "
 
-#: allianceauth/authentication/views.py:312
+#: allianceauth/authentication/views.py:262
 msgid "Registration of new accounts is not allowed at this time."
 msgstr "Регистрация новых аккаунтов в настоящее время невозможна."
 
@@ -328,6 +279,19 @@ msgstr "Не зарегистрированы"
 msgid "Last update:"
 msgstr "Последнее обновление: "
 
+#: allianceauth/corputils/templates/corputils/corpstats.html:74
+#: allianceauth/corputils/templates/corputils/corpstats.html:112
+#: allianceauth/corputils/templates/corputils/corpstats.html:156
+#: allianceauth/corputils/templates/corputils/search.html:13
+#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html:22
+#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:26
+#: allianceauth/groupmanagement/templates/groupmanagement/audit.html:30
+#: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:29
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:55
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:112
+msgid "Character"
+msgstr "Персонаж"
+
 #: allianceauth/corputils/templates/corputils/corpstats.html:75
 #: allianceauth/corputils/templates/corputils/search.html:14
 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:31
@@ -665,25 +629,20 @@ msgstr ""
 msgid "Group Management"
 msgstr "Управление Группой"
 
-#: allianceauth/groupmanagement/forms.py:18
+#: allianceauth/groupmanagement/forms.py:15
-#: allianceauth/permissions_tool/templates/permissions_tool/overview.html:35
-msgid "Users"
-msgstr "Пользователи"
-
-#: allianceauth/groupmanagement/forms.py:52
 msgid "This name has been reserved and can not be used for groups."
 msgstr ""
 "Это имя является зарезервированным и не может быть использовано для групп."
 
-#: allianceauth/groupmanagement/forms.py:62
+#: allianceauth/groupmanagement/forms.py:25
 msgid "(auto)"
 msgstr "(авто)"
 
-#: allianceauth/groupmanagement/forms.py:71
+#: allianceauth/groupmanagement/forms.py:34
 msgid "There already exists a group with that name."
 msgstr "Группа с таким именем уже существует."
 
-#: allianceauth/groupmanagement/models.py:104
+#: allianceauth/groupmanagement/models.py:105
 msgid ""
 "Internal group, users cannot see, join or request to join this "
 "group.<br>Used for groups such as Members, Corp_*, Alliance_* "
@@ -694,13 +653,13 @@ msgstr ""
 "Members, Corp_*, Alliance_* и т. п.<br><b>Будучи выбранной, отменяет "
 "настройки \"Скрытая\" и \"Открытая\".</b>"
 
-#: allianceauth/groupmanagement/models.py:112
+#: allianceauth/groupmanagement/models.py:113
 msgid "Group is hidden from users but can still join with the correct link."
 msgstr ""
 "Группы скрыты от пользователей, но к ним всё ещё можно присоединиться с "
 "помощью корректной ссылки."
 
-#: allianceauth/groupmanagement/models.py:118
+#: allianceauth/groupmanagement/models.py:119
 msgid ""
 "Group is open and users will be automatically added upon request.<br>If the "
 "group is not open users will need their request manually approved."
@@ -709,7 +668,7 @@ msgstr ""
 "при отправке запроса.<br>Если группа не является открытой, запросы от "
 "пользователей будут требовать ручного подтверждения."
 
-#: allianceauth/groupmanagement/models.py:125
+#: allianceauth/groupmanagement/models.py:126
 msgid ""
 "Group is public. Any registered user is able to join this group, with "
 "visibility based on the other options set for this group.<br>Auth will not "
@@ -721,7 +680,7 @@ msgstr ""
 "настройках данной группы.<br>Auth не будет удалять пользователей из этой "
 "группы автоматически при окончании срока их аутентификации."
 
-#: allianceauth/groupmanagement/models.py:134
+#: allianceauth/groupmanagement/models.py:135
 msgid ""
 "Group is restricted. This means that adding or removing users for this group"
 " requires a superuser admin."
@@ -729,7 +688,7 @@ msgstr ""
 "Группа является ограниченной. Это значит что добавление пользователей в эту "
 "группу или удаление из неё требует прав superuser admin."
 
-#: allianceauth/groupmanagement/models.py:143
+#: allianceauth/groupmanagement/models.py:144
 msgid ""
 "Group leaders can process requests for this group. Use the "
 "<code>auth.group_management</code> permission to allow a user to manage all "
@@ -739,7 +698,7 @@ msgstr ""
 "Используйте разрешение <code>auth.group_management</code>, чтобы позволить "
 "пользователю управлять всеми группами.<br>"
 
-#: allianceauth/groupmanagement/models.py:153
+#: allianceauth/groupmanagement/models.py:154
 msgid ""
 "Members of leader groups can process requests for this group. Use the "
 "<code>auth.group_management</code> permission to allow a user to manage all "
@@ -749,7 +708,7 @@ msgstr ""
 "Используйте разрешение <code>auth.group_management</code>, чтобы позволить "
 "пользователю управлять всеми группами.<br>"
 
-#: allianceauth/groupmanagement/models.py:162
+#: allianceauth/groupmanagement/models.py:163
 msgid ""
 "States listed here will have the ability to join this group provided they "
 "have the proper permissions.<br>"
@@ -757,42 +716,42 @@ msgstr ""
 "Статусы, перечисленные здесь, смогут присоединиться к группе, если у них "
 "есть соответствующие разрешения.<br>"
 
-#: allianceauth/groupmanagement/models.py:170
+#: allianceauth/groupmanagement/models.py:171
 msgid ""
 "Short description <i>(max. 512 characters)</i> of the group shown to users."
 msgstr ""
 "Краткое описание <i>(макс. 512 символов)</i> группы, отображаемое "
 "пользователям."
 
-#: allianceauth/groupmanagement/models.py:177
+#: allianceauth/groupmanagement/models.py:178
 msgid "Can request non-public groups"
 msgstr "Можно отправлять запрос на непубличную группу."
 
-#: allianceauth/groupmanagement/models.py:208
+#: allianceauth/groupmanagement/models.py:209
 msgid "name"
 msgstr "имя"
 
-#: allianceauth/groupmanagement/models.py:211
+#: allianceauth/groupmanagement/models.py:212
 msgid "Name that can not be used for groups."
 msgstr "Имя, которое не может быть использовано для групп."
 
-#: allianceauth/groupmanagement/models.py:214
+#: allianceauth/groupmanagement/models.py:215
 msgid "reason"
 msgstr "причина"
 
-#: allianceauth/groupmanagement/models.py:214
+#: allianceauth/groupmanagement/models.py:215
 msgid "Reason why this name is reserved."
 msgstr "Причина, по которой это имя зарезервировано."
 
-#: allianceauth/groupmanagement/models.py:217
+#: allianceauth/groupmanagement/models.py:218
 msgid "created by"
 msgstr "создано кем"
 
-#: allianceauth/groupmanagement/models.py:222
+#: allianceauth/groupmanagement/models.py:223
 msgid "created at"
 msgstr "создано когда"
 
-#: allianceauth/groupmanagement/models.py:222
+#: allianceauth/groupmanagement/models.py:223
 msgid "Date when this entry was created"
 msgstr "Дата, когда данное содержимое было создано"
 
@@ -1019,26 +978,26 @@ msgstr "Групповой запрос"
 msgid "Group Membership"
 msgstr "Групповое участие"
 
-#: allianceauth/groupmanagement/views.py:166
+#: allianceauth/groupmanagement/views.py:163
 #, python-format
 msgid "Removed user %(user)s from group %(group)s."
 msgstr "Пользователь %(user)s исключен из %(group)s."
 
-#: allianceauth/groupmanagement/views.py:168
+#: allianceauth/groupmanagement/views.py:165
 msgid "User does not exist in that group"
 msgstr "Пользователь не существует в этой группе."
 
-#: allianceauth/groupmanagement/views.py:171
+#: allianceauth/groupmanagement/views.py:168
 msgid "Group does not exist"
 msgstr "Группа не существует."
 
-#: allianceauth/groupmanagement/views.py:198
+#: allianceauth/groupmanagement/views.py:195
 #, python-format
 msgid "Accepted application from %(mainchar)s to %(group)s."
 msgstr "Запрос от %(mainchar)sв %(group)s принят."
 
-#: allianceauth/groupmanagement/views.py:204
+#: allianceauth/groupmanagement/views.py:201
-#: allianceauth/groupmanagement/views.py:235
+#: allianceauth/groupmanagement/views.py:232
 #, python-format
 msgid ""
 "An unhandled error occurred while processing the application from "
@@ -1047,18 +1006,18 @@ msgstr ""
 "Персонаж %(mainchar)s не может быть добавлен %(group)s, из-за непредвиденной"
 " ошибки. "
 
-#: allianceauth/groupmanagement/views.py:229
+#: allianceauth/groupmanagement/views.py:226
 #, python-format
 msgid "Rejected application from %(mainchar)s to %(group)s."
 msgstr "%(mainchar)s исключен из %(group)s."
 
-#: allianceauth/groupmanagement/views.py:264
+#: allianceauth/groupmanagement/views.py:261
 #, python-format
 msgid "Accepted application from %(mainchar)s to leave %(group)s."
 msgstr "Утвержден выход %(mainchar)s из %(group)s.  "
 
-#: allianceauth/groupmanagement/views.py:269
+#: allianceauth/groupmanagement/views.py:266
-#: allianceauth/groupmanagement/views.py:301
+#: allianceauth/groupmanagement/views.py:298
 #, python-format
 msgid ""
 "An unhandled error occurred while processing the application from "
@@ -1067,42 +1026,42 @@ msgstr ""
 "Возникла ошибка во время обработки %(mainchar)s на выход из группы "
 "%(group)s. Повторите позже."
 
-#: allianceauth/groupmanagement/views.py:295
+#: allianceauth/groupmanagement/views.py:292
 #, python-format
 msgid "Rejected application from %(mainchar)s to leave %(group)s."
 msgstr "Прошение об исключении %(mainchar)s из %(group)s – отклонено. "
 
-#: allianceauth/groupmanagement/views.py:339
+#: allianceauth/groupmanagement/views.py:336
-#: allianceauth/groupmanagement/views.py:349
+#: allianceauth/groupmanagement/views.py:346
 msgid "You cannot join that group"
 msgstr "Вы не можете вступить"
 
-#: allianceauth/groupmanagement/views.py:344
+#: allianceauth/groupmanagement/views.py:341
 msgid "You are already a member of that group."
 msgstr "Вы уже участник этой группы."
 
-#: allianceauth/groupmanagement/views.py:361
+#: allianceauth/groupmanagement/views.py:358
 msgid "You already have a pending application for that group."
 msgstr "Вы уже подали заявку на вступление этой группы."
 
-#: allianceauth/groupmanagement/views.py:370
+#: allianceauth/groupmanagement/views.py:367
 #, python-format
 msgid "Applied to group %(group)s."
 msgstr "Вступить в группу %(group)s."
 
-#: allianceauth/groupmanagement/views.py:380
+#: allianceauth/groupmanagement/views.py:377
 msgid "You cannot leave that group"
 msgstr "Вы не можете покинуть эту группу"
 
-#: allianceauth/groupmanagement/views.py:384
+#: allianceauth/groupmanagement/views.py:381
 msgid "You are not a member of that group"
 msgstr "Вы не участник группыы"
 
-#: allianceauth/groupmanagement/views.py:396
+#: allianceauth/groupmanagement/views.py:393
 msgid "You already have a pending leave request for that group."
 msgstr "Ваш запрос находится на рассмотрении"
 
-#: allianceauth/groupmanagement/views.py:412
+#: allianceauth/groupmanagement/views.py:409
 #, python-format
 msgid "Applied to leave group %(group)s."
 msgstr "Запрос на выход из группы %(group)s."
@@ -1164,6 +1123,16 @@ msgstr "Сделать запрос"
 msgid "Username"
 msgstr "Пользователь"
 
+#: allianceauth/hrapplications/templates/hrapplications/management.html:28
+#: allianceauth/hrapplications/templates/hrapplications/management.html:83
+#: allianceauth/hrapplications/templates/hrapplications/management.html:127
+#: allianceauth/hrapplications/templates/hrapplications/searchview.html:27
+#: allianceauth/hrapplications/templates/hrapplications/view.html:73
+#: allianceauth/srp/templates/srp/data.html:101
+#: allianceauth/srp/templates/srp/management.html:44
+msgid "Actions"
+msgstr "Действия"
+
 #: allianceauth/hrapplications/templates/hrapplications/management.html:38
 #: allianceauth/hrapplications/templates/hrapplications/management.html:99
 #: allianceauth/hrapplications/templates/hrapplications/management.html:143
@@ -1502,6 +1471,10 @@ msgstr "Модель"
 msgid "Code Name"
 msgstr "Кодовое имя"
 
+#: allianceauth/permissions_tool/templates/permissions_tool/overview.html:35
+msgid "Users"
+msgstr "Пользователи"
+
 #: allianceauth/permissions_tool/templates/permissions_tool/overview.html:41
 msgid "States"
 msgstr "Статусы"
@@ -2243,12 +2216,14 @@ msgstr ""
 "            Статус %(total)s обработанных задач • последние %(latest)s"
 
 #: allianceauth/templates/allianceauth/admin-status/overview.html:95
-msgid "running"
+#, python-format
-msgstr ""
+msgid ""
-
+"\n"
-#: allianceauth/templates/allianceauth/admin-status/overview.html:96
+"                        %(queue_length)s queued tasks\n"
-msgid "queued"
+"                        "
 msgstr ""
+"\n"
+"                  %(queue_length)s запланированных задач"
 
 #: allianceauth/templates/allianceauth/top-menu-admin.html:9
 msgid "Admin"
@@ -2263,11 +2238,11 @@ msgid "AA Support Discord"
 msgstr "Discord поддержки AA"
 
 #: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:10
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:16
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:14
 msgid "User Menu"
 msgstr "Меню пользователя"
 
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:67
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:56
 msgid "Logout"
 msgstr "Выход"
 
@@ -2323,30 +2298,22 @@ msgid "Objective"
 msgstr "Задача"
 
 #: allianceauth/timerboard/form.py:64
-msgid "Absolute Timer"
-msgstr ""
-
-#: allianceauth/timerboard/form.py:65
-msgid "Date and Time"
-msgstr ""
-
-#: allianceauth/timerboard/form.py:66
 msgid "Days Remaining"
 msgstr "Дней осталось"
 
-#: allianceauth/timerboard/form.py:67
+#: allianceauth/timerboard/form.py:65
 msgid "Hours Remaining"
 msgstr "Часов осталось"
 
-#: allianceauth/timerboard/form.py:69
+#: allianceauth/timerboard/form.py:67
 msgid "Minutes Remaining"
 msgstr "Минут осталось"
 
-#: allianceauth/timerboard/form.py:71
+#: allianceauth/timerboard/form.py:69
 msgid "Important"
 msgstr "Важно"
 
-#: allianceauth/timerboard/form.py:72
+#: allianceauth/timerboard/form.py:70
 msgid "Corp-Restricted"
 msgstr "Корпорация зарегистрированна"
 

allianceauth/locale/uk/LC_MESSAGES/django.po

@@ -4,7 +4,6 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Denys Ivchenko, 2023
 # Kristof Swensen, 2023
 # 
 #, fuzzy
@@ -12,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-17 18:50+1000\n"
+"POT-Creation-Date: 2022-10-09 18:20+1000\n"
-"PO-Revision-Date: 2023-11-08 13:50+0000\n"
+"PO-Revision-Date: 2020-02-18 03:14+0000\n"
 "Last-Translator: Kristof Swensen, 2023\n"
 "Language-Team: Ukrainian (https://app.transifex.com/alliance-auth/teams/107430/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -30,10 +29,10 @@ msgstr "Універсальна Google Аналітика"
 msgid "Google Analytics V4"
 msgstr "Google Analytics V4"
 
-#: allianceauth/authentication/decorators.py:49
+#: allianceauth/authentication/decorators.py:37
 msgid "A main character is required to perform that action. Add one below."
 msgstr ""
-"Для виконання цієї дії потрібен основний персонаж. Додайте його нижче."
+"Для виконання цієї дії потрібен головний персонаж. Додайте його нижче."
 
 #: allianceauth/authentication/forms.py:12
 msgid "Email"
@@ -44,68 +43,63 @@ msgstr "Електронна пошта"
 msgid "You are not allowed to add or remove these restricted groups: %s"
 msgstr "Вам заборонено додавати або видаляти ці обмежені групи: %s"
 
-#: allianceauth/authentication/models.py:71
+#: allianceauth/authentication/models.py:80
 msgid "English"
 msgstr "Англійська"
 
-#: allianceauth/authentication/models.py:72
+#: allianceauth/authentication/models.py:81
 msgid "German"
 msgstr "Німецька"
 
-#: allianceauth/authentication/models.py:73
+#: allianceauth/authentication/models.py:82
 msgid "Spanish"
 msgstr "Іспанська"
 
-#: allianceauth/authentication/models.py:74
+#: allianceauth/authentication/models.py:83
 msgid "Chinese Simplified"
 msgstr "Китайська спрощена"
 
-#: allianceauth/authentication/models.py:75
+#: allianceauth/authentication/models.py:84
 msgid "Russian"
 msgstr "Російська"
 
-#: allianceauth/authentication/models.py:76
+#: allianceauth/authentication/models.py:85
 msgid "Korean"
 msgstr "Корейська"
 
-#: allianceauth/authentication/models.py:77
+#: allianceauth/authentication/models.py:86
 msgid "French"
 msgstr "Французька"
 
-#: allianceauth/authentication/models.py:78
+#: allianceauth/authentication/models.py:87
 msgid "Japanese"
 msgstr "Японська"
 
-#: allianceauth/authentication/models.py:79
+#: allianceauth/authentication/models.py:88
 msgid "Italian"
 msgstr "Італійська"
 
-#: allianceauth/authentication/models.py:80
+#: allianceauth/authentication/models.py:91
-msgid "Ukrainian"
-msgstr ""
-
-#: allianceauth/authentication/models.py:96
 msgid "Language"
 msgstr "Мова"
 
-#: allianceauth/authentication/models.py:101
+#: allianceauth/authentication/models.py:96
 #: allianceauth/templates/allianceauth/night-toggle.html:6
 msgid "Night Mode"
 msgstr "Нічний режим"
 
-#: allianceauth/authentication/models.py:115
+#: allianceauth/authentication/models.py:110
 #, python-format
 msgid "State changed to: %s"
 msgstr "Стан змінено на: %s"
 
-#: allianceauth/authentication/models.py:116
+#: allianceauth/authentication/models.py:111
 #, python-format
 msgid "Your user's state is now: %(state)s"
 msgstr "Стан вашого користувача зараз: %(state)s"
 
 #: allianceauth/authentication/templates/authentication/dashboard.html:4
 #: allianceauth/authentication/templates/authentication/dashboard.html:7
-#: allianceauth/authentication/templates/authentication/tokens.html:4
 #: allianceauth/templates/allianceauth/side-menu.html:10
 msgid "Dashboard"
 msgstr "Панель приладів"
@@ -130,7 +124,7 @@ msgstr "Додати персонажа"
 
 #: allianceauth/authentication/templates/authentication/dashboard.html:115
 msgid "Change Main"
-msgstr "Змінити основного персонажа"
+msgstr "Змінити головного персонажа"
 
 #: allianceauth/authentication/templates/authentication/dashboard.html:125
 msgid "Group Memberships"
@@ -163,50 +157,8 @@ msgstr "Корпорація"
 msgid "Alliance"
 msgstr "Альянс"
 
-#: allianceauth/authentication/templates/authentication/tokens.html:7
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:62
-msgid "Token Management"
-msgstr ""
-
-#: allianceauth/authentication/templates/authentication/tokens.html:12
-msgid "Scopes"
-msgstr ""
-
-#: allianceauth/authentication/templates/authentication/tokens.html:13
-#: allianceauth/hrapplications/templates/hrapplications/management.html:28
-#: allianceauth/hrapplications/templates/hrapplications/management.html:83
-#: allianceauth/hrapplications/templates/hrapplications/management.html:127
-#: allianceauth/hrapplications/templates/hrapplications/searchview.html:27
-#: allianceauth/hrapplications/templates/hrapplications/view.html:73
-#: allianceauth/srp/templates/srp/data.html:101
-#: allianceauth/srp/templates/srp/management.html:44
-msgid "Actions"
-msgstr "Дії"
-
-#: allianceauth/authentication/templates/authentication/tokens.html:14
-#: allianceauth/corputils/templates/corputils/corpstats.html:74
-#: allianceauth/corputils/templates/corputils/corpstats.html:112
-#: allianceauth/corputils/templates/corputils/corpstats.html:156
-#: allianceauth/corputils/templates/corputils/search.html:13
-#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html:22
-#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:26
-#: allianceauth/groupmanagement/templates/groupmanagement/audit.html:30
-#: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:29
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:55
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:112
-msgid "Character"
-msgstr "Персонаж"
-
-#: allianceauth/authentication/templates/authentication/tokens.html:28
-msgid ""
-"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."
-msgstr ""
-
 #: allianceauth/authentication/templates/public/login.html:6
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:69
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:58
 msgid "Login"
 msgstr "Увійти"
 
@@ -240,7 +192,7 @@ msgstr "Зареєструватися"
 msgid "Invalid or expired activation link."
 msgstr "Невірне або прострочене посилання для активації."
 
-#: allianceauth/authentication/views.py:118
+#: allianceauth/authentication/views.py:77
 #, python-format
 msgid ""
 "Cannot change main character to %(char)s: character owned by a different "
@@ -249,34 +201,32 @@ msgstr ""
 "Неможливо змінити основного персонажа на %(char)s: персонаж належить іншому "
 "акаунту."
 
-#: allianceauth/authentication/views.py:124
+#: allianceauth/authentication/views.py:83
 #, python-format
 msgid "Changed main character to %(char)s"
 msgstr "Основний персонаж змінено на %(char)s"
 
-#: allianceauth/authentication/views.py:133
+#: allianceauth/authentication/views.py:92
 #, python-format
 msgid "Added %(name)s to your account."
 msgstr "Додано %(name)s до вашого облікового запису."
 
-#: allianceauth/authentication/views.py:135
+#: allianceauth/authentication/views.py:94
 #, python-format
 msgid "Failed to add %(name)s to your account: they already have an account."
 msgstr ""
 "Не вдалося додати %(name)s до вашого облікового запису: у них вже є "
 "обліковий запис."
 
-#: allianceauth/authentication/views.py:178
+#: allianceauth/authentication/views.py:133
-msgid ""
+msgid "Unable to authenticate as the selected character."
-"Unable to authenticate as the selected character. Please log in with the "
+msgstr "Не вдалося автентифікуватися як обраний персонаж."
-"main character associated with this account."
-msgstr ""
 
-#: allianceauth/authentication/views.py:244
+#: allianceauth/authentication/views.py:197
 msgid "Registration token has expired."
 msgstr "Токен реєстрації застарів."
 
-#: allianceauth/authentication/views.py:302
+#: allianceauth/authentication/views.py:252
 msgid ""
 "Sent confirmation email. Please follow the link to confirm your email "
 "address."
@@ -284,13 +234,13 @@ msgstr ""
 "Відправлено лист з підтвердженням. Будь ласка, перейдіть за посиланням, щоб "
 "підтвердити свою адресу електронної пошти."
 
-#: allianceauth/authentication/views.py:307
+#: allianceauth/authentication/views.py:257
 msgid "Confirmed your email address. Please login to continue."
 msgstr ""
 "Підтверджено вашу адресу електронної пошти. Будь ласка, увійдіть, щоб "
 "продовжити."
 
-#: allianceauth/authentication/views.py:312
+#: allianceauth/authentication/views.py:262
 msgid "Registration of new accounts is not allowed at this time."
 msgstr "Реєстрація нових облікових записів наразі не дозволена."
 
@@ -333,6 +283,19 @@ msgstr "Незареєстровані"
 msgid "Last update:"
 msgstr "Останнє оновлення:"
 
+#: allianceauth/corputils/templates/corputils/corpstats.html:74
+#: allianceauth/corputils/templates/corputils/corpstats.html:112
+#: allianceauth/corputils/templates/corputils/corpstats.html:156
+#: allianceauth/corputils/templates/corputils/search.html:13
+#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html:22
+#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:26
+#: allianceauth/groupmanagement/templates/groupmanagement/audit.html:30
+#: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:29
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:55
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:112
+msgid "Character"
+msgstr "Персонаж"
+
 #: allianceauth/corputils/templates/corputils/corpstats.html:75
 #: allianceauth/corputils/templates/corputils/search.html:14
 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:31
@@ -389,7 +352,7 @@ msgstr "Не вдалося зібрати статистику корпорац
 
 #: allianceauth/fleetactivitytracking/auth_hooks.py:9
 msgid "Fleet Activity Tracking"
-msgstr "Відстеження активності флотів"
+msgstr "Відстеження активності флоту"
 
 #: allianceauth/fleetactivitytracking/forms.py:6 allianceauth/srp/form.py:8
 #: allianceauth/srp/templates/srp/management.html:35
@@ -493,7 +456,7 @@ msgstr "Корабель"
 #: allianceauth/timerboard/templates/timerboard/view.html:202
 #: allianceauth/timerboard/templates/timerboard/view.html:375
 msgid "Eve Time"
-msgstr "Ігровий час"
+msgstr "Час в грі"
 
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html:33
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:36
@@ -597,16 +560,16 @@ msgstr "Fats"
 
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html:4
 msgid "Fatlink Corp Statistics"
-msgstr "Статистика фатів корпорації"
+msgstr "Статистика корпорації Fatlink"
 
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html:23
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html:24
 msgid "Average fats"
-msgstr "Середній показник фатів"
+msgstr "Середній показник fats"
 
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html:4
 msgid "Fatlink statistics"
-msgstr "Статистика фатів"
+msgstr "Статистика Fatlink"
 
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html:20
 msgid "Ticker"
@@ -662,7 +625,7 @@ msgid ""
 "Cannot register the fleet participation for {character.character_name}. The "
 "character needs to be online."
 msgstr ""
-"Не вдалося зареєструвати участь в флоті для {character.character_name}. "
+"Не можна зареєструвати участь в флоті для {character.character_name}. "
 "Персонаж повинен бути в мережі."
 
 #: allianceauth/groupmanagement/auth_hooks.py:17
@@ -670,24 +633,19 @@ msgstr ""
 msgid "Group Management"
 msgstr "Керування групами"
 
-#: allianceauth/groupmanagement/forms.py:18
+#: allianceauth/groupmanagement/forms.py:15
-#: allianceauth/permissions_tool/templates/permissions_tool/overview.html:35
-msgid "Users"
-msgstr "Користувачі"
-
-#: allianceauth/groupmanagement/forms.py:52
 msgid "This name has been reserved and can not be used for groups."
 msgstr "Це ім'я зарезервоване і не може бути використане для груп."
 
-#: allianceauth/groupmanagement/forms.py:62
+#: allianceauth/groupmanagement/forms.py:25
 msgid "(auto)"
 msgstr "(авто)"
 
-#: allianceauth/groupmanagement/forms.py:71
+#: allianceauth/groupmanagement/forms.py:34
 msgid "There already exists a group with that name."
 msgstr "Група з таким ім'ям вже існує."
 
-#: allianceauth/groupmanagement/models.py:104
+#: allianceauth/groupmanagement/models.py:105
 msgid ""
 "Internal group, users cannot see, join or request to join this "
 "group.<br>Used for groups such as Members, Corp_*, Alliance_* "
@@ -698,12 +656,13 @@ msgstr ""
 "\"Members, Corp_, Alliance_ і т.д.<br><b>Перевизначає параметри Hidden і \"\n"
 "\"Open при виборі.</b>\""
 
-#: allianceauth/groupmanagement/models.py:112
+#: allianceauth/groupmanagement/models.py:113
 msgid "Group is hidden from users but can still join with the correct link."
 msgstr ""
-"Група прихована від користувачів, але можна приєднатися за посиланням."
+"Група прихована від користувачів, але можна приєднатися з правильним "
+"посиланням."
 
-#: allianceauth/groupmanagement/models.py:118
+#: allianceauth/groupmanagement/models.py:119
 msgid ""
 "Group is open and users will be automatically added upon request.<br>If the "
 "group is not open users will need their request manually approved."
@@ -712,7 +671,7 @@ msgstr ""
 "запитом.<br>Якщо група закрита, користувачі повинні отримати ручне "
 "підтвердження запиту."
 
-#: allianceauth/groupmanagement/models.py:125
+#: allianceauth/groupmanagement/models.py:126
 msgid ""
 "Group is public. Any registered user is able to join this group, with "
 "visibility based on the other options set for this group.<br>Auth will not "
@@ -724,7 +683,7 @@ msgstr ""
 "групи.<br>Авторизація не буде автоматично видаляти користувачів з цієї "
 "групи, коли вони більше не автентифіковані."
 
-#: allianceauth/groupmanagement/models.py:134
+#: allianceauth/groupmanagement/models.py:135
 msgid ""
 "Group is restricted. This means that adding or removing users for this group"
 " requires a superuser admin."
@@ -732,7 +691,7 @@ msgstr ""
 "Група обмежена. Це означає, що додавання або видалення користувачів для цієї"
 " групи вимагає адміністратора-суперкористувача."
 
-#: allianceauth/groupmanagement/models.py:143
+#: allianceauth/groupmanagement/models.py:144
 msgid ""
 "Group leaders can process requests for this group. Use the "
 "<code>auth.group_management</code> permission to allow a user to manage all "
@@ -742,7 +701,7 @@ msgstr ""
 "<code>auth.group_management</code>, щоб дозволити користувачеві керувати "
 "всіма групами.<br>"
 
-#: allianceauth/groupmanagement/models.py:153
+#: allianceauth/groupmanagement/models.py:154
 msgid ""
 "Members of leader groups can process requests for this group. Use the "
 "<code>auth.group_management</code> permission to allow a user to manage all "
@@ -752,7 +711,7 @@ msgstr ""
 " дозвіл <code>auth.group_management</code>, щоб дозволити користувачеві "
 "керувати всіма групами.<br>"
 
-#: allianceauth/groupmanagement/models.py:162
+#: allianceauth/groupmanagement/models.py:163
 msgid ""
 "States listed here will have the ability to join this group provided they "
 "have the proper permissions.<br>"
@@ -760,42 +719,42 @@ msgstr ""
 "Штати, перераховані тут, матимуть змогу приєднатися до цієї групи, якщо вони"
 " мають відповідні дозволи.<br>"
 
-#: allianceauth/groupmanagement/models.py:170
+#: allianceauth/groupmanagement/models.py:171
 msgid ""
 "Short description <i>(max. 512 characters)</i> of the group shown to users."
 msgstr ""
 "Короткий опис <i>(максимум 512 символів)</i> групи, що відображається "
 "користувачам."
 
-#: allianceauth/groupmanagement/models.py:177
+#: allianceauth/groupmanagement/models.py:178
 msgid "Can request non-public groups"
 msgstr "Може запитувати непублічні групи"
 
-#: allianceauth/groupmanagement/models.py:208
+#: allianceauth/groupmanagement/models.py:209
 msgid "name"
 msgstr "назва"
 
-#: allianceauth/groupmanagement/models.py:211
+#: allianceauth/groupmanagement/models.py:212
 msgid "Name that can not be used for groups."
 msgstr "Назва, яку неможна використовувати для груп."
 
-#: allianceauth/groupmanagement/models.py:214
+#: allianceauth/groupmanagement/models.py:215
 msgid "reason"
 msgstr "причина"
 
-#: allianceauth/groupmanagement/models.py:214
+#: allianceauth/groupmanagement/models.py:215
 msgid "Reason why this name is reserved."
 msgstr "Причина, чому ця назва зарезервована."
 
-#: allianceauth/groupmanagement/models.py:217
+#: allianceauth/groupmanagement/models.py:218
 msgid "created by"
 msgstr "створено користувачем"
 
-#: allianceauth/groupmanagement/models.py:222
+#: allianceauth/groupmanagement/models.py:223
 msgid "created at"
 msgstr "створено о"
 
-#: allianceauth/groupmanagement/models.py:222
+#: allianceauth/groupmanagement/models.py:223
 msgid "Date when this entry was created"
 msgstr "Дата створення цього запису"
 
@@ -1022,26 +981,26 @@ msgstr "Групові запити"
 msgid "Group Membership"
 msgstr "Членство в групі"
 
-#: allianceauth/groupmanagement/views.py:166
+#: allianceauth/groupmanagement/views.py:163
 #, python-format
 msgid "Removed user %(user)s from group %(group)s."
 msgstr "Користувач %(user)s вилучений з групи %(group)s."
 
-#: allianceauth/groupmanagement/views.py:168
+#: allianceauth/groupmanagement/views.py:165
 msgid "User does not exist in that group"
 msgstr "Користувача не існує в цій групі"
 
-#: allianceauth/groupmanagement/views.py:171
+#: allianceauth/groupmanagement/views.py:168
 msgid "Group does not exist"
 msgstr "Група не існує"
 
-#: allianceauth/groupmanagement/views.py:198
+#: allianceauth/groupmanagement/views.py:195
 #, python-format
 msgid "Accepted application from %(mainchar)s to %(group)s."
 msgstr "Заявка %(mainchar)s на вступ до %(group)s прийнята."
 
-#: allianceauth/groupmanagement/views.py:204
+#: allianceauth/groupmanagement/views.py:201
-#: allianceauth/groupmanagement/views.py:235
+#: allianceauth/groupmanagement/views.py:232
 #, python-format
 msgid ""
 "An unhandled error occurred while processing the application from "
@@ -1050,18 +1009,18 @@ msgstr ""
 "Під час обробки заявки %(mainchar)s на вступ до %(group)s виникла помилка, "
 "яку не можна обробити."
 
-#: allianceauth/groupmanagement/views.py:229
+#: allianceauth/groupmanagement/views.py:226
 #, python-format
 msgid "Rejected application from %(mainchar)s to %(group)s."
 msgstr "Заявка %(mainchar)s на вступ до %(group)s відхилена."
 
-#: allianceauth/groupmanagement/views.py:264
+#: allianceauth/groupmanagement/views.py:261
 #, python-format
 msgid "Accepted application from %(mainchar)s to leave %(group)s."
 msgstr "Заявка %(mainchar)s на вихід з %(group)s прийнята."
 
-#: allianceauth/groupmanagement/views.py:269
+#: allianceauth/groupmanagement/views.py:266
-#: allianceauth/groupmanagement/views.py:301
+#: allianceauth/groupmanagement/views.py:298
 #, python-format
 msgid ""
 "An unhandled error occurred while processing the application from "
@@ -1070,42 +1029,42 @@ msgstr ""
 "Під час обробки заявки %(mainchar)s на вихід з %(group)s виникла помилка, "
 "яку не можна обробити."
 
-#: allianceauth/groupmanagement/views.py:295
+#: allianceauth/groupmanagement/views.py:292
 #, python-format
 msgid "Rejected application from %(mainchar)s to leave %(group)s."
 msgstr "Заявка %(mainchar)s на вихід з %(group)s відхилена."
 
-#: allianceauth/groupmanagement/views.py:339
+#: allianceauth/groupmanagement/views.py:336
-#: allianceauth/groupmanagement/views.py:349
+#: allianceauth/groupmanagement/views.py:346
 msgid "You cannot join that group"
 msgstr "Ви не можете приєднатись до цієї групи"
 
-#: allianceauth/groupmanagement/views.py:344
+#: allianceauth/groupmanagement/views.py:341
 msgid "You are already a member of that group."
 msgstr "Ви вже є членом цієї групи."
 
-#: allianceauth/groupmanagement/views.py:361
+#: allianceauth/groupmanagement/views.py:358
 msgid "You already have a pending application for that group."
-msgstr "Ви вже подали заявку на вступ до цієї групи."
+msgstr "У вас вже є очікуюча заявка на вступ до цієї групи."
 
-#: allianceauth/groupmanagement/views.py:370
+#: allianceauth/groupmanagement/views.py:367
 #, python-format
 msgid "Applied to group %(group)s."
 msgstr "Подано заявку на групу %(group)s."
 
-#: allianceauth/groupmanagement/views.py:380
+#: allianceauth/groupmanagement/views.py:377
 msgid "You cannot leave that group"
 msgstr "Ви не можете покинути цю групу"
 
-#: allianceauth/groupmanagement/views.py:384
+#: allianceauth/groupmanagement/views.py:381
 msgid "You are not a member of that group"
 msgstr "Ви не є учасником цієї групи"
 
-#: allianceauth/groupmanagement/views.py:396
+#: allianceauth/groupmanagement/views.py:393
 msgid "You already have a pending leave request for that group."
-msgstr "Ви вже подали запит на вихід з цієї групи."
+msgstr "Ви вже маєте очікувану запит на вихід з цієї групи."
 
-#: allianceauth/groupmanagement/views.py:412
+#: allianceauth/groupmanagement/views.py:409
 #, python-format
 msgid "Applied to leave group %(group)s."
 msgstr "Подано заявку на вихід з групи %(group)s."
@@ -1167,6 +1126,16 @@ msgstr "Створити заявку"
 msgid "Username"
 msgstr "Ім'я користувача"
 
+#: allianceauth/hrapplications/templates/hrapplications/management.html:28
+#: allianceauth/hrapplications/templates/hrapplications/management.html:83
+#: allianceauth/hrapplications/templates/hrapplications/management.html:127
+#: allianceauth/hrapplications/templates/hrapplications/searchview.html:27
+#: allianceauth/hrapplications/templates/hrapplications/view.html:73
+#: allianceauth/srp/templates/srp/data.html:101
+#: allianceauth/srp/templates/srp/management.html:44
+msgid "Actions"
+msgstr "Дії"
+
 #: allianceauth/hrapplications/templates/hrapplications/management.html:38
 #: allianceauth/hrapplications/templates/hrapplications/management.html:99
 #: allianceauth/hrapplications/templates/hrapplications/management.html:143
@@ -1352,7 +1321,7 @@ msgstr "Всі прочитані повідомлення видалено."
 
 #: allianceauth/optimer/auth_hooks.py:10
 msgid "Fleet Operations"
-msgstr "Флотові операції"
+msgstr "Операції флоту"
 
 #: allianceauth/optimer/form.py:12
 #: allianceauth/optimer/templates/optimer/fleetoptable.html:11
@@ -1376,7 +1345,7 @@ msgstr "Тип операції"
 #: allianceauth/optimer/form.py:17
 #: allianceauth/srp/templates/srp/management.html:38
 msgid "Fleet Commander"
-msgstr "Командир флоту"
+msgstr "Командувач флоту"
 
 #: allianceauth/optimer/form.py:22 allianceauth/srp/form.py:14
 #: allianceauth/srp/templates/srp/data.html:91
@@ -1431,7 +1400,7 @@ msgstr "Немає наступних таймерів."
 
 #: allianceauth/optimer/templates/optimer/management.html:33
 msgid "Past Fleet Operations"
-msgstr "Завершені флотові операції"
+msgstr "Минулі флотові операції"
 
 #: allianceauth/optimer/templates/optimer/management.html:37
 #: allianceauth/timerboard/templates/timerboard/view.html:535
@@ -1505,13 +1474,17 @@ msgstr "Модель"
 msgid "Code Name"
 msgstr "Кодова назва"
 
+#: allianceauth/permissions_tool/templates/permissions_tool/overview.html:35
+msgid "Users"
+msgstr "Користувачі"
+
 #: allianceauth/permissions_tool/templates/permissions_tool/overview.html:41
 msgid "States"
 msgstr "Стани"
 
 #: allianceauth/services/abstract.py:72
 msgid "That service account already exists"
-msgstr "Такий сервісний обліковий запис вже існує"
+msgstr "Такий обліковий запис сервісу вже існує"
 
 #: allianceauth/services/abstract.py:103
 #, python-brace-format
@@ -1532,7 +1505,7 @@ msgstr "Командир флоту:"
 
 #: allianceauth/services/forms.py:8
 msgid "Fleet Comms:"
-msgstr "Голосовий канал флоту:"
+msgstr "Комунікації флоту:"
 
 #: allianceauth/services/forms.py:9
 msgid "Fleet Type:"
@@ -1572,7 +1545,7 @@ msgstr "Ні"
 
 #: allianceauth/services/forms.py:16
 msgid "Important?*"
-msgstr "Важливий?*"
+msgstr "Важливо?*"
 
 #: allianceauth/services/forms.py:21 allianceauth/services/forms.py:31
 msgid "Password"
@@ -1641,7 +1614,7 @@ msgstr "Ви не маєте прав на доступ до Discourse."
 
 #: allianceauth/services/modules/discourse/views.py:34
 msgid "You must have a main character set to access Discourse."
-msgstr "Ви повинні мати основний персонаж, щоб отримати доступ до Discourse."
+msgstr "Ви повинні мати головний персонаж, щоб отримати доступ до Discourse."
 
 #: allianceauth/services/modules/discourse/views.py:44
 msgid ""
@@ -1729,7 +1702,7 @@ msgstr "Відправлено трансляцію Jabber на %s"
 
 #: allianceauth/services/modules/openfire/views.py:144
 msgid "Set jabber password."
-msgstr "Встановити пароль Jabber."
+msgstr "Встановлення пароля Jabber."
 
 #: allianceauth/services/modules/phpbb3/views.py:34
 msgid "Activated forum account."
@@ -1740,7 +1713,7 @@ msgstr "Активований обліковий запис форуму."
 #: allianceauth/services/modules/phpbb3/views.py:78
 #: allianceauth/services/modules/phpbb3/views.py:101
 msgid "An error occurred while processing your forum account."
-msgstr "Виникла помилка під час обробки вашого облікового запису на форумі."
+msgstr "Виникла помилка під час обробки вашого облікового запису форуму."
 
 #: allianceauth/services/modules/phpbb3/views.py:53
 msgid "Deactivated forum account."
@@ -1748,11 +1721,11 @@ msgstr "Деактивований обліковий запис форуму."
 
 #: allianceauth/services/modules/phpbb3/views.py:70
 msgid "Reset forum password."
-msgstr "Скинути пароль форуму."
+msgstr "Скидання пароля форуму."
 
 #: allianceauth/services/modules/phpbb3/views.py:98
 msgid "Set forum password."
-msgstr "Встановити пароль форуму."
+msgstr "Встановлення пароля форуму."
 
 #: allianceauth/services/modules/smf/views.py:52
 msgid "Activated SMF account."
@@ -1771,11 +1744,11 @@ msgstr "Деактивований обліковий запис SMF."
 
 #: allianceauth/services/modules/smf/views.py:95
 msgid "Reset SMF password."
-msgstr "Скинути пароль SMF."
+msgstr "Скидання пароля SMF."
 
 #: allianceauth/services/modules/smf/views.py:121
 msgid "Set SMF password."
-msgstr "Встановити пароль SMF."
+msgstr "Встановлення пароля SMF."
 
 #: allianceauth/services/modules/teamspeak3/forms.py:14
 #, python-format
@@ -1788,7 +1761,7 @@ msgstr "Оновити групи TS3"
 
 #: allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html:5
 msgid "Verify Teamspeak"
-msgstr "Перевірити Teamspeak"
+msgstr "Перевірте Teamspeak"
 
 #: allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html:10
 msgid "Verify Teamspeak Identity"
@@ -1896,11 +1869,11 @@ msgstr "Керування послугами"
 
 #: allianceauth/services/templates/services/services.html:9
 msgid "Available Services"
-msgstr "Доступні сервіси"
+msgstr "Доступні послуги"
 
 #: allianceauth/services/templates/services/services.html:14
 msgid "Service"
-msgstr "Сервіс"
+msgstr "Послуга"
 
 #: allianceauth/services/templates/services/services.html:16
 msgid "Domain"
@@ -1908,7 +1881,7 @@ msgstr "Домен"
 
 #: allianceauth/srp/auth_hooks.py:13
 msgid "Ship Replacement"
-msgstr "Компенсації"
+msgstr "Компенсація за корабель"
 
 #: allianceauth/srp/form.py:9
 #: allianceauth/srp/templates/srp/management.html:36
@@ -2247,12 +2220,14 @@ msgstr ""
 "Статус %(total)s виконаних завдань • останній %(latest)s"
 
 #: allianceauth/templates/allianceauth/admin-status/overview.html:95
-msgid "running"
+#, python-format
-msgstr ""
+msgid ""
-
+"\n"
-#: allianceauth/templates/allianceauth/admin-status/overview.html:96
+"                        %(queue_length)s queued tasks\n"
-msgid "queued"
+"                        "
 msgstr ""
+"\n"
+"%(queue_length)s завдань в черзі"
 
 #: allianceauth/templates/allianceauth/top-menu-admin.html:9
 msgid "Admin"
@@ -2267,11 +2242,11 @@ msgid "AA Support Discord"
 msgstr "Підтримка AA у Discord"
 
 #: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:10
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:16
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:14
 msgid "User Menu"
 msgstr "Меню Користувача"
 
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:67
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:56
 msgid "Logout"
 msgstr "Вихід"
 
@@ -2327,30 +2302,22 @@ msgid "Objective"
 msgstr "Мета"
 
 #: allianceauth/timerboard/form.py:64
-msgid "Absolute Timer"
-msgstr ""
-
-#: allianceauth/timerboard/form.py:65
-msgid "Date and Time"
-msgstr ""
-
-#: allianceauth/timerboard/form.py:66
 msgid "Days Remaining"
 msgstr "Залишилося днів"
 
-#: allianceauth/timerboard/form.py:67
+#: allianceauth/timerboard/form.py:65
 msgid "Hours Remaining"
 msgstr "Залишилося годин"
 
-#: allianceauth/timerboard/form.py:69
+#: allianceauth/timerboard/form.py:67
 msgid "Minutes Remaining"
 msgstr "Залишилося хвилин"
 
-#: allianceauth/timerboard/form.py:71
+#: allianceauth/timerboard/form.py:69
 msgid "Important"
 msgstr "Важливо"
 
-#: allianceauth/timerboard/form.py:72
+#: allianceauth/timerboard/form.py:70
 msgid "Corp-Restricted"
 msgstr "Обмежено для корпорації"
 

allianceauth/locale/zh_Hans/LC_MESSAGES/django.po

@@ -4,19 +4,18 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Shen Yang, 2023
+# Joel Falknau <ozirascal@gmail.com>, 2020
-# Jesse . <sgeine@hotmail.com>, 2023
+# Jesse . <sgeine@hotmail.com>, 2020
-# Aaron BuBu <351793078@qq.com>, 2023
+# Aaron BuBu <351793078@qq.com>, 2020
-# Joel Falknau <ozirascal@gmail.com>, 2023
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-17 18:50+1000\n"
+"POT-Creation-Date: 2022-10-09 18:20+1000\n"
-"PO-Revision-Date: 2023-11-08 13:50+0000\n"
+"PO-Revision-Date: 2020-02-18 03:14+0000\n"
-"Last-Translator: Joel Falknau <ozirascal@gmail.com>, 2023\n"
+"Last-Translator: Aaron BuBu <351793078@qq.com>, 2020\n"
 "Language-Team: Chinese Simplified (https://app.transifex.com/alliance-auth/teams/107430/zh-Hans/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,7 +31,7 @@ msgstr ""
 msgid "Google Analytics V4"
 msgstr ""
 
-#: allianceauth/authentication/decorators.py:49
+#: allianceauth/authentication/decorators.py:37
 msgid "A main character is required to perform that action. Add one below."
 msgstr "只有主要角色才能执行这个操作。在下面添加一个"
 
@@ -45,68 +44,63 @@ msgstr "电子邮箱"
 msgid "You are not allowed to add or remove these restricted groups: %s"
 msgstr ""
 
-#: allianceauth/authentication/models.py:71
-msgid "English"
-msgstr "英语"
-
-#: allianceauth/authentication/models.py:72
-msgid "German"
-msgstr "德语"
-
-#: allianceauth/authentication/models.py:73
-msgid "Spanish"
-msgstr "西班牙语"
-
-#: allianceauth/authentication/models.py:74
-msgid "Chinese Simplified"
-msgstr "简体中文"
-
-#: allianceauth/authentication/models.py:75
-msgid "Russian"
-msgstr "俄语"
-
-#: allianceauth/authentication/models.py:76
-msgid "Korean"
-msgstr "韩语"
-
-#: allianceauth/authentication/models.py:77
-msgid "French"
-msgstr "法语"
-
-#: allianceauth/authentication/models.py:78
-msgid "Japanese"
-msgstr "日语"
-
-#: allianceauth/authentication/models.py:79
-msgid "Italian"
-msgstr "意大利语"
-
 #: allianceauth/authentication/models.py:80
-msgid "Ukrainian"
+msgid "English"
+msgstr ""
+
+#: allianceauth/authentication/models.py:81
+msgid "German"
+msgstr ""
+
+#: allianceauth/authentication/models.py:82
+msgid "Spanish"
+msgstr ""
+
+#: allianceauth/authentication/models.py:83
+msgid "Chinese Simplified"
+msgstr ""
+
+#: allianceauth/authentication/models.py:84
+msgid "Russian"
+msgstr ""
+
+#: allianceauth/authentication/models.py:85
+msgid "Korean"
+msgstr ""
+
+#: allianceauth/authentication/models.py:86
+msgid "French"
+msgstr ""
+
+#: allianceauth/authentication/models.py:87
+msgid "Japanese"
+msgstr ""
+
+#: allianceauth/authentication/models.py:88
+msgid "Italian"
+msgstr ""
+
+#: allianceauth/authentication/models.py:91
+msgid "Language"
 msgstr ""
 
 #: allianceauth/authentication/models.py:96
-msgid "Language"
-msgstr "语言"
-
-#: allianceauth/authentication/models.py:101
 #: allianceauth/templates/allianceauth/night-toggle.html:6
 msgid "Night Mode"
-msgstr "夜间模式"
+msgstr ""
 
-#: allianceauth/authentication/models.py:115
+#: allianceauth/authentication/models.py:110
 #, python-format
 msgid "State changed to: %s"
 msgstr ""
 
-#: allianceauth/authentication/models.py:116
+#: allianceauth/authentication/models.py:111
 #, python-format
 msgid "Your user's state is now: %(state)s"
 msgstr ""
 
 #: allianceauth/authentication/templates/authentication/dashboard.html:4
 #: allianceauth/authentication/templates/authentication/dashboard.html:7
-#: allianceauth/authentication/templates/authentication/tokens.html:4
 #: allianceauth/templates/allianceauth/side-menu.html:10
 msgid "Dashboard"
 msgstr "账户总览"
@@ -162,50 +156,8 @@ msgstr "所在公司"
 msgid "Alliance"
 msgstr "所在联盟"
 
-#: allianceauth/authentication/templates/authentication/tokens.html:7
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:62
-msgid "Token Management"
-msgstr ""
-
-#: allianceauth/authentication/templates/authentication/tokens.html:12
-msgid "Scopes"
-msgstr ""
-
-#: allianceauth/authentication/templates/authentication/tokens.html:13
-#: allianceauth/hrapplications/templates/hrapplications/management.html:28
-#: allianceauth/hrapplications/templates/hrapplications/management.html:83
-#: allianceauth/hrapplications/templates/hrapplications/management.html:127
-#: allianceauth/hrapplications/templates/hrapplications/searchview.html:27
-#: allianceauth/hrapplications/templates/hrapplications/view.html:73
-#: allianceauth/srp/templates/srp/data.html:101
-#: allianceauth/srp/templates/srp/management.html:44
-msgid "Actions"
-msgstr "操作"
-
-#: allianceauth/authentication/templates/authentication/tokens.html:14
-#: allianceauth/corputils/templates/corputils/corpstats.html:74
-#: allianceauth/corputils/templates/corputils/corpstats.html:112
-#: allianceauth/corputils/templates/corputils/corpstats.html:156
-#: allianceauth/corputils/templates/corputils/search.html:13
-#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html:22
-#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:26
-#: allianceauth/groupmanagement/templates/groupmanagement/audit.html:30
-#: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:29
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:55
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:112
-msgid "Character"
-msgstr "角色"
-
-#: allianceauth/authentication/templates/authentication/tokens.html:28
-msgid ""
-"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."
-msgstr ""
-
 #: allianceauth/authentication/templates/public/login.html:6
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:69
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:58
 msgid "Login"
 msgstr "登录"
 
@@ -237,49 +189,47 @@ msgstr "注册"
 msgid "Invalid or expired activation link."
 msgstr "激活链接无效或过期"
 
-#: allianceauth/authentication/views.py:118
+#: allianceauth/authentication/views.py:77
 #, python-format
 msgid ""
 "Cannot change main character to %(char)s: character owned by a different "
 "account."
 msgstr "不能修改主角色为%(char)s：这个角色被另一个账户所拥有"
 
-#: allianceauth/authentication/views.py:124
+#: allianceauth/authentication/views.py:83
 #, python-format
 msgid "Changed main character to %(char)s"
 msgstr "修改主要角色为%(char)s"
 
-#: allianceauth/authentication/views.py:133
+#: allianceauth/authentication/views.py:92
 #, python-format
 msgid "Added %(name)s to your account."
 msgstr "添加%(name)s到您的账户"
 
-#: allianceauth/authentication/views.py:135
+#: allianceauth/authentication/views.py:94
 #, python-format
 msgid "Failed to add %(name)s to your account: they already have an account."
 msgstr "添加%(name)s到您的账户失败：他们已经在一个账户中了"
 
-#: allianceauth/authentication/views.py:178
+#: allianceauth/authentication/views.py:133
-msgid ""
+msgid "Unable to authenticate as the selected character."
-"Unable to authenticate as the selected character. Please log in with the "
+msgstr "无法作为选定的角色进行身份验证"
-"main character associated with this account."
-msgstr ""
 
-#: allianceauth/authentication/views.py:244
+#: allianceauth/authentication/views.py:197
 msgid "Registration token has expired."
 msgstr "注册令牌过期。"
 
-#: allianceauth/authentication/views.py:302
+#: allianceauth/authentication/views.py:252
 msgid ""
 "Sent confirmation email. Please follow the link to confirm your email "
 "address."
 msgstr "已经发送了确认邮件。请按照链接确定您的电邮地址"
 
-#: allianceauth/authentication/views.py:307
+#: allianceauth/authentication/views.py:257
 msgid "Confirmed your email address. Please login to continue."
 msgstr "已确认您的电邮地址。请登录以继续"
 
-#: allianceauth/authentication/views.py:312
+#: allianceauth/authentication/views.py:262
 msgid "Registration of new accounts is not allowed at this time."
 msgstr ""
 
@@ -322,6 +272,19 @@ msgstr "未注册成员"
 msgid "Last update:"
 msgstr "最后一次更新"
 
+#: allianceauth/corputils/templates/corputils/corpstats.html:74
+#: allianceauth/corputils/templates/corputils/corpstats.html:112
+#: allianceauth/corputils/templates/corputils/corpstats.html:156
+#: allianceauth/corputils/templates/corputils/search.html:13
+#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html:22
+#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:26
+#: allianceauth/groupmanagement/templates/groupmanagement/audit.html:30
+#: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:29
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:55
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:112
+msgid "Character"
+msgstr "角色"
+
 #: allianceauth/corputils/templates/corputils/corpstats.html:75
 #: allianceauth/corputils/templates/corputils/search.html:14
 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:31
@@ -651,41 +614,36 @@ msgstr ""
 msgid "Group Management"
 msgstr "用户组管理"
 
-#: allianceauth/groupmanagement/forms.py:18
+#: allianceauth/groupmanagement/forms.py:15
-#: allianceauth/permissions_tool/templates/permissions_tool/overview.html:35
-msgid "Users"
-msgstr "用户"
-
-#: allianceauth/groupmanagement/forms.py:52
 msgid "This name has been reserved and can not be used for groups."
 msgstr ""
 
-#: allianceauth/groupmanagement/forms.py:62
+#: allianceauth/groupmanagement/forms.py:25
 msgid "(auto)"
 msgstr ""
 
-#: allianceauth/groupmanagement/forms.py:71
+#: allianceauth/groupmanagement/forms.py:34
 msgid "There already exists a group with that name."
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:104
+#: allianceauth/groupmanagement/models.py:105
 msgid ""
 "Internal group, users cannot see, join or request to join this "
 "group.<br>Used for groups such as Members, Corp_*, Alliance_* "
 "etc.<br><b>Overrides Hidden and Open options when selected.</b>"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:112
+#: allianceauth/groupmanagement/models.py:113
 msgid "Group is hidden from users but can still join with the correct link."
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:118
+#: allianceauth/groupmanagement/models.py:119
 msgid ""
 "Group is open and users will be automatically added upon request.<br>If the "
 "group is not open users will need their request manually approved."
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:125
+#: allianceauth/groupmanagement/models.py:126
 msgid ""
 "Group is public. Any registered user is able to join this group, with "
 "visibility based on the other options set for this group.<br>Auth will not "
@@ -693,66 +651,66 @@ msgid ""
 "authenticated."
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:134
+#: allianceauth/groupmanagement/models.py:135
 msgid ""
 "Group is restricted. This means that adding or removing users for this group"
 " requires a superuser admin."
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:143
+#: allianceauth/groupmanagement/models.py:144
 msgid ""
 "Group leaders can process requests for this group. Use the "
 "<code>auth.group_management</code> permission to allow a user to manage all "
 "groups.<br>"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:153
+#: allianceauth/groupmanagement/models.py:154
 msgid ""
 "Members of leader groups can process requests for this group. Use the "
 "<code>auth.group_management</code> permission to allow a user to manage all "
 "groups.<br>"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:162
+#: allianceauth/groupmanagement/models.py:163
 msgid ""
 "States listed here will have the ability to join this group provided they "
 "have the proper permissions.<br>"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:170
+#: allianceauth/groupmanagement/models.py:171
 msgid ""
 "Short description <i>(max. 512 characters)</i> of the group shown to users."
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:177
+#: allianceauth/groupmanagement/models.py:178
 msgid "Can request non-public groups"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:208
+#: allianceauth/groupmanagement/models.py:209
 msgid "name"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:211
+#: allianceauth/groupmanagement/models.py:212
 msgid "Name that can not be used for groups."
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:214
+#: allianceauth/groupmanagement/models.py:215
 msgid "reason"
-msgstr "原因"
+msgstr ""
 
-#: allianceauth/groupmanagement/models.py:214
+#: allianceauth/groupmanagement/models.py:215
 msgid "Reason why this name is reserved."
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:217
+#: allianceauth/groupmanagement/models.py:218
 msgid "created by"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:222
+#: allianceauth/groupmanagement/models.py:223
 msgid "created at"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:222
+#: allianceauth/groupmanagement/models.py:223
 msgid "Date when this entry was created"
 msgstr ""
 
@@ -796,7 +754,7 @@ msgstr "操作者"
 
 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:48
 msgid "Removed"
-msgstr "已移除"
+msgstr ""
 
 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:60
 msgid "All times displayed are EVE/UTC."
@@ -979,86 +937,86 @@ msgstr "用户组请求"
 msgid "Group Membership"
 msgstr "用户组成员"
 
-#: allianceauth/groupmanagement/views.py:166
+#: allianceauth/groupmanagement/views.py:163
 #, python-format
 msgid "Removed user %(user)s from group %(group)s."
 msgstr "已将用户%(user)s从用户组%(group)s中移除"
 
-#: allianceauth/groupmanagement/views.py:168
+#: allianceauth/groupmanagement/views.py:165
 msgid "User does not exist in that group"
 msgstr "那个用户组中不存在这个用户"
 
-#: allianceauth/groupmanagement/views.py:171
+#: allianceauth/groupmanagement/views.py:168
 msgid "Group does not exist"
 msgstr "用户组不存在"
 
-#: allianceauth/groupmanagement/views.py:198
+#: allianceauth/groupmanagement/views.py:195
 #, python-format
 msgid "Accepted application from %(mainchar)s to %(group)s."
 msgstr "已接受用户%(mainchar)s加入%(group)s的申请"
 
-#: allianceauth/groupmanagement/views.py:204
+#: allianceauth/groupmanagement/views.py:201
-#: allianceauth/groupmanagement/views.py:235
+#: allianceauth/groupmanagement/views.py:232
 #, python-format
 msgid ""
 "An unhandled error occurred while processing the application from "
 "%(mainchar)s to %(group)s."
 msgstr "在处理用户%(mainchar)s加入%(group)s的申请的过程中出现了一个搞不定的错误"
 
-#: allianceauth/groupmanagement/views.py:229
+#: allianceauth/groupmanagement/views.py:226
 #, python-format
 msgid "Rejected application from %(mainchar)s to %(group)s."
 msgstr "%(mainchar)s加入%(group)s的申请已拒绝"
 
-#: allianceauth/groupmanagement/views.py:264
+#: allianceauth/groupmanagement/views.py:261
 #, python-format
 msgid "Accepted application from %(mainchar)s to leave %(group)s."
 msgstr "%(mainchar)s加入%(group)s的申请已通过"
 
-#: allianceauth/groupmanagement/views.py:269
+#: allianceauth/groupmanagement/views.py:266
-#: allianceauth/groupmanagement/views.py:301
+#: allianceauth/groupmanagement/views.py:298
 #, python-format
 msgid ""
 "An unhandled error occurred while processing the application from "
 "%(mainchar)s to leave %(group)s."
 msgstr "在处理%(mainchar)s离开%(group)s的程序时发生了未知的错误"
 
-#: allianceauth/groupmanagement/views.py:295
+#: allianceauth/groupmanagement/views.py:292
 #, python-format
 msgid "Rejected application from %(mainchar)s to leave %(group)s."
 msgstr "%(mainchar)s离开%(group)s的请求已被拒绝"
 
-#: allianceauth/groupmanagement/views.py:339
+#: allianceauth/groupmanagement/views.py:336
-#: allianceauth/groupmanagement/views.py:349
+#: allianceauth/groupmanagement/views.py:346
 msgid "You cannot join that group"
 msgstr "你无法加入那个用户组"
 
-#: allianceauth/groupmanagement/views.py:344
+#: allianceauth/groupmanagement/views.py:341
 msgid "You are already a member of that group."
 msgstr "你已经是那个群组的一员了。"
 
-#: allianceauth/groupmanagement/views.py:361
+#: allianceauth/groupmanagement/views.py:358
 msgid "You already have a pending application for that group."
 msgstr "你已经有了该组的未决申请"
 
-#: allianceauth/groupmanagement/views.py:370
+#: allianceauth/groupmanagement/views.py:367
 #, python-format
 msgid "Applied to group %(group)s."
 msgstr "修改已经应用到%(group)s啦"
 
-#: allianceauth/groupmanagement/views.py:380
+#: allianceauth/groupmanagement/views.py:377
 msgid "You cannot leave that group"
 msgstr "你无法离开那个用户组"
 
-#: allianceauth/groupmanagement/views.py:384
+#: allianceauth/groupmanagement/views.py:381
 msgid "You are not a member of that group"
 msgstr "你不是那个用户组的成员"
 
-#: allianceauth/groupmanagement/views.py:396
+#: allianceauth/groupmanagement/views.py:393
 msgid "You already have a pending leave request for that group."
 msgstr "你已经有了该组的未决离开请求"
 
-#: allianceauth/groupmanagement/views.py:412
+#: allianceauth/groupmanagement/views.py:409
 #, python-format
 msgid "Applied to leave group %(group)s."
 msgstr "已经离开群组%(group)s"
@@ -1120,6 +1078,16 @@ msgstr "创建申请"
 msgid "Username"
 msgstr "用户名"
 
+#: allianceauth/hrapplications/templates/hrapplications/management.html:28
+#: allianceauth/hrapplications/templates/hrapplications/management.html:83
+#: allianceauth/hrapplications/templates/hrapplications/management.html:127
+#: allianceauth/hrapplications/templates/hrapplications/searchview.html:27
+#: allianceauth/hrapplications/templates/hrapplications/view.html:73
+#: allianceauth/srp/templates/srp/data.html:101
+#: allianceauth/srp/templates/srp/management.html:44
+msgid "Actions"
+msgstr "操作"
+
 #: allianceauth/hrapplications/templates/hrapplications/management.html:38
 #: allianceauth/hrapplications/templates/hrapplications/management.html:99
 #: allianceauth/hrapplications/templates/hrapplications/management.html:143
@@ -1230,11 +1198,11 @@ msgstr "添加评论"
 
 #: allianceauth/notifications/models.py:21
 msgid "danger"
-msgstr "危险"
+msgstr ""
 
 #: allianceauth/notifications/models.py:22
 msgid "warning"
-msgstr "警告"
+msgstr ""
 
 #: allianceauth/notifications/models.py:23
 msgid "info"
@@ -1375,7 +1343,7 @@ msgstr "当前EVE游戏内时间"
 
 #: allianceauth/optimer/templates/optimer/management.html:26
 msgid "Next Fleet Operations"
-msgstr "下一个舰队任务"
+msgstr ""
 
 #: allianceauth/optimer/templates/optimer/management.html:30
 #: allianceauth/timerboard/templates/timerboard/view.html:362
@@ -1384,7 +1352,7 @@ msgstr "没有快到的时间节点，歇一会吧"
 
 #: allianceauth/optimer/templates/optimer/management.html:33
 msgid "Past Fleet Operations"
-msgstr "过去的舰队任务"
+msgstr ""
 
 #: allianceauth/optimer/templates/optimer/management.html:37
 #: allianceauth/timerboard/templates/timerboard/view.html:535
@@ -1458,6 +1426,10 @@ msgstr "类型"
 msgid "Code Name"
 msgstr "操作类型"
 
+#: allianceauth/permissions_tool/templates/permissions_tool/overview.html:35
+msgid "Users"
+msgstr "用户"
+
 #: allianceauth/permissions_tool/templates/permissions_tool/overview.html:41
 msgid "States"
 msgstr "声望"
@@ -2180,11 +2152,11 @@ msgid ""
 msgstr ""
 
 #: allianceauth/templates/allianceauth/admin-status/overview.html:95
-msgid "running"
+#, python-format
-msgstr ""
+msgid ""
-
+"\n"
-#: allianceauth/templates/allianceauth/admin-status/overview.html:96
+"                        %(queue_length)s queued tasks\n"
-msgid "queued"
+"                        "
 msgstr ""
 
 #: allianceauth/templates/allianceauth/top-menu-admin.html:9
@@ -2200,11 +2172,11 @@ msgid "AA Support Discord"
 msgstr ""
 
 #: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:10
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:16
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:14
 msgid "User Menu"
 msgstr ""
 
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:67
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:56
 msgid "Logout"
 msgstr "登出"
 
@@ -2260,30 +2232,22 @@ msgid "Objective"
 msgstr "声望"
 
 #: allianceauth/timerboard/form.py:64
-msgid "Absolute Timer"
-msgstr ""
-
-#: allianceauth/timerboard/form.py:65
-msgid "Date and Time"
-msgstr ""
-
-#: allianceauth/timerboard/form.py:66
 msgid "Days Remaining"
 msgstr "剩余天数"
 
-#: allianceauth/timerboard/form.py:67
+#: allianceauth/timerboard/form.py:65
 msgid "Hours Remaining"
 msgstr "剩余小时数"
 
-#: allianceauth/timerboard/form.py:69
+#: allianceauth/timerboard/form.py:67
 msgid "Minutes Remaining"
 msgstr "剩余分钟"
 
-#: allianceauth/timerboard/form.py:71
+#: allianceauth/timerboard/form.py:69
 msgid "Important"
 msgstr "重要信息"
 
-#: allianceauth/timerboard/form.py:72
+#: allianceauth/timerboard/form.py:70
 msgid "Corp-Restricted"
 msgstr "受限制的公司"
 
@@ -2293,15 +2257,15 @@ msgstr ""
 
 #: allianceauth/timerboard/models.py:15
 msgid "Shield"
-msgstr "护盾"
+msgstr ""
 
 #: allianceauth/timerboard/models.py:16
 msgid "Armor"
-msgstr "装甲"
+msgstr ""
 
 #: allianceauth/timerboard/models.py:17
 msgid "Hull"
-msgstr "结构"
+msgstr ""
 
 #: allianceauth/timerboard/models.py:18
 msgid "Final"
@@ -2309,11 +2273,11 @@ msgstr ""
 
 #: allianceauth/timerboard/models.py:19
 msgid "Anchoring"
-msgstr "铆钉"
+msgstr ""
 
 #: allianceauth/timerboard/models.py:20
 msgid "Unanchoring"
-msgstr "解锚"
+msgstr ""
 
 #: allianceauth/timerboard/templates/timerboard/timer_confirm_delete.html:11
 msgid "Delete Timer"

allianceauth/menu/admin.py

@@ -0,0 +1,9 @@
+from django.contrib import admin
+
+from . import models
+
+
+@admin.register(models.MenuItem)
+class MenuItemAdmin(admin.ModelAdmin):
+    list_display = ['text', 'hide', 'parent', 'url', 'icon_classes', 'rank']
+    ordering = ('rank',)

allianceauth/menu/apps.py

@@ -0,0 +1,19 @@
+import logging
+
+from django.apps import AppConfig
+from django.db.utils import ProgrammingError, OperationalError
+
+logger = logging.getLogger(__name__)
+
+
+class MenuConfig(AppConfig):
+    name = "allianceauth.menu"
+    label = "menu"
+
+    def ready(self):
+        try:
+            logger.debug("Syncing MenuItem Hooks")
+            from allianceauth.menu.providers import MenuItem
+            MenuItem.sync_hook_models()
+        except (ProgrammingError, OperationalError):
+            logger.warning("Migrations not completed for MenuItems")

allianceauth/menu/hooks.py

@@ -0,0 +1,42 @@
+from django.template.loader import render_to_string
+
+
+from typing import List, Optional
+
+
+class MenuItemHook:
+    """
+    Auth Hook for generating Side Menu Items
+    """
+    def __init__(self, text: str, classes: str, url_name: str, order: Optional[int] = None, navactive: List = []):
+        """
+        :param text: The text shown as menu item, e.g. usually the name of the app.
+        :type text: str
+        :param classes: The classes that should be applied to the menu item icon
+        :type classes: List[str]
+        :param url_name: The name of the Django URL to use
+        :type url_name: str
+        :param order: An integer which specifies the order of the menu item, lowest to highest. Community apps are free to use any order above `1000`. Numbers below are served for Auth.
+        :type order: Optional[int], optional
+        :param navactive: A list of views or namespaces the link should be highlighted on. See [django-navhelper](https://github.com/geelweb/django-navhelper#navactive) for usage. Defaults to the supplied `url_name`.
+        :type navactive: List, optional
+        """
+
+        self.text = text
+        self.classes = classes
+        self.url_name = url_name
+        self.template = 'public/menuitem.html'
+        self.order = order if order is not None else 9999
+
+        # count is an integer shown next to the menu item as badge when count != None
+        # apps need to set the count in their child class, e.g. in render() method
+        self.count = None
+
+        navactive = navactive or []
+        navactive.append(url_name)
+        self.navactive = navactive
+
+    def render(self, request):
+        return render_to_string(self.template,
+                                {'item': self},
+                                request=request)

allianceauth/menu/migrations/0001_initial.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.0.2 on 2022-08-28 14:00
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='MenuItem',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('hook_function', models.CharField(max_length=500)),
+                ('icon_classes', models.CharField(max_length=150)),
+                ('text', models.CharField(max_length=150)),
+                ('url', models.CharField(blank=True, default=None, max_length=2048, null=True)),
+                ('rank', models.IntegerField(default=1000)),
+                ('hide', models.BooleanField(default=False)),
+                ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='menu.menuitem')),
+            ],
+        ),
+    ]

allianceauth/menu/migrations/0002_alter_menuitem_hook_function_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.0.2 on 2022-08-28 14:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('menu', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='menuitem',
+            name='hook_function',
+            field=models.CharField(blank=True, default=None, max_length=500, null=True),
+        ),
+        migrations.AlterField(
+            model_name='menuitem',
+            name='icon_classes',
+            field=models.CharField(blank=True, default=None, max_length=150, null=True),
+        ),
+        migrations.AlterField(
+            model_name='menuitem',
+            name='text',
+            field=models.CharField(blank=True, default=None, max_length=150, null=True),
+        ),
+    ]

allianceauth/menu/migrations/0003_menuitem_menu_menuit_rank_e880ab_idx.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.0.8 on 2023-02-05 07:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('menu', '0002_alter_menuitem_hook_function_and_more'),
+    ]
+
+    operations = [
+        migrations.AddIndex(
+            model_name='menuitem',
+            index=models.Index(fields=['rank'], name='menu_menuit_rank_e880ab_idx'),
+        ),
+    ]

allianceauth/menu/migrations/0004_alter_menuitem_hide_alter_menuitem_icon_classes_and_more.py

@@ -0,0 +1,39 @@
+# Generated by Django 4.0.10 on 2023-07-16 11:41
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('menu', '0003_menuitem_menu_menuit_rank_e880ab_idx'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='menuitem',
+            name='hide',
+            field=models.BooleanField(default=False, help_text='Hide this menu item. If this item is a header all items under it will be hidden too.'),
+        ),
+        migrations.AlterField(
+            model_name='menuitem',
+            name='icon_classes',
+            field=models.CharField(blank=True, default=None, help_text='Font Awesome classes to show as icon on menu', max_length=150, null=True),
+        ),
+        migrations.AlterField(
+            model_name='menuitem',
+            name='parent',
+            field=models.ForeignKey(blank=True, help_text='Parent Header. (Optional)', null=True, on_delete=django.db.models.deletion.SET_NULL, to='menu.menuitem'),
+        ),
+        migrations.AlterField(
+            model_name='menuitem',
+            name='rank',
+            field=models.IntegerField(default=1000, help_text='Order of the menu. Lowest First.'),
+        ),
+        migrations.AlterField(
+            model_name='menuitem',
+            name='text',
+            field=models.CharField(blank=True, default=None, help_text='Text to show on menu', max_length=150, null=True),
+        ),
+    ]