From e0945fac80c5378de34589ed400031cf44d47b6f Mon Sep 17 00:00:00 2001 From: Ariel Rin Date: Wed, 13 Mar 2024 19:12:11 +1000 Subject: [PATCH] Version Bump 4.0.0rc1 --- allianceauth/__init__.py | 2 +- allianceauth/locale/en/LC_MESSAGES/django.po | 109 +++++++++++-------- docker/.env.example | 2 +- docker/Dockerfile | 2 +- 4 files changed, 66 insertions(+), 49 deletions(-) diff --git a/allianceauth/__init__.py b/allianceauth/__init__.py index e09acc69..7320152d 100644 --- a/allianceauth/__init__.py +++ b/allianceauth/__init__.py @@ -5,7 +5,7 @@ manage online service access. # This will make sure the app is always imported when # Django starts so that shared_task will use this app. -__version__ = '4.0.0b2' +__version__ = '4.0.0rc1' __title__ = 'Alliance Auth' __url__ = 'https://gitlab.com/allianceauth/allianceauth' NAME = f'{__title__} v{__version__}' diff --git a/allianceauth/locale/en/LC_MESSAGES/django.po b/allianceauth/locale/en/LC_MESSAGES/django.po index 3a2ab520..dde806de 100644 --- a/allianceauth/locale/en/LC_MESSAGES/django.po +++ b/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 20:02+1000\n" +"POT-Creation-Date: 2024-03-13 19:10+1000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,6 +26,15 @@ msgstr "" msgid "Google Analytics V4" msgstr "" +#: allianceauth/authentication/constants.py:6 +msgid "" +"This software has exceeded the error limit for ESI. If you are a user, " +"please contact the maintainer of this software. If you are a developer/" +"maintainer, please make a greater effort in the future to receive valid " +"responses. For tips on how, come have a chat with us in ##3rd-party-dev-and-" +"esi on the EVE Online Discord. https://www.eveonline.com/discord" +msgstr "" + #: allianceauth/authentication/decorators.py:52 msgid "A main character is required to perform that action. Add one below." msgstr "" @@ -104,27 +113,34 @@ msgstr "" msgid "Your user's state is now: %(state)s" msgstr "" -#: allianceauth/authentication/templates/authentication/dashboard.characters.html:7 +#: allianceauth/authentication/templates/authentication/dashboard.html:5 +#: allianceauth/authentication/templates/authentication/dashboard.html:7 +#: allianceauth/menu/templates/menu/sortable-side-menu.html:14 +#: allianceauth/templates/allianceauth/side-menu.html:10 +msgid "Dashboard" +msgstr "" + +#: allianceauth/authentication/templates/authentication/dashboard_characters.html:7 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html:33 #: allianceauth/hrapplications/templates/hrapplications/view.html:54 msgid "Characters" msgstr "" -#: allianceauth/authentication/templates/authentication/dashboard.characters.html:13 -#: allianceauth/authentication/templates/authentication/dashboard.characters.html:14 +#: allianceauth/authentication/templates/authentication/dashboard_characters.html:13 +#: allianceauth/authentication/templates/authentication/dashboard_characters.html:14 #: allianceauth/templates/allianceauth/top-menu-rh-default.html:4 #: allianceauth/templates/allianceauth/top-menu-rh-default.html:6 msgid "Add Character" msgstr "" -#: allianceauth/authentication/templates/authentication/dashboard.characters.html:16 -#: allianceauth/authentication/templates/authentication/dashboard.characters.html:17 +#: allianceauth/authentication/templates/authentication/dashboard_characters.html:16 +#: allianceauth/authentication/templates/authentication/dashboard_characters.html:17 #: allianceauth/templates/allianceauth/top-menu-rh-default.html:10 #: allianceauth/templates/allianceauth/top-menu-rh-default.html:12 msgid "Change Main" msgstr "" -#: allianceauth/authentication/templates/authentication/dashboard.characters.html:24 +#: allianceauth/authentication/templates/authentication/dashboard_characters.html:24 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:89 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:23 #: allianceauth/groupmanagement/templates/groupmanagement/groups.html:31 @@ -133,32 +149,25 @@ msgstr "" msgid "Name" msgstr "" -#: allianceauth/authentication/templates/authentication/dashboard.characters.html:25 +#: allianceauth/authentication/templates/authentication/dashboard_characters.html:25 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html:33 msgid "Corp" msgstr "" -#: allianceauth/authentication/templates/authentication/dashboard.characters.html:26 +#: allianceauth/authentication/templates/authentication/dashboard_characters.html:26 #: allianceauth/corputils/templates/corputils/corpstats.html:125 #: allianceauth/hrapplications/templates/hrapplications/view.html:63 msgid "Alliance" msgstr "" -#: allianceauth/authentication/templates/authentication/dashboard.groups.html:5 +#: allianceauth/authentication/templates/authentication/dashboard_groups.html:5 msgid "Membership" msgstr "" -#: allianceauth/authentication/templates/authentication/dashboard.groups.html:8 +#: allianceauth/authentication/templates/authentication/dashboard_groups.html:8 msgid "State:" msgstr "" -#: allianceauth/authentication/templates/authentication/dashboard.html:5 -#: allianceauth/authentication/templates/authentication/dashboard.html:7 -#: allianceauth/menu/templates/menu/sortable-side-menu.html:14 -#: allianceauth/templates/allianceauth/side-menu.html:10 -msgid "Dashboard" -msgstr "" - #: allianceauth/authentication/templates/authentication/tokens.html:6 #: allianceauth/authentication/templates/authentication/tokens.html:10 #: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:62 @@ -197,7 +206,7 @@ msgstr "" #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:29 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:28 #: allianceauth/groupmanagement/templates/groupmanagement/index.html:55 -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:115 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:118 msgid "Character" msgstr "" @@ -234,49 +243,49 @@ msgstr "" msgid "Invalid or expired activation link." msgstr "" -#: allianceauth/authentication/views.py:147 +#: allianceauth/authentication/views.py:158 #, python-format msgid "" "Cannot change main character to %(char)s: character owned by a different " "account." msgstr "" -#: allianceauth/authentication/views.py:153 +#: allianceauth/authentication/views.py:165 #, python-format -msgid "Changed main character to %(char)s" +msgid "Changed main character to %s" msgstr "" -#: allianceauth/authentication/views.py:162 +#: allianceauth/authentication/views.py:179 #, python-format msgid "Added %(name)s to your account." msgstr "" -#: allianceauth/authentication/views.py:164 +#: allianceauth/authentication/views.py:181 #, python-format msgid "Failed to add %(name)s to your account: they already have an account." msgstr "" -#: allianceauth/authentication/views.py:207 +#: allianceauth/authentication/views.py:226 msgid "" "Unable to authenticate as the selected character. Please log in with the " "main character associated with this account." msgstr "" -#: allianceauth/authentication/views.py:273 +#: allianceauth/authentication/views.py:293 msgid "Registration token has expired." msgstr "" -#: allianceauth/authentication/views.py:331 +#: allianceauth/authentication/views.py:354 msgid "" "Sent confirmation email. Please follow the link to confirm your email " "address." msgstr "" -#: allianceauth/authentication/views.py:336 +#: allianceauth/authentication/views.py:360 msgid "Confirmed your email address. Please login to continue." msgstr "" -#: allianceauth/authentication/views.py:341 +#: allianceauth/authentication/views.py:366 msgid "Registration of new accounts is not allowed at this time." msgstr "" @@ -495,7 +504,6 @@ msgstr "" #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:44 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:92 #: allianceauth/templates/allianceauth/top-menu.html:23 -#: allianceauth/timerboard/templates/timerboard/dashboard.timers.html:17 #: allianceauth/timerboard/templates/timerboard/timertable.html:11 msgid "Eve Time" msgstr "" @@ -833,7 +841,7 @@ msgstr "" #: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:29 #: allianceauth/groupmanagement/templates/groupmanagement/index.html:56 -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:116 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:119 #: allianceauth/permissions_tool/templates/permissions_tool/audit.html:32 msgid "Organization" msgstr "" @@ -845,7 +853,7 @@ msgstr "" #: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:60 #: allianceauth/groupmanagement/templates/groupmanagement/index.html:85 -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:145 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:148 #: allianceauth/permissions_tool/templates/permissions_tool/audit_row.html:18 msgid "(unknown)" msgstr "" @@ -926,7 +934,7 @@ msgstr "" #: allianceauth/groupmanagement/templates/groupmanagement/groups.html:36 #: allianceauth/groupmanagement/templates/groupmanagement/index.html:57 -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:117 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:120 #: allianceauth/permissions_tool/templates/permissions_tool/audit.html:29 #: allianceauth/services/modules/openfire/forms.py:6 msgid "Group" @@ -980,20 +988,21 @@ msgid "Group Membership" msgstr "" #: allianceauth/groupmanagement/templates/groupmanagement/index.html:93 -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:153 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:156 msgid "Accept" msgstr "" -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:103 -msgid "No group add requests." -msgstr "" - -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:157 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:96 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:160 #: allianceauth/hrapplications/templates/hrapplications/view.html:104 msgid "Reject" msgstr "" -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:166 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:106 +msgid "No group add requests." +msgstr "" + +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:169 msgid "No group leave requests." msgstr "" @@ -1458,7 +1467,6 @@ msgid "Doctrine" msgstr "" #: allianceauth/optimer/form.py:14 -#: allianceauth/optimer/templates/optimer/dashboard.ops.html:17 #: allianceauth/optimer/templates/optimer/fleetoptable.html:13 msgid "Start Time" msgstr "" @@ -1523,6 +1531,11 @@ msgstr "" msgid "Form Up System" msgstr "" +#: allianceauth/optimer/templates/optimer/dashboard.ops.html:17 +#: allianceauth/timerboard/templates/timerboard/dashboard.timers.html:17 +msgid "EVE Time" +msgstr "" + #: allianceauth/optimer/templates/optimer/fleetoptable.html:14 #: allianceauth/timerboard/templates/timerboard/timertable.html:12 msgid "Local Time" @@ -1568,17 +1581,17 @@ msgstr "" msgid "Update fleet operation" msgstr "" -#: allianceauth/optimer/views.py:89 +#: allianceauth/optimer/views.py:91 #, python-format msgid "Created operation timer for %(opname)s." msgstr "" -#: allianceauth/optimer/views.py:118 +#: allianceauth/optimer/views.py:120 #, python-format msgid "Removed operation timer for %(opname)s." msgstr "" -#: allianceauth/optimer/views.py:169 +#: allianceauth/optimer/views.py:171 #, python-format msgid "Saved changes to operation timer for %(opname)s." msgstr "" @@ -2367,6 +2380,10 @@ msgstr "" msgid "Saved changes to SRP fleet %(fleetname)s" msgstr "" +#: allianceauth/templates/allianceauth/admin-status/esi_check.html:4 +msgid "Your Server received an ESI error response code of " +msgstr "" + #: allianceauth/templates/allianceauth/admin-status/overview.html:11 msgid "Alliance Auth Notifications" msgstr "" @@ -2693,12 +2710,12 @@ msgstr "" msgid "Past Timers" msgstr "" -#: allianceauth/timerboard/views.py:78 +#: allianceauth/timerboard/views.py:85 #, python-format msgid "Added new timer in %(system)s at %(time)s." msgstr "" -#: allianceauth/timerboard/views.py:87 +#: allianceauth/timerboard/views.py:95 msgid "Saved changes to the timer." msgstr "" diff --git a/docker/.env.example b/docker/.env.example index f60ecf11..d86e3ac3 100644 --- a/docker/.env.example +++ b/docker/.env.example @@ -1,7 +1,7 @@ PROTOCOL=https:// AUTH_SUBDOMAIN=%AUTH_SUBDOMAIN% DOMAIN=%DOMAIN% -AA_DOCKER_TAG=registry.gitlab.com/allianceauth/allianceauth/auth:v4.0.0b2 +AA_DOCKER_TAG=registry.gitlab.com/allianceauth/allianceauth/auth:v4.0.0rc1 # Nginx Proxy Manager PROXY_HTTP_PORT=80 diff --git a/docker/Dockerfile b/docker/Dockerfile index c6117e72..8893b73e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,5 @@ FROM python:3.11-slim -ARG AUTH_VERSION=v4.0.0b2 +ARG AUTH_VERSION=v4.0.0rc1 ARG AUTH_PACKAGE=allianceauth==${AUTH_VERSION} ENV AUTH_USER=allianceauth ENV AUTH_GROUP=allianceauth