Version Bump to 2.7.4

Bugfix: Loading of dashboard fails with 'NoneType object is not iterable' from status_tags

See merge request allianceauth/allianceauth!1237

allianceauth/__init__.py

@@ -1,7 +1,7 @@
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.
 
-__version__ = '2.7.3'
+__version__ = '2.7.4'
 __title__ = 'Alliance Auth'
 __url__ = 'https://gitlab.com/allianceauth/allianceauth'
 NAME = '%s v%s' % (__title__, __version__)

allianceauth/authentication/tests/test_templatetags.py

@@ -83,9 +83,8 @@ class TestStatusOverviewTag(TestCase):
         }
         mock_current_version_info.return_value = version_info
         mock_fetch_celery_queue_length.return_value = 3
-        
+                
-        context = {}
+        result = status_overview()
-        result = status_overview(context)
         expected = {
             'notifications': GITHUB_NOTIFICATION_ISSUES[:5],
             'latest_major': True,
@@ -128,6 +127,13 @@ class TestNotifications(TestCase):
         result = _current_notifications()
         self.assertEqual(result['notifications'], list())
 
+    @patch(MODULE_PATH + '.admin_status.cache')
+    def test_current_notifications_is_none(self, mock_cache):
+        mock_cache.get_or_set.return_value = None
+
+        result = _current_notifications()
+        self.assertEqual(result['notifications'], list())
+
 
 class TestCeleryQueueLength(TestCase):
 
@@ -170,6 +176,15 @@ class TestVersionTags(TestCase):
         result = _fetch_tags_from_gitlab()
         self.assertEqual(result, GITHUB_TAGS)
 
+    @patch(MODULE_PATH + '.admin_status.__version__', TEST_VERSION)
+    @patch(MODULE_PATH + '.admin_status.cache')
+    def test_current_version_info_return_no_data(self, mock_cache):
+        mock_cache.get_or_set.return_value = None
+        
+        expected = {}
+        result = _current_version_summary()
+        self.assertEqual(result, expected)
+
 
 class TestLatestsVersion(TestCase):
 

allianceauth/locale/de/LC_MESSAGES/django.po

@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-08 00:57+0000\n"
+"POT-Creation-Date: 2020-07-29 04:56+0000\n"
 "PO-Revision-Date: 2020-02-18 03:14+0000\n"
 "Last-Translator: Rounon Dax <rounon.dax@terra-nanotech.de>, 2020\n"
 "Language-Team: German (https://www.transifex.com/alliance-auth/teams/107430/de/)\n"
@@ -32,55 +32,55 @@ msgstr ""
 msgid "Email"
 msgstr "E-Mail"
 
-#: allianceauth/authentication/models.py:76
+#: allianceauth/authentication/models.py:78
-msgid "State Changed"
-msgstr "Status geändert"
-
-#: allianceauth/authentication/models.py:77
 #, python-format
-msgid "Your user state has been changed to %(state)s"
+msgid "State changed to: %s"
-msgstr "Dein Nutzerstatus hat sich geändert zu %(state)s"
+msgstr "Status geändert zu %s"
+
+#: allianceauth/authentication/models.py:79
+#, python-format
+msgid "Your user's state is now: %(state)s"
+msgstr "Dein Nutzerstatus ist nun %(state)s"
 
 #: allianceauth/authentication/templates/authentication/dashboard.html:5
 #: allianceauth/authentication/templates/authentication/dashboard.html:8
-#: allianceauth/templates/allianceauth/side-menu.html:10
+#: allianceauth/templates/allianceauth/side-menu.html:12
 msgid "Dashboard"
 msgstr "Dashboard"
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:17
+#: allianceauth/authentication/templates/authentication/dashboard.html:18
-#: allianceauth/corputils/templates/corputils/corpstats.html:116
+#, python-format
-#: allianceauth/corputils/templates/corputils/search.html:16
+msgid ""
-#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html:22
+"\n"
-#: allianceauth/hrapplications/templates/hrapplications/management.html:83
+"                                Main Character (State: %(state)s)\n"
-#: allianceauth/hrapplications/templates/hrapplications/management.html:128
+"                            "
-#: allianceauth/hrapplications/templates/hrapplications/searchview.html:25
+msgstr ""
-#: allianceauth/hrapplications/templates/hrapplications/view.html:32
+"\n"
-msgid "Main Character"
+"Hauptcharakter (Status: %(state)s)"
-msgstr "Hauptcharakter"
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:77
+#: allianceauth/authentication/templates/authentication/dashboard.html:81
 msgid "No main character set."
 msgstr "Kein Hauptcharakter gesetzt."
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:84
+#: allianceauth/authentication/templates/authentication/dashboard.html:88
 msgid "Add Character"
 msgstr "Charakter hinzufügen"
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:88
+#: allianceauth/authentication/templates/authentication/dashboard.html:92
 msgid "Change Main"
 msgstr "Hauptcharakter ändern"
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:97
+#: allianceauth/authentication/templates/authentication/dashboard.html:101
 msgid "Group Memberships"
 msgstr "Gruppen"
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:117
+#: allianceauth/authentication/templates/authentication/dashboard.html:121
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html:23
 #: allianceauth/hrapplications/templates/hrapplications/view.html:41
 msgid "Characters"
 msgstr "Charaktere"
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:125
+#: allianceauth/authentication/templates/authentication/dashboard.html:129
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:73
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:22
 #: allianceauth/groupmanagement/templates/groupmanagement/groups.html:15
@@ -89,13 +89,13 @@ msgstr "Charaktere"
 msgid "Name"
 msgstr "Name"
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:126
+#: allianceauth/authentication/templates/authentication/dashboard.html:130
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html:23
 #: allianceauth/hrapplications/templates/hrapplications/view.html:46
 msgid "Corp"
 msgstr "Corp"
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:127
+#: allianceauth/authentication/templates/authentication/dashboard.html:131
 #: allianceauth/corputils/templates/corputils/corpstats.html:77
 #: allianceauth/hrapplications/templates/hrapplications/view.html:47
 msgid "Alliance"
@@ -236,8 +236,8 @@ msgstr "Letzes Update:"
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:28
 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:27
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:29
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:37
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:51
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:96
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:110
 msgid "Character"
 msgstr "Charakter"
 
@@ -259,6 +259,16 @@ msgstr "Corporation"
 msgid "Killboard"
 msgstr "Killboard"
 
+#: allianceauth/corputils/templates/corputils/corpstats.html:116
+#: allianceauth/corputils/templates/corputils/search.html:16
+#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html:22
+#: allianceauth/hrapplications/templates/hrapplications/management.html:83
+#: allianceauth/hrapplications/templates/hrapplications/management.html:128
+#: allianceauth/hrapplications/templates/hrapplications/searchview.html:25
+#: allianceauth/hrapplications/templates/hrapplications/view.html:32
+msgid "Main Character"
+msgstr "Hauptcharakter"
+
 #: allianceauth/corputils/templates/corputils/corpstats.html:117
 #: allianceauth/corputils/templates/corputils/search.html:17
 msgid "Main Corporation"
@@ -594,8 +604,8 @@ msgid "Portrait"
 msgstr "Portrait"
 
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:30
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:38
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:52
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:97
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:111
 #: allianceauth/permissions_tool/templates/permissions_tool/audit.html:23
 msgid "Organization"
 msgstr "Organization"
@@ -614,7 +624,7 @@ msgstr "Gruppenmitgliedschaft"
 
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:14
 #: allianceauth/permissions_tool/templates/permissions_tool/overview.html:40
-#: allianceauth/templates/allianceauth/side-menu.html:15
+#: allianceauth/templates/allianceauth/side-menu.html:17
 msgid "Groups"
 msgstr "Gruppen"
 
@@ -658,8 +668,8 @@ msgid "Audit Members"
 msgstr "Mitglieder Protokoll"
 
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:56
-msgid "Copy Direrct Join Link"
+msgid "Copy Direct Join Link"
-msgstr ""
+msgstr "Direktlink kopieren"
 
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:68
 msgid "No groups to list."
@@ -690,37 +700,37 @@ msgstr "Keine Gruppen verfügbar"
 msgid "Groups Management"
 msgstr "Gruppenverwaltung"
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:23
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:25
 msgid "Join Requests"
 msgstr "Beitrittsgesuche"
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:24
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:33
 msgid "Leave Requests"
 msgstr "Austrittsgesuche"
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:39
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:53
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:98
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:112
 #: allianceauth/permissions_tool/templates/permissions_tool/audit.html:20
 #: allianceauth/services/modules/openfire/forms.py:6
 msgid "Group"
 msgstr "Gruppen"
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:71
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:85
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:130
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:144
 msgid "Accept"
 msgstr "Akzeptieren"
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:74
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:88
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:133
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:147
 #: allianceauth/hrapplications/templates/hrapplications/view.html:85
 msgid "Reject"
 msgstr "Ablehnen"
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:83
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:97
 msgid "No group add requests."
 msgstr "Keine Gruppenbeitrittsanfragen."
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:142
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:156
 msgid "No group leave requests."
 msgstr "Keine Gruppenaustrittsanfragen"
 
@@ -729,7 +739,7 @@ msgid "Toggle navigation"
 msgstr "Toggle Navigation"
 
 #: allianceauth/groupmanagement/templates/groupmanagement/menu.html:15
-#: allianceauth/templates/allianceauth/side-menu.html:23
+#: allianceauth/templates/allianceauth/side-menu.html:25
 msgid "Group Management"
 msgstr "Gruppenverwaltung"
 
@@ -741,26 +751,26 @@ msgstr "Gruppenanfragen"
 msgid "Group Membership"
 msgstr "Gruppenmitgliedschaft"
 
-#: allianceauth/groupmanagement/views.py:166
+#: allianceauth/groupmanagement/views.py:162
 #, python-format
 msgid "Removed user %(user)s from group %(group)s."
 msgstr "Benutzer %(user)s von Gruppe %(group)s entfernt."
 
-#: allianceauth/groupmanagement/views.py:168
+#: allianceauth/groupmanagement/views.py:164
 msgid "User does not exist in that group"
 msgstr "Benutzer existiert nicht in dieser Gruppe"
 
-#: allianceauth/groupmanagement/views.py:171
+#: allianceauth/groupmanagement/views.py:167
 msgid "Group does not exist"
 msgstr "Gruppe existiert nicht"
 
-#: allianceauth/groupmanagement/views.py:198
+#: allianceauth/groupmanagement/views.py:194
 #, python-format
 msgid "Accepted application from %(mainchar)s to %(group)s."
 msgstr "Beitrittsgesuch von %(mainchar)s zur Gruppe %(group)s zugestimmt."
 
-#: allianceauth/groupmanagement/views.py:205
+#: allianceauth/groupmanagement/views.py:201
-#: allianceauth/groupmanagement/views.py:238
+#: allianceauth/groupmanagement/views.py:234
 #, python-format
 msgid ""
 "An unhandled error occurred while processing the application from "
@@ -769,18 +779,18 @@ msgstr ""
 "Bei der Bearbeitung des Beitrittsgesuchs von %(mainchar)s zur Gruppe "
 "%(group)s ist ein unbehandelter Fehler aufgetreten."
 
-#: allianceauth/groupmanagement/views.py:231
+#: allianceauth/groupmanagement/views.py:227
 #, python-format
 msgid "Rejected application from %(mainchar)s to %(group)s."
 msgstr "Beitrittsgesuch von %(mainchar)s zur Gruppe %(group)s abgelehnt."
 
-#: allianceauth/groupmanagement/views.py:267
+#: allianceauth/groupmanagement/views.py:263
 #, python-format
 msgid "Accepted application from %(mainchar)s to leave %(group)s."
 msgstr "Austrittsgesuch von %(mainchar)s für Gruppe %(group)s akzeptiert."
 
-#: allianceauth/groupmanagement/views.py:273
+#: allianceauth/groupmanagement/views.py:269
-#: allianceauth/groupmanagement/views.py:307
+#: allianceauth/groupmanagement/views.py:303
 #, python-format
 msgid ""
 "An unhandled error occurred while processing the application from "
@@ -789,26 +799,26 @@ msgstr ""
 "Bei der Bearbeitung des Austrittsgesuchs von %(mainchar)s für Gruppe "
 "%(group)s ist ein unbehandelter Fehler aufgetreten."
 
-#: allianceauth/groupmanagement/views.py:300
+#: allianceauth/groupmanagement/views.py:296
 #, python-format
 msgid "Rejected application from %(mainchar)s to leave %(group)s."
 msgstr "Austrittsgesuch von %(mainchar)s für Gruppe %(group)s abgelehnt."
 
-#: allianceauth/groupmanagement/views.py:346
+#: allianceauth/groupmanagement/views.py:342
-#: allianceauth/groupmanagement/views.py:358
+#: allianceauth/groupmanagement/views.py:354
 msgid "You cannot join that group"
 msgstr "Du kannst dieser Gruppe nicht beitreten"
 
-#: allianceauth/groupmanagement/views.py:352
+#: allianceauth/groupmanagement/views.py:348
 msgid "You are already a member of that group."
 msgstr "Du bist bereits Mitglied dieser Gruppe."
 
-#: allianceauth/groupmanagement/views.py:367
+#: allianceauth/groupmanagement/views.py:363
 msgid "You already have a pending application for that group."
 msgstr "Du hast Dich bereits für diese Gruppe beworben."
 
-#: allianceauth/groupmanagement/views.py:370
+#: allianceauth/groupmanagement/views.py:366
-#: allianceauth/groupmanagement/views.py:408
+#: allianceauth/groupmanagement/views.py:404
 #: allianceauth/hrapplications/templates/hrapplications/management.html:37
 #: allianceauth/hrapplications/templates/hrapplications/management.html:72
 #: allianceauth/hrapplications/templates/hrapplications/management.html:99
@@ -820,24 +830,24 @@ msgstr "Du hast Dich bereits für diese Gruppe beworben."
 msgid "Pending"
 msgstr "Beantragt"
 
-#: allianceauth/groupmanagement/views.py:376
+#: allianceauth/groupmanagement/views.py:372
 #, python-format
 msgid "Applied to group %(group)s."
 msgstr "Beitritt zur Gruppe %(group)s beantragt."
 
-#: allianceauth/groupmanagement/views.py:387
+#: allianceauth/groupmanagement/views.py:383
 msgid "You cannot leave that group"
 msgstr "Du kannst diese Gruppe nicht verlassen"
 
-#: allianceauth/groupmanagement/views.py:392
+#: allianceauth/groupmanagement/views.py:388
 msgid "You are not a member of that group"
 msgstr "Du bist kein Mitglied dieser Gruppe"
 
-#: allianceauth/groupmanagement/views.py:401
+#: allianceauth/groupmanagement/views.py:397
 msgid "You already have a pending leave request for that group."
 msgstr "Du hast bereits ein ausstehendes Austrittsgesuch für diese Gruppe."
 
-#: allianceauth/groupmanagement/views.py:414
+#: allianceauth/groupmanagement/views.py:410
 #, python-format
 msgid "Applied to leave group %(group)s."
 msgstr "Austrittsgesuch für Gruppe %(group)s gesendet."
@@ -1300,23 +1310,54 @@ msgstr "Passwort"
 msgid "Password must be at least 8 characters long."
 msgstr "Passwort muss mindestens 8 Zeichen lang sein"
 
-#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:23
+#: allianceauth/services/modules/discord/models.py:224
+msgid "Discord Account Disabled"
+msgstr "Discord Konto deaktiviert"
+
+#: allianceauth/services/modules/discord/models.py:226
+msgid ""
+"Your Discord account was disabeled automatically by Auth. If you think this "
+"was a mistake, please contact an admin."
+msgstr ""
+"Dein Discord Konto wurde automatisch durch Auth deaktiviert. Wenn Du glaubst"
+" dies war ein Fehler, kontaktiere bitte einen Administrator."
+
+#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:18
+msgid "Join the Discord server"
+msgstr "Discord Server beitreten"
+
+#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:22
+msgid "Leave- and rejoin the Discord Server (Reset)"
+msgstr "Discord Server verlassen und wieder beitreten (Zurücksetzen)"
+
+#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:25
+msgid "Leave the Discord server"
+msgstr "Discord Server verlassen"
+
+#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:32
 msgid "Link Discord Server"
 msgstr "Verbinde Discord Server"
 
-#: allianceauth/services/modules/discord/views.py:26
+#: allianceauth/services/modules/discord/views.py:30
 msgid "Deactivated Discord account."
 msgstr "Discord Konto deaktiviert."
 
-#: allianceauth/services/modules/discord/views.py:29
+#: allianceauth/services/modules/discord/views.py:36
-#: allianceauth/services/modules/discord/views.py:41
+#: allianceauth/services/modules/discord/views.py:59
-#: allianceauth/services/modules/discord/views.py:65
 msgid "An error occurred while processing your Discord account."
 msgstr "Es gab einen Fehler bei der Verarbeitung Deines Discord Kontos."
 
-#: allianceauth/services/modules/discord/views.py:62
+#: allianceauth/services/modules/discord/views.py:102
-msgid "Activated Discord account."
+msgid "Your Discord account has been successfully activated."
-msgstr "Discord Konto aktiviert."
+msgstr "Dein Discord Konto wurde erfolgreich aktiviert."
+
+#: allianceauth/services/modules/discord/views.py:108
+msgid ""
+"An error occurred while trying to activate your Discord account. Please try "
+"again."
+msgstr ""
+"Es gab einen Fehler während der Aktivierung Deines Discord Kontos. Bitte "
+"versuche es noch einmal."
 
 #: allianceauth/services/modules/discourse/views.py:37
 msgid "You are not authorized to access Discourse."
@@ -1884,32 +1925,30 @@ msgid "Current"
 msgstr "Aktuell"
 
 #: allianceauth/templates/allianceauth/admin-status/overview.html:40
-msgid "Latest Major"
+msgid "Latest Stable"
-msgstr "Aktuellste Hauptversion"
+msgstr "Aktuellste stabile Version"
 
 #: allianceauth/templates/allianceauth/admin-status/overview.html:46
-#: allianceauth/templates/allianceauth/admin-status/overview.html:56
-#: allianceauth/templates/allianceauth/admin-status/overview.html:66
 msgid "Update available"
 msgstr "Update verfügbar"
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:50
+#: allianceauth/templates/allianceauth/admin-status/overview.html:51
-msgid "Latest Minor"
+msgid "Latest Pre-Release"
-msgstr "Aktuellste Unterversion"
+msgstr "Aktuellste Testversion"
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:60
+#: allianceauth/templates/allianceauth/admin-status/overview.html:57
-msgid "Latest Patch"
+msgid "Pre-Release available"
-msgstr "Aktuellste Patchversion"
+msgstr "Testversion verfügbar"
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:73
+#: allianceauth/templates/allianceauth/admin-status/overview.html:65
 msgid "Task Queue"
 msgstr "Warteschlange"
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:90
+#: allianceauth/templates/allianceauth/admin-status/overview.html:82
 msgid "Error retrieving task queue length"
 msgstr "Fehler beim Ermitteln der Warteschlange."
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:92
+#: allianceauth/templates/allianceauth/admin-status/overview.html:84
 #, python-format
 msgid "%(tasks)s task"
 msgid_plural "%(tasks)s tasks"

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: 2020-05-08 00:57+0000\n"
+"POT-Creation-Date: 2020-07-29 04:56+0000\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,55 +26,53 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: allianceauth/authentication/models.py:76
+#: allianceauth/authentication/models.py:78
-msgid "State Changed"
+#, python-format
+msgid "State changed to: %s"
 msgstr ""
 
-#: allianceauth/authentication/models.py:77
+#: allianceauth/authentication/models.py:79
 #, python-format
-msgid "Your user state has been changed to %(state)s"
+msgid "Your user's state is now: %(state)s"
 msgstr ""
 
 #: allianceauth/authentication/templates/authentication/dashboard.html:5
 #: allianceauth/authentication/templates/authentication/dashboard.html:8
-#: allianceauth/templates/allianceauth/side-menu.html:10
+#: allianceauth/templates/allianceauth/side-menu.html:12
 msgid "Dashboard"
 msgstr ""
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:17
+#: allianceauth/authentication/templates/authentication/dashboard.html:18
-#: allianceauth/corputils/templates/corputils/corpstats.html:116
+#, python-format
-#: allianceauth/corputils/templates/corputils/search.html:16
+msgid ""
-#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html:22
+"\n"
-#: allianceauth/hrapplications/templates/hrapplications/management.html:83
+"                                Main Character (State: %(state)s)\n"
-#: allianceauth/hrapplications/templates/hrapplications/management.html:128
+"                            "
-#: allianceauth/hrapplications/templates/hrapplications/searchview.html:25
-#: allianceauth/hrapplications/templates/hrapplications/view.html:32
-msgid "Main Character"
 msgstr ""
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:77
+#: allianceauth/authentication/templates/authentication/dashboard.html:81
 msgid "No main character set."
 msgstr ""
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:84
+#: allianceauth/authentication/templates/authentication/dashboard.html:88
 msgid "Add Character"
 msgstr ""
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:88
+#: allianceauth/authentication/templates/authentication/dashboard.html:92
 msgid "Change Main"
 msgstr ""
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:97
+#: allianceauth/authentication/templates/authentication/dashboard.html:101
 msgid "Group Memberships"
 msgstr ""
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:117
+#: allianceauth/authentication/templates/authentication/dashboard.html:121
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html:23
 #: allianceauth/hrapplications/templates/hrapplications/view.html:41
 msgid "Characters"
 msgstr ""
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:125
+#: allianceauth/authentication/templates/authentication/dashboard.html:129
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:73
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:22
 #: allianceauth/groupmanagement/templates/groupmanagement/groups.html:15
@@ -83,13 +81,13 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:126
+#: allianceauth/authentication/templates/authentication/dashboard.html:130
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html:23
 #: allianceauth/hrapplications/templates/hrapplications/view.html:46
 msgid "Corp"
 msgstr ""
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:127
+#: allianceauth/authentication/templates/authentication/dashboard.html:131
 #: allianceauth/corputils/templates/corputils/corpstats.html:77
 #: allianceauth/hrapplications/templates/hrapplications/view.html:47
 msgid "Alliance"
@@ -221,8 +219,8 @@ msgstr ""
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:28
 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:27
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:29
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:37
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:51
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:96
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:110
 msgid "Character"
 msgstr ""
 
@@ -244,6 +242,16 @@ msgstr ""
 msgid "Killboard"
 msgstr ""
 
+#: allianceauth/corputils/templates/corputils/corpstats.html:116
+#: allianceauth/corputils/templates/corputils/search.html:16
+#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html:22
+#: allianceauth/hrapplications/templates/hrapplications/management.html:83
+#: allianceauth/hrapplications/templates/hrapplications/management.html:128
+#: allianceauth/hrapplications/templates/hrapplications/searchview.html:25
+#: allianceauth/hrapplications/templates/hrapplications/view.html:32
+msgid "Main Character"
+msgstr ""
+
 #: allianceauth/corputils/templates/corputils/corpstats.html:117
 #: allianceauth/corputils/templates/corputils/search.html:17
 msgid "Main Corporation"
@@ -579,8 +587,8 @@ msgid "Portrait"
 msgstr ""
 
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:30
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:38
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:52
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:97
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:111
 #: allianceauth/permissions_tool/templates/permissions_tool/audit.html:23
 msgid "Organization"
 msgstr ""
@@ -599,7 +607,7 @@ msgstr ""
 
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:14
 #: allianceauth/permissions_tool/templates/permissions_tool/overview.html:40
-#: allianceauth/templates/allianceauth/side-menu.html:15
+#: allianceauth/templates/allianceauth/side-menu.html:17
 msgid "Groups"
 msgstr ""
 
@@ -643,7 +651,7 @@ msgid "Audit Members"
 msgstr ""
 
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:56
-msgid "Copy Direrct Join Link"
+msgid "Copy Direct Join Link"
 msgstr ""
 
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:68
@@ -675,37 +683,37 @@ msgstr ""
 msgid "Groups Management"
 msgstr ""
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:23
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:25
 msgid "Join Requests"
 msgstr ""
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:24
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:33
 msgid "Leave Requests"
 msgstr ""
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:39
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:53
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:98
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:112
 #: allianceauth/permissions_tool/templates/permissions_tool/audit.html:20
 #: allianceauth/services/modules/openfire/forms.py:6
 msgid "Group"
 msgstr ""
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:71
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:85
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:130
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:144
 msgid "Accept"
 msgstr ""
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:74
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:88
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:133
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:147
 #: allianceauth/hrapplications/templates/hrapplications/view.html:85
 msgid "Reject"
 msgstr ""
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:83
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:97
 msgid "No group add requests."
 msgstr ""
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:142
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:156
 msgid "No group leave requests."
 msgstr ""
 
@@ -714,7 +722,7 @@ msgid "Toggle navigation"
 msgstr ""
 
 #: allianceauth/groupmanagement/templates/groupmanagement/menu.html:15
-#: allianceauth/templates/allianceauth/side-menu.html:23
+#: allianceauth/templates/allianceauth/side-menu.html:25
 msgid "Group Management"
 msgstr ""
 
@@ -726,70 +734,70 @@ msgstr ""
 msgid "Group Membership"
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:166
+#: allianceauth/groupmanagement/views.py:162
 #, python-format
 msgid "Removed user %(user)s from group %(group)s."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:168
+#: allianceauth/groupmanagement/views.py:164
 msgid "User does not exist in that group"
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:171
+#: allianceauth/groupmanagement/views.py:167
 msgid "Group does not exist"
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:198
+#: allianceauth/groupmanagement/views.py:194
 #, python-format
 msgid "Accepted application from %(mainchar)s to %(group)s."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:205
+#: allianceauth/groupmanagement/views.py:201
-#: allianceauth/groupmanagement/views.py:238
+#: allianceauth/groupmanagement/views.py:234
 #, python-format
 msgid ""
 "An unhandled error occurred while processing the application from "
 "%(mainchar)s to %(group)s."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:231
+#: allianceauth/groupmanagement/views.py:227
 #, python-format
 msgid "Rejected application from %(mainchar)s to %(group)s."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:267
+#: allianceauth/groupmanagement/views.py:263
 #, python-format
 msgid "Accepted application from %(mainchar)s to leave %(group)s."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:273
+#: allianceauth/groupmanagement/views.py:269
-#: allianceauth/groupmanagement/views.py:307
+#: allianceauth/groupmanagement/views.py:303
 #, python-format
 msgid ""
 "An unhandled error occurred while processing the application from "
 "%(mainchar)s to leave %(group)s."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:300
+#: allianceauth/groupmanagement/views.py:296
 #, python-format
 msgid "Rejected application from %(mainchar)s to leave %(group)s."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:346
+#: allianceauth/groupmanagement/views.py:342
-#: allianceauth/groupmanagement/views.py:358
+#: allianceauth/groupmanagement/views.py:354
 msgid "You cannot join that group"
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:352
+#: allianceauth/groupmanagement/views.py:348
 msgid "You are already a member of that group."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:367
+#: allianceauth/groupmanagement/views.py:363
 msgid "You already have a pending application for that group."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:370
+#: allianceauth/groupmanagement/views.py:366
-#: allianceauth/groupmanagement/views.py:408
+#: allianceauth/groupmanagement/views.py:404
 #: allianceauth/hrapplications/templates/hrapplications/management.html:37
 #: allianceauth/hrapplications/templates/hrapplications/management.html:72
 #: allianceauth/hrapplications/templates/hrapplications/management.html:99
@@ -801,24 +809,24 @@ msgstr ""
 msgid "Pending"
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:376
+#: allianceauth/groupmanagement/views.py:372
 #, python-format
 msgid "Applied to group %(group)s."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:387
+#: allianceauth/groupmanagement/views.py:383
 msgid "You cannot leave that group"
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:392
+#: allianceauth/groupmanagement/views.py:388
 msgid "You are not a member of that group"
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:401
+#: allianceauth/groupmanagement/views.py:397
 msgid "You already have a pending leave request for that group."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:414
+#: allianceauth/groupmanagement/views.py:410
 #, python-format
 msgid "Applied to leave group %(group)s."
 msgstr ""
@@ -1281,22 +1289,49 @@ msgstr ""
 msgid "Password must be at least 8 characters long."
 msgstr ""
 
-#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:23
+#: allianceauth/services/modules/discord/models.py:224
+msgid "Discord Account Disabled"
+msgstr ""
+
+#: allianceauth/services/modules/discord/models.py:226
+msgid ""
+"Your Discord account was disabeled automatically by Auth. If you think this "
+"was a mistake, please contact an admin."
+msgstr ""
+
+#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:18
+msgid "Join the Discord server"
+msgstr ""
+
+#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:22
+msgid "Leave- and rejoin the Discord Server (Reset)"
+msgstr ""
+
+#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:25
+msgid "Leave the Discord server"
+msgstr ""
+
+#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:32
 msgid "Link Discord Server"
 msgstr ""
 
-#: allianceauth/services/modules/discord/views.py:26
+#: allianceauth/services/modules/discord/views.py:30
 msgid "Deactivated Discord account."
 msgstr ""
 
-#: allianceauth/services/modules/discord/views.py:29
+#: allianceauth/services/modules/discord/views.py:36
-#: allianceauth/services/modules/discord/views.py:41
+#: allianceauth/services/modules/discord/views.py:59
-#: allianceauth/services/modules/discord/views.py:65
 msgid "An error occurred while processing your Discord account."
 msgstr ""
 
-#: allianceauth/services/modules/discord/views.py:62
+#: allianceauth/services/modules/discord/views.py:102
-msgid "Activated Discord account."
+msgid "Your Discord account has been successfully activated."
+msgstr ""
+
+#: allianceauth/services/modules/discord/views.py:108
+msgid ""
+"An error occurred while trying to activate your Discord account. Please try "
+"again."
 msgstr ""
 
 #: allianceauth/services/modules/discourse/views.py:37
@@ -1848,32 +1883,30 @@ msgid "Current"
 msgstr ""
 
 #: allianceauth/templates/allianceauth/admin-status/overview.html:40
-msgid "Latest Major"
+msgid "Latest Stable"
 msgstr ""
 
 #: allianceauth/templates/allianceauth/admin-status/overview.html:46
-#: allianceauth/templates/allianceauth/admin-status/overview.html:56
-#: allianceauth/templates/allianceauth/admin-status/overview.html:66
 msgid "Update available"
 msgstr ""
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:50
+#: allianceauth/templates/allianceauth/admin-status/overview.html:51
-msgid "Latest Minor"
+msgid "Latest Pre-Release"
 msgstr ""
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:60
+#: allianceauth/templates/allianceauth/admin-status/overview.html:57
-msgid "Latest Patch"
+msgid "Pre-Release available"
 msgstr ""
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:73
+#: allianceauth/templates/allianceauth/admin-status/overview.html:65
 msgid "Task Queue"
 msgstr ""
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:90
+#: allianceauth/templates/allianceauth/admin-status/overview.html:82
 msgid "Error retrieving task queue length"
 msgstr ""
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:92
+#: allianceauth/templates/allianceauth/admin-status/overview.html:84
 #, python-format
 msgid "%(tasks)s task"
 msgid_plural "%(tasks)s tasks"

allianceauth/locale/ru/LC_MESSAGES/django.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-08 00:57+0000\n"
+"POT-Creation-Date: 2020-07-29 04:56+0000\n"
 "PO-Revision-Date: 2020-02-18 03:14+0000\n"
 "Last-Translator: Alexander Gess <de.alex.gess@gmail.com>, 2020\n"
 "Language-Team: Russian (https://www.transifex.com/alliance-auth/teams/107430/ru/)\n"
@@ -29,55 +29,56 @@ msgstr "Необходимо указать основного персонаж
 msgid "Email"
 msgstr "Email"
 
-#: allianceauth/authentication/models.py:76
+#: allianceauth/authentication/models.py:78
-msgid "State Changed"
-msgstr "Состояние заменено. "
-
-#: allianceauth/authentication/models.py:77
 #, python-format
-msgid "Your user state has been changed to %(state)s"
+msgid "State changed to: %s"
-msgstr "Статус вашего пользователя сменен на %(state)s"
+msgstr "Статус изменен: %s"
+
+#: allianceauth/authentication/models.py:79
+#, python-format
+msgid "Your user's state is now: %(state)s"
+msgstr "Статус пилота: %(state)s"
 
 #: allianceauth/authentication/templates/authentication/dashboard.html:5
 #: allianceauth/authentication/templates/authentication/dashboard.html:8
-#: allianceauth/templates/allianceauth/side-menu.html:10
+#: allianceauth/templates/allianceauth/side-menu.html:12
 msgid "Dashboard"
 msgstr "Панель показателей"
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:17
+#: allianceauth/authentication/templates/authentication/dashboard.html:18
-#: allianceauth/corputils/templates/corputils/corpstats.html:116
+#, python-format
-#: allianceauth/corputils/templates/corputils/search.html:16
+msgid ""
-#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html:22
+"\n"
-#: allianceauth/hrapplications/templates/hrapplications/management.html:83
+"                                Main Character (State: %(state)s)\n"
-#: allianceauth/hrapplications/templates/hrapplications/management.html:128
+"                            "
-#: allianceauth/hrapplications/templates/hrapplications/searchview.html:25
+msgstr ""
-#: allianceauth/hrapplications/templates/hrapplications/view.html:32
+"\n"
-msgid "Main Character"
+"                                Основной персонаж (статус: %(state)s)\n"
-msgstr "Основной персонаж"
+"                            "
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:77
+#: allianceauth/authentication/templates/authentication/dashboard.html:81
 msgid "No main character set."
 msgstr "Основной персонаж не установлен."
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:84
+#: allianceauth/authentication/templates/authentication/dashboard.html:88
 msgid "Add Character"
 msgstr "Добавить Персонажа"
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:88
+#: allianceauth/authentication/templates/authentication/dashboard.html:92
 msgid "Change Main"
 msgstr "Сменить основного персонажа"
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:97
+#: allianceauth/authentication/templates/authentication/dashboard.html:101
 msgid "Group Memberships"
 msgstr "Групповое участие"
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:117
+#: allianceauth/authentication/templates/authentication/dashboard.html:121
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html:23
 #: allianceauth/hrapplications/templates/hrapplications/view.html:41
 msgid "Characters"
 msgstr "Персонажи"
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:125
+#: allianceauth/authentication/templates/authentication/dashboard.html:129
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:73
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:22
 #: allianceauth/groupmanagement/templates/groupmanagement/groups.html:15
@@ -86,13 +87,13 @@ msgstr "Персонажи"
 msgid "Name"
 msgstr "Имя"
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:126
+#: allianceauth/authentication/templates/authentication/dashboard.html:130
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html:23
 #: allianceauth/hrapplications/templates/hrapplications/view.html:46
 msgid "Corp"
 msgstr "Корпорация"
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:127
+#: allianceauth/authentication/templates/authentication/dashboard.html:131
 #: allianceauth/corputils/templates/corputils/corpstats.html:77
 #: allianceauth/hrapplications/templates/hrapplications/view.html:47
 msgid "Alliance"
@@ -141,6 +142,7 @@ msgid ""
 "Cannot change main character to %(char)s: character owned by a different "
 "account."
 msgstr ""
+"Нельзя сменить основного персонажа на %(char)s: похоже, что Владелец не Вы. "
 
 #: allianceauth/authentication/views.py:80
 #, python-format
@@ -226,8 +228,8 @@ msgstr "Последнее обновление: "
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:28
 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:27
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:29
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:37
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:51
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:96
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:110
 msgid "Character"
 msgstr "Персонаж"
 
@@ -249,6 +251,16 @@ msgstr "Корпорация"
 msgid "Killboard"
 msgstr "zKillBoard"
 
+#: allianceauth/corputils/templates/corputils/corpstats.html:116
+#: allianceauth/corputils/templates/corputils/search.html:16
+#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html:22
+#: allianceauth/hrapplications/templates/hrapplications/management.html:83
+#: allianceauth/hrapplications/templates/hrapplications/management.html:128
+#: allianceauth/hrapplications/templates/hrapplications/searchview.html:25
+#: allianceauth/hrapplications/templates/hrapplications/view.html:32
+msgid "Main Character"
+msgstr "Основной персонаж"
+
 #: allianceauth/corputils/templates/corputils/corpstats.html:117
 #: allianceauth/corputils/templates/corputils/search.html:17
 msgid "Main Corporation"
@@ -588,8 +600,8 @@ msgid "Portrait"
 msgstr "Портрет"
 
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:30
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:38
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:52
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:97
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:111
 #: allianceauth/permissions_tool/templates/permissions_tool/audit.html:23
 msgid "Organization"
 msgstr "Корпорация"
@@ -608,7 +620,7 @@ msgstr "Участники группы"
 
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:14
 #: allianceauth/permissions_tool/templates/permissions_tool/overview.html:40
-#: allianceauth/templates/allianceauth/side-menu.html:15
+#: allianceauth/templates/allianceauth/side-menu.html:17
 msgid "Groups"
 msgstr "Группы"
 
@@ -652,8 +664,8 @@ msgid "Audit Members"
 msgstr "Проверить участников"
 
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:56
-msgid "Copy Direrct Join Link"
+msgid "Copy Direct Join Link"
-msgstr ""
+msgstr "Скопировать ссылку подключения"
 
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:68
 msgid "No groups to list."
@@ -684,37 +696,37 @@ msgstr "Нет доступных групп."
 msgid "Groups Management"
 msgstr "Управление Группами"
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:23
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:25
 msgid "Join Requests"
 msgstr "Запрос на присоединение"
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:24
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:33
 msgid "Leave Requests"
 msgstr "Запрос на Выход"
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:39
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:53
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:98
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:112
 #: allianceauth/permissions_tool/templates/permissions_tool/audit.html:20
 #: allianceauth/services/modules/openfire/forms.py:6
 msgid "Group"
 msgstr "Группа"
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:71
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:85
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:130
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:144
 msgid "Accept"
 msgstr "Принять"
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:74
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:88
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:133
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:147
 #: allianceauth/hrapplications/templates/hrapplications/view.html:85
 msgid "Reject"
 msgstr "Сбросить"
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:83
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:97
 msgid "No group add requests."
 msgstr "Нет групповых запросов на вступление"
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:142
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:156
 msgid "No group leave requests."
 msgstr "Нет групповых запросов на выход"
 
@@ -723,7 +735,7 @@ msgid "Toggle navigation"
 msgstr "Проложить маршрут"
 
 #: allianceauth/groupmanagement/templates/groupmanagement/menu.html:15
-#: allianceauth/templates/allianceauth/side-menu.html:23
+#: allianceauth/templates/allianceauth/side-menu.html:25
 msgid "Group Management"
 msgstr "Управление Группой"
 
@@ -735,26 +747,26 @@ msgstr "Групповой запрос"
 msgid "Group Membership"
 msgstr "Групповое участие"
 
-#: allianceauth/groupmanagement/views.py:166
+#: allianceauth/groupmanagement/views.py:162
 #, 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:164
 msgid "User does not exist in that group"
 msgstr "Пользователь не существует в этой группе."
 
-#: allianceauth/groupmanagement/views.py:171
+#: allianceauth/groupmanagement/views.py:167
 msgid "Group does not exist"
 msgstr "Группа не существует."
 
-#: allianceauth/groupmanagement/views.py:198
+#: allianceauth/groupmanagement/views.py:194
 #, python-format
 msgid "Accepted application from %(mainchar)s to %(group)s."
 msgstr "Запрос от %(mainchar)sв %(group)s принят."
 
-#: allianceauth/groupmanagement/views.py:205
+#: allianceauth/groupmanagement/views.py:201
-#: allianceauth/groupmanagement/views.py:238
+#: allianceauth/groupmanagement/views.py:234
 #, python-format
 msgid ""
 "An unhandled error occurred while processing the application from "
@@ -763,44 +775,46 @@ msgstr ""
 "Персонаж %(mainchar)s не может быть добавлен %(group)s, из-за непредвиденной"
 " ошибки. "
 
-#: allianceauth/groupmanagement/views.py:231
+#: allianceauth/groupmanagement/views.py:227
 #, python-format
 msgid "Rejected application from %(mainchar)s to %(group)s."
 msgstr "%(mainchar)s исключен из %(group)s."
 
-#: allianceauth/groupmanagement/views.py:267
+#: allianceauth/groupmanagement/views.py:263
 #, python-format
 msgid "Accepted application from %(mainchar)s to leave %(group)s."
 msgstr "Утвержден выход %(mainchar)s из %(group)s.  "
 
-#: allianceauth/groupmanagement/views.py:273
+#: allianceauth/groupmanagement/views.py:269
-#: allianceauth/groupmanagement/views.py:307
+#: allianceauth/groupmanagement/views.py:303
 #, 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:300
+#: allianceauth/groupmanagement/views.py:296
 #, python-format
 msgid "Rejected application from %(mainchar)s to leave %(group)s."
 msgstr "Прошение об исключении %(mainchar)s из %(group)s – отклонено. "
 
-#: allianceauth/groupmanagement/views.py:346
+#: allianceauth/groupmanagement/views.py:342
-#: allianceauth/groupmanagement/views.py:358
+#: allianceauth/groupmanagement/views.py:354
 msgid "You cannot join that group"
 msgstr "Вы не можете вступить"
 
-#: allianceauth/groupmanagement/views.py:352
+#: allianceauth/groupmanagement/views.py:348
 msgid "You are already a member of that group."
-msgstr ""
+msgstr "Вы уже участник этой группы."
 
-#: allianceauth/groupmanagement/views.py:367
+#: allianceauth/groupmanagement/views.py:363
 msgid "You already have a pending application for that group."
-msgstr ""
+msgstr "Вы уже подали заявку на вступление этой группы."
 
-#: allianceauth/groupmanagement/views.py:370
+#: allianceauth/groupmanagement/views.py:366
-#: allianceauth/groupmanagement/views.py:408
+#: allianceauth/groupmanagement/views.py:404
 #: allianceauth/hrapplications/templates/hrapplications/management.html:37
 #: allianceauth/hrapplications/templates/hrapplications/management.html:72
 #: allianceauth/hrapplications/templates/hrapplications/management.html:99
@@ -812,24 +826,24 @@ msgstr ""
 msgid "Pending"
 msgstr "Ожидание"
 
-#: allianceauth/groupmanagement/views.py:376
+#: allianceauth/groupmanagement/views.py:372
 #, python-format
 msgid "Applied to group %(group)s."
 msgstr "Вступить в группу %(group)s."
 
-#: allianceauth/groupmanagement/views.py:387
+#: allianceauth/groupmanagement/views.py:383
 msgid "You cannot leave that group"
 msgstr "Вы не можете покинуть эту группу"
 
-#: allianceauth/groupmanagement/views.py:392
+#: allianceauth/groupmanagement/views.py:388
 msgid "You are not a member of that group"
 msgstr "Вы не участник группыы"
 
-#: allianceauth/groupmanagement/views.py:401
+#: allianceauth/groupmanagement/views.py:397
 msgid "You already have a pending leave request for that group."
-msgstr ""
+msgstr "Ваш запрос находится на рассмотрении"
 
-#: allianceauth/groupmanagement/views.py:414
+#: allianceauth/groupmanagement/views.py:410
 #, python-format
 msgid "Applied to leave group %(group)s."
 msgstr "Запрос на выход из группы %(group)s."
@@ -1222,15 +1236,15 @@ msgstr "Состояния"
 
 #: allianceauth/services/abstract.py:72
 msgid "That service account already exists"
-msgstr ""
+msgstr "Этот сервис уже активирован"
 
 #: allianceauth/services/abstract.py:104
 msgid "Successfully set your {} password"
-msgstr ""
+msgstr "{} Пароль успешно обновлен."
 
 #: allianceauth/services/auth_hooks.py:11
 msgid "Services"
-msgstr ""
+msgstr "Сервисные услуги"
 
 #: allianceauth/services/forms.py:6
 msgid "Name of Fleet:"
@@ -1292,37 +1306,74 @@ msgstr "Пароль"
 msgid "Password must be at least 8 characters long."
 msgstr "Пароль должен быть не менее 8 символов."
 
-#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:23
+#: allianceauth/services/modules/discord/models.py:224
+msgid "Discord Account Disabled"
+msgstr "Discord персонаж отключен"
+
+#: allianceauth/services/modules/discord/models.py:226
+msgid ""
+"Your Discord account was disabeled automatically by Auth. If you think this "
+"was a mistake, please contact an admin."
+msgstr ""
+"Ваш доступ на сервер Discord был отменен. Если Вы считаете что по ошибке, "
+"пожалуйста, свяжитесь с СЕО."
+
+#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:18
+msgid "Join the Discord server"
+msgstr "Подключиться к серверу Discord"
+
+#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:22
+msgid "Leave- and rejoin the Discord Server (Reset)"
+msgstr "Переподключиться к серверу Discord. "
+
+#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:25
+msgid "Leave the Discord server"
+msgstr "Покинуть Discord сервер"
+
+#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:32
 msgid "Link Discord Server"
 msgstr "Ссылка на сервер Discord"
 
-#: allianceauth/services/modules/discord/views.py:26
+#: allianceauth/services/modules/discord/views.py:30
 msgid "Deactivated Discord account."
-msgstr ""
+msgstr "Отменить доступ на Discord сервер."
 
-#: allianceauth/services/modules/discord/views.py:29
+#: allianceauth/services/modules/discord/views.py:36
-#: allianceauth/services/modules/discord/views.py:41
+#: allianceauth/services/modules/discord/views.py:59
-#: allianceauth/services/modules/discord/views.py:65
 msgid "An error occurred while processing your Discord account."
 msgstr ""
+"Во время обработки Discord аккаунта возникла ошибка. Попробуйте чуточку "
+"позднее. "
 
-#: allianceauth/services/modules/discord/views.py:62
+#: allianceauth/services/modules/discord/views.py:102
-msgid "Activated Discord account."
+msgid "Your Discord account has been successfully activated."
+msgstr "Доступ на сервер Discord успешно получен."
+
+#: allianceauth/services/modules/discord/views.py:108
+msgid ""
+"An error occurred while trying to activate your Discord account. Please try "
+"again."
 msgstr ""
+"Во время активации Discord аккаунта возникла ошибка. Попробуйте чуточку "
+"позднее. "
 
 #: allianceauth/services/modules/discourse/views.py:37
 msgid "You are not authorized to access Discourse."
-msgstr ""
+msgstr "Вы не авторизованы в Discourse."
 
 #: allianceauth/services/modules/discourse/views.py:42
 msgid "You must have a main character set to access Discourse."
 msgstr ""
+"Для авторизации Discourse, необходимо получить авторизацию Вашим основным "
+"аккаунтом."
 
 #: allianceauth/services/modules/discourse/views.py:52
 msgid ""
 "No SSO payload or signature. Please contact support if this problem "
 "persists."
 msgstr ""
+"Отсуствует связь SSO. Если ошибка повторяется - свяжитесь с тех. поддержкой."
+" "
 
 #: allianceauth/services/modules/discourse/views.py:62
 #: allianceauth/services/modules/discourse/views.py:70
@@ -1354,7 +1405,7 @@ msgstr ""
 
 #: allianceauth/services/modules/openfire/auth_hooks.py:26
 msgid "Jabber"
-msgstr ""
+msgstr "Jabber"
 
 #: allianceauth/services/modules/openfire/auth_hooks.py:78
 #: allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html:6
@@ -1380,50 +1431,50 @@ msgstr "Бродкаст"
 
 #: allianceauth/services/modules/openfire/views.py:35
 msgid "Activated jabber account."
-msgstr ""
+msgstr "Активировать доступ в jabber."
 
 #: allianceauth/services/modules/openfire/views.py:44
 #: allianceauth/services/modules/openfire/views.py:57
 #: allianceauth/services/modules/openfire/views.py:78
 #: allianceauth/services/modules/openfire/views.py:151
 msgid "An error occurred while processing your jabber account."
-msgstr ""
+msgstr "Возникла ошибка во время активации jabber'а ."
 
 #: allianceauth/services/modules/openfire/views.py:70
 msgid "Reset jabber password."
-msgstr ""
+msgstr "Сбросить jabber пароль."
 
 #: allianceauth/services/modules/openfire/views.py:119
 #, python-format
 msgid "Sent jabber broadcast to %s"
-msgstr ""
+msgstr "Отправить Бродкаст %s"
 
 #: allianceauth/services/modules/openfire/views.py:148
 msgid "Set jabber password."
-msgstr ""
+msgstr "Установить jabber пароль."
 
 #: allianceauth/services/modules/phpbb3/views.py:34
 msgid "Activated forum account."
-msgstr ""
+msgstr "Допустить на Форум."
 
 #: allianceauth/services/modules/phpbb3/views.py:43
 #: allianceauth/services/modules/phpbb3/views.py:57
 #: allianceauth/services/modules/phpbb3/views.py:80
 #: allianceauth/services/modules/phpbb3/views.py:103
 msgid "An error occurred while processing your forum account."
-msgstr ""
+msgstr "Во время обработки Форумного аккаунта, возникла ошибка."
 
 #: allianceauth/services/modules/phpbb3/views.py:54
 msgid "Deactivated forum account."
-msgstr ""
+msgstr "Отменить доступ на Форум. "
 
 #: allianceauth/services/modules/phpbb3/views.py:71
 msgid "Reset forum password."
-msgstr ""
+msgstr "Сбросить пароль на Форум."
 
 #: allianceauth/services/modules/phpbb3/views.py:100
 msgid "Set forum password."
-msgstr ""
+msgstr "Установить пароль на Форум."
 
 #: allianceauth/services/modules/smf/views.py:34
 msgid "Activated SMF account."
@@ -1473,21 +1524,21 @@ msgstr "Продолжить"
 
 #: allianceauth/services/modules/teamspeak3/views.py:34
 msgid "Activated TeamSpeak3 account."
-msgstr ""
+msgstr "Активировать аккаунт TeamSpeak3."
 
 #: allianceauth/services/modules/teamspeak3/views.py:37
 #: allianceauth/services/modules/teamspeak3/views.py:74
 #: allianceauth/services/modules/teamspeak3/views.py:100
 msgid "An error occurred while processing your TeamSpeak3 account."
-msgstr ""
+msgstr "Во время активации TeamSpeak3 возникла ошибка, попробуйте позже."
 
 #: allianceauth/services/modules/teamspeak3/views.py:71
 msgid "Deactivated TeamSpeak3 account."
-msgstr ""
+msgstr "Отключить TeamSpeak3 аккаунт."
 
 #: allianceauth/services/modules/teamspeak3/views.py:97
 msgid "Reset TeamSpeak3 permission key."
-msgstr ""
+msgstr "Сбросить TeamSpeak3 ключ доступа."
 
 #: allianceauth/services/modules/xenforo/views.py:30
 msgid "Activated XenForo account."
@@ -1866,32 +1917,30 @@ msgid "Current"
 msgstr "Текущий"
 
 #: allianceauth/templates/allianceauth/admin-status/overview.html:40
-msgid "Latest Major"
+msgid "Latest Stable"
-msgstr "Последняя версия"
+msgstr "Стабильная Версия"
 
 #: allianceauth/templates/allianceauth/admin-status/overview.html:46
-#: allianceauth/templates/allianceauth/admin-status/overview.html:56
-#: allianceauth/templates/allianceauth/admin-status/overview.html:66
 msgid "Update available"
 msgstr "Доступно обновление"
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:50
+#: allianceauth/templates/allianceauth/admin-status/overview.html:51
-msgid "Latest Minor"
+msgid "Latest Pre-Release"
-msgstr "Последняя версия"
+msgstr "Предрелизная Версия"
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:60
+#: allianceauth/templates/allianceauth/admin-status/overview.html:57
-msgid "Latest Patch"
+msgid "Pre-Release available"
-msgstr "Последние исправления"
+msgstr "Предрелизная Версия"
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:73
+#: allianceauth/templates/allianceauth/admin-status/overview.html:65
 msgid "Task Queue"
 msgstr "Список задач"
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:90
+#: allianceauth/templates/allianceauth/admin-status/overview.html:82
 msgid "Error retrieving task queue length"
 msgstr "Ошибка при получении списка задач. "
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:92
+#: allianceauth/templates/allianceauth/admin-status/overview.html:84
 #, python-format
 msgid "%(tasks)s task"
 msgid_plural "%(tasks)s tasks"

allianceauth/locale/zh_Hans/LC_MESSAGES/django.po

@@ -6,15 +6,16 @@
 # Translators:
 # Joel Falknau <ozirascal@gmail.com>, 2020
 # Jesse . <sgeine@hotmail.com>, 2020
+# Aaron BuBu <351793078@qq.com>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-10 01:32+0000\n"
+"POT-Creation-Date: 2020-07-29 03:24+0000\n"
 "PO-Revision-Date: 2020-02-18 03:14+0000\n"
-"Last-Translator: Jesse . <sgeine@hotmail.com>, 2020\n"
+"Last-Translator: Aaron BuBu <351793078@qq.com>, 2020\n"
 "Language-Team: Chinese Simplified (https://www.transifex.com/alliance-auth/teams/107430/zh-Hans/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,55 +31,53 @@ msgstr "只有主要角色才能执行这个操作。在下面添加一个"
 msgid "Email"
 msgstr "电子邮箱"
 
-#: allianceauth/authentication/models.py:76
+#: allianceauth/authentication/models.py:78
-msgid "State Changed"
-msgstr "状态已经更改"
-
-#: allianceauth/authentication/models.py:77
 #, python-format
-msgid "Your user state has been changed to %(state)s"
+msgid "State changed to: %s"
-msgstr "您的用户状态已经更改为%(state)s"
+msgstr ""
+
+#: allianceauth/authentication/models.py:79
+#, python-format
+msgid "Your user's state is now: %(state)s"
+msgstr ""
 
 #: allianceauth/authentication/templates/authentication/dashboard.html:5
 #: allianceauth/authentication/templates/authentication/dashboard.html:8
-#: allianceauth/templates/allianceauth/side-menu.html:10
+#: allianceauth/templates/allianceauth/side-menu.html:12
 msgid "Dashboard"
 msgstr "账户总览"
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:17
+#: allianceauth/authentication/templates/authentication/dashboard.html:18
-#: allianceauth/corputils/templates/corputils/corpstats.html:116
+#, python-format
-#: allianceauth/corputils/templates/corputils/search.html:16
+msgid ""
-#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html:22
+"\n"
-#: allianceauth/hrapplications/templates/hrapplications/management.html:83
+"                                Main Character (State: %(state)s)\n"
-#: allianceauth/hrapplications/templates/hrapplications/management.html:128
+"                            "
-#: allianceauth/hrapplications/templates/hrapplications/searchview.html:25
+msgstr ""
-#: allianceauth/hrapplications/templates/hrapplications/view.html:32
-msgid "Main Character"
-msgstr "主要角色"
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:77
+#: allianceauth/authentication/templates/authentication/dashboard.html:81
 msgid "No main character set."
 msgstr "没有主要角色组"
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:84
+#: allianceauth/authentication/templates/authentication/dashboard.html:88
 msgid "Add Character"
 msgstr "添加角色"
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:88
+#: allianceauth/authentication/templates/authentication/dashboard.html:92
 msgid "Change Main"
 msgstr "修改主要角色"
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:97
+#: allianceauth/authentication/templates/authentication/dashboard.html:101
 msgid "Group Memberships"
 msgstr "用户组成员"
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:117
+#: allianceauth/authentication/templates/authentication/dashboard.html:121
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html:23
 #: allianceauth/hrapplications/templates/hrapplications/view.html:41
 msgid "Characters"
 msgstr "角色"
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:125
+#: allianceauth/authentication/templates/authentication/dashboard.html:129
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:73
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:22
 #: allianceauth/groupmanagement/templates/groupmanagement/groups.html:15
@@ -87,13 +86,13 @@ msgstr "角色"
 msgid "Name"
 msgstr "角色名"
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:126
+#: allianceauth/authentication/templates/authentication/dashboard.html:130
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html:23
 #: allianceauth/hrapplications/templates/hrapplications/view.html:46
 msgid "Corp"
 msgstr "所在公司"
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:127
+#: allianceauth/authentication/templates/authentication/dashboard.html:131
 #: allianceauth/corputils/templates/corputils/corpstats.html:77
 #: allianceauth/hrapplications/templates/hrapplications/view.html:47
 msgid "Alliance"
@@ -134,40 +133,47 @@ msgstr "您的IT团队"
 msgid "Submit"
 msgstr "提交"
 
-#: allianceauth/authentication/views.py:77
+#: allianceauth/authentication/views.py:74
+#, python-format
+msgid ""
+"Cannot change main character to %(char)s: character owned by a different "
+"account."
+msgstr "不能修改主角色为%(char)s：这个角色被另一个账户所拥有"
+
+#: allianceauth/authentication/views.py:80
 #, python-format
 msgid "Changed main character to %(char)s"
 msgstr "修改主要角色为%(char)s"
 
-#: allianceauth/authentication/views.py:86
+#: allianceauth/authentication/views.py:89
 #, python-format
 msgid "Added %(name)s to your account."
 msgstr "添加%(name)s到您的账户"
 
-#: allianceauth/authentication/views.py:88
+#: allianceauth/authentication/views.py:91
 #, python-format
 msgid "Failed to add %(name)s to your account: they already have an account."
 msgstr "添加%(name)s到您的账户失败：他们已经在一个账户中了"
 
-#: allianceauth/authentication/views.py:127
+#: allianceauth/authentication/views.py:130
 msgid "Unable to authenticate as the selected character."
 msgstr "无法作为选定的角色进行身份验证"
 
-#: allianceauth/authentication/views.py:145
+#: allianceauth/authentication/views.py:148
 msgid "Registration token has expired."
 msgstr "注册令牌过期。"
 
-#: allianceauth/authentication/views.py:197
+#: allianceauth/authentication/views.py:200
 msgid ""
 "Sent confirmation email. Please follow the link to confirm your email "
 "address."
 msgstr "已经发送了确认邮件。请按照链接确定您的电邮地址"
 
-#: allianceauth/authentication/views.py:202
+#: allianceauth/authentication/views.py:205
 msgid "Confirmed your email address. Please login to continue."
 msgstr "已确认您的电邮地址。请登录以继续"
 
-#: allianceauth/authentication/views.py:207
+#: allianceauth/authentication/views.py:210
 msgid "Registraion of new accounts it not allowed at this time."
 msgstr "现在不允许注册新账户。"
 
@@ -218,8 +224,8 @@ msgstr "最后一次更新"
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:28
 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:27
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:29
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:37
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:51
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:96
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:110
 msgid "Character"
 msgstr "角色"
 
@@ -241,6 +247,16 @@ msgstr "公司"
 msgid "Killboard"
 msgstr "KB板"
 
+#: allianceauth/corputils/templates/corputils/corpstats.html:116
+#: allianceauth/corputils/templates/corputils/search.html:16
+#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html:22
+#: allianceauth/hrapplications/templates/hrapplications/management.html:83
+#: allianceauth/hrapplications/templates/hrapplications/management.html:128
+#: allianceauth/hrapplications/templates/hrapplications/searchview.html:25
+#: allianceauth/hrapplications/templates/hrapplications/view.html:32
+msgid "Main Character"
+msgstr "主要角色"
+
 #: allianceauth/corputils/templates/corputils/corpstats.html:117
 #: allianceauth/corputils/templates/corputils/search.html:17
 msgid "Main Corporation"
@@ -527,6 +543,12 @@ msgstr "PAP链接已过期"
 msgid "Audit Log"
 msgstr "审计日志"
 
+#: allianceauth/groupmanagement/templates/groupmanagement/audit.html:18
+#: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:20
+#: allianceauth/permissions_tool/templates/permissions_tool/audit.html:13
+msgid "Back"
+msgstr "返回"
+
 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:25
 msgid "Date/Time"
 msgstr "日期/时间"
@@ -568,8 +590,8 @@ msgid "Portrait"
 msgstr "人物头像"
 
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:30
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:38
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:52
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:97
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:111
 #: allianceauth/permissions_tool/templates/permissions_tool/audit.html:23
 msgid "Organization"
 msgstr "组织"
@@ -586,6 +608,12 @@ msgstr "用户组里没人呀，你叫我怎么列"
 msgid "Groups Membership"
 msgstr "用户组成员"
 
+#: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:14
+#: allianceauth/permissions_tool/templates/permissions_tool/overview.html:40
+#: allianceauth/templates/allianceauth/side-menu.html:17
+msgid "Groups"
+msgstr "群组"
+
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:23
 #: allianceauth/groupmanagement/templates/groupmanagement/groups.html:16
 msgid "Description"
@@ -625,7 +653,11 @@ msgstr "查看成员"
 msgid "Audit Members"
 msgstr "编辑成员"
 
-#: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:64
+#: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:56
+msgid "Copy Direct Join Link"
+msgstr ""
+
+#: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:68
 msgid "No groups to list."
 msgstr "无可用组"
 
@@ -654,37 +686,37 @@ msgstr "没有可用用户组"
 msgid "Groups Management"
 msgstr "用户组管理"
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:23
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:25
 msgid "Join Requests"
 msgstr "入组的请求"
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:24
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:33
 msgid "Leave Requests"
 msgstr "离组的请求"
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:39
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:53
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:98
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:112
 #: allianceauth/permissions_tool/templates/permissions_tool/audit.html:20
 #: allianceauth/services/modules/openfire/forms.py:6
 msgid "Group"
 msgstr "用户组"
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:71
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:85
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:130
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:144
 msgid "Accept"
 msgstr "接受"
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:74
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:88
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:133
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:147
 #: allianceauth/hrapplications/templates/hrapplications/view.html:85
 msgid "Reject"
 msgstr "拒绝"
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:83
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:97
 msgid "No group add requests."
 msgstr "没有加入用户组的请求，小老弟你是不是摇不到人"
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:142
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:156
 msgid "No group leave requests."
 msgstr "没有离开用户组的请求，小老弟你人缘可以啊？"
 
@@ -693,7 +725,7 @@ msgid "Toggle navigation"
 msgstr "打开导航栏"
 
 #: allianceauth/groupmanagement/templates/groupmanagement/menu.html:15
-#: allianceauth/templates/allianceauth/side-menu.html:23
+#: allianceauth/templates/allianceauth/side-menu.html:25
 msgid "Group Management"
 msgstr "用户组管理"
 
@@ -705,61 +737,70 @@ msgstr "用户组请求"
 msgid "Group Membership"
 msgstr "用户组成员"
 
-#: allianceauth/groupmanagement/views.py:165
+#: allianceauth/groupmanagement/views.py:162
 #, python-format
 msgid "Removed user %(user)s from group %(group)s."
 msgstr "已将用户%(user)s从用户组%(group)s中移除"
 
-#: allianceauth/groupmanagement/views.py:167
+#: allianceauth/groupmanagement/views.py:164
 msgid "User does not exist in that group"
 msgstr "那个用户组中不存在这个用户"
 
-#: allianceauth/groupmanagement/views.py:170
+#: allianceauth/groupmanagement/views.py:167
 msgid "Group does not exist"
 msgstr "用户组不存在"
 
-#: allianceauth/groupmanagement/views.py:197
+#: allianceauth/groupmanagement/views.py:194
 #, 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:237
+#: allianceauth/groupmanagement/views.py:234
 #, 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:230
+#: allianceauth/groupmanagement/views.py:227
 #, python-format
 msgid "Rejected application from %(mainchar)s to %(group)s."
 msgstr "%(mainchar)s加入%(group)s的申请已拒绝"
 
-#: allianceauth/groupmanagement/views.py:266
+#: allianceauth/groupmanagement/views.py:263
 #, python-format
 msgid "Accepted application from %(mainchar)s to leave %(group)s."
 msgstr "%(mainchar)s加入%(group)s的申请已通过"
 
-#: allianceauth/groupmanagement/views.py:272
+#: allianceauth/groupmanagement/views.py:269
-#: allianceauth/groupmanagement/views.py:306
+#: allianceauth/groupmanagement/views.py:303
 #, python-format
 msgid ""
-"An unhandled error occured while processing the application from "
+"An unhandled error occurred while processing the application from "
 "%(mainchar)s to leave %(group)s."
-msgstr "在处理%(mainchar)s离开%(group)s的请求时发生了搞不定的错误"
+msgstr "在处理%(mainchar)s离开%(group)s的程序时发生了未知的错误"
 
-#: allianceauth/groupmanagement/views.py:299
+#: allianceauth/groupmanagement/views.py:296
 #, python-format
 msgid "Rejected application from %(mainchar)s to leave %(group)s."
 msgstr "%(mainchar)s离开%(group)s的请求已被拒绝"
 
-#: allianceauth/groupmanagement/views.py:346
+#: allianceauth/groupmanagement/views.py:342
+#: allianceauth/groupmanagement/views.py:354
 msgid "You cannot join that group"
 msgstr "你无法加入那个用户组"
 
-#: allianceauth/groupmanagement/views.py:370
+#: allianceauth/groupmanagement/views.py:348
-#: allianceauth/groupmanagement/views.py:408
+msgid "You are already a member of that group."
+msgstr "你已经是那个群组的一员了。"
+
+#: allianceauth/groupmanagement/views.py:363
+msgid "You already have a pending application for that group."
+msgstr "你已经有了该组的未决申请"
+
+#: allianceauth/groupmanagement/views.py:366
+#: allianceauth/groupmanagement/views.py:404
 #: allianceauth/hrapplications/templates/hrapplications/management.html:37
 #: allianceauth/hrapplications/templates/hrapplications/management.html:72
 #: allianceauth/hrapplications/templates/hrapplications/management.html:99
@@ -771,20 +812,24 @@ msgstr "你无法加入那个用户组"
 msgid "Pending"
 msgstr "待定"
 
-#: allianceauth/groupmanagement/views.py:376
+#: allianceauth/groupmanagement/views.py:372
 #, python-format
 msgid "Applied to group %(group)s."
 msgstr "修改已经应用到%(group)s啦"
 
-#: allianceauth/groupmanagement/views.py:387
+#: allianceauth/groupmanagement/views.py:383
 msgid "You cannot leave that group"
 msgstr "你无法离开那个用户组"
 
-#: allianceauth/groupmanagement/views.py:392
+#: allianceauth/groupmanagement/views.py:388
 msgid "You are not a member of that group"
 msgstr "你不是那个用户组的成员"
 
-#: allianceauth/groupmanagement/views.py:414
+#: allianceauth/groupmanagement/views.py:397
+msgid "You already have a pending leave request for that group."
+msgstr "你已经有了该组的未决离开请求"
+
+#: allianceauth/groupmanagement/views.py:410
 #, python-format
 msgid "Applied to leave group %(group)s."
 msgstr "已经离开群组%(group)s"
@@ -1130,10 +1175,6 @@ msgstr "对搞事时间节点%(opname)s的修改保存了，朝令夕改你是
 msgid "Permissions Audit"
 msgstr "放行记录审计"
 
-#: allianceauth/permissions_tool/templates/permissions_tool/audit.html:13
-msgid "Back"
-msgstr "返回"
-
 #: allianceauth/permissions_tool/templates/permissions_tool/audit.html:22
 msgid "User / Character"
 msgstr "用户/角色"
@@ -1175,15 +1216,22 @@ msgstr "操作类型"
 msgid "Users"
 msgstr "用户"
 
-#: allianceauth/permissions_tool/templates/permissions_tool/overview.html:40
-#: allianceauth/templates/allianceauth/side-menu.html:15
-msgid "Groups"
-msgstr "群组"
-
 #: allianceauth/permissions_tool/templates/permissions_tool/overview.html:43
 msgid "States"
 msgstr "声望"
 
+#: allianceauth/services/abstract.py:72
+msgid "That service account already exists"
+msgstr "该服务账户仍然存在"
+
+#: allianceauth/services/abstract.py:104
+msgid "Successfully set your {} password"
+msgstr "成功修改了你的[]密码"
+
+#: allianceauth/services/auth_hooks.py:11
+msgid "Services"
+msgstr "服务"
+
 #: allianceauth/services/forms.py:6
 msgid "Name of Fleet:"
 msgstr "舰队名称"
@@ -1244,19 +1292,111 @@ msgstr "密码"
 msgid "Password must be at least 8 characters long."
 msgstr "密码至少要有8个字符啊，你也太不注重安全啦"
 
-#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:23
+#: allianceauth/services/modules/discord/models.py:224
+msgid "Discord Account Disabled"
+msgstr ""
+
+#: allianceauth/services/modules/discord/models.py:226
+msgid ""
+"Your Discord account was disabeled automatically by Auth. If you think this "
+"was a mistake, please contact an admin."
+msgstr ""
+
+#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:18
+msgid "Join the Discord server"
+msgstr ""
+
+#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:22
+msgid "Leave- and rejoin the Discord Server (Reset)"
+msgstr ""
+
+#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:25
+msgid "Leave the Discord server"
+msgstr ""
+
+#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:32
 msgid "Link Discord Server"
 msgstr "链接到Discord服务器"
 
-#: allianceauth/services/modules/openfire/forms.py:7
+#: allianceauth/services/modules/discord/views.py:30
-msgid "Message"
+msgid "Deactivated Discord account."
-msgstr "消息"
+msgstr "停用Discord账户"
 
+#: allianceauth/services/modules/discord/views.py:36
+#: allianceauth/services/modules/discord/views.py:59
+msgid "An error occurred while processing your Discord account."
+msgstr "在处理你的Discord账户时出错。"
+
+#: allianceauth/services/modules/discord/views.py:102
+msgid "Your Discord account has been successfully activated."
+msgstr ""
+
+#: allianceauth/services/modules/discord/views.py:108
+msgid ""
+"An error occurred while trying to activate your Discord account. Please try "
+"again."
+msgstr ""
+
+#: allianceauth/services/modules/discourse/views.py:37
+msgid "You are not authorized to access Discourse."
+msgstr "你无权访问Discourse"
+
+#: allianceauth/services/modules/discourse/views.py:42
+msgid "You must have a main character set to access Discourse."
+msgstr "你必须得有一个主要角色来访问Discourse"
+
+#: allianceauth/services/modules/discourse/views.py:52
+msgid ""
+"No SSO payload or signature. Please contact support if this problem "
+"persists."
+msgstr "没有在Seat上检测到SSO。如果该问题依然存在，请联系技术支持"
+
+#: allianceauth/services/modules/discourse/views.py:62
+#: allianceauth/services/modules/discourse/views.py:70
+msgid "Invalid payload. Please contact support if this problem persists."
+msgstr "无效的SSO验证。如果该问题依然存在请联系技术支持。"
+
+#: allianceauth/services/modules/ips4/views.py:31
+msgid "Activated IPSuite4 account."
+msgstr "完成激活IPSuite4账户"
+
+#: allianceauth/services/modules/ips4/views.py:40
+#: allianceauth/services/modules/ips4/views.py:62
+#: allianceauth/services/modules/ips4/views.py:83
+#: allianceauth/services/modules/ips4/views.py:103
+msgid "An error occurred while processing your IPSuite4 account."
+msgstr "在处理你的IPSuite4账户时出错"
+
+#: allianceauth/services/modules/ips4/views.py:53
+msgid "Reset IPSuite4 password."
+msgstr "重置IPSuite4密码"
+
+#: allianceauth/services/modules/ips4/views.py:80
+msgid "Set IPSuite4 password."
+msgstr "修改IPSuite4密码"
+
+#: allianceauth/services/modules/ips4/views.py:100
+msgid "Deactivated IPSuite4 account."
+msgstr "停用IPSuite4账户"
+
+#: allianceauth/services/modules/openfire/auth_hooks.py:26
+msgid "Jabber"
+msgstr "Jabber"
+
+#: allianceauth/services/modules/openfire/auth_hooks.py:78
 #: allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html:6
 #: allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html:11
 msgid "Jabber Broadcast"
 msgstr "Jabber广播"
 
+#: allianceauth/services/modules/openfire/auth_hooks.py:91
+msgid "Fleet Broadcast Formatter"
+msgstr "舰队广播设置"
+
+#: allianceauth/services/modules/openfire/forms.py:7
+msgid "Message"
+msgstr "消息"
+
 #: allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html:17
 msgid "Broadcast Sent!!"
 msgstr "广播出去了！"
@@ -1265,6 +1405,76 @@ msgstr "广播出去了！"
 msgid "Broadcast"
 msgstr "广播"
 
+#: allianceauth/services/modules/openfire/views.py:35
+msgid "Activated jabber account."
+msgstr "成功激活jabber账户"
+
+#: allianceauth/services/modules/openfire/views.py:44
+#: allianceauth/services/modules/openfire/views.py:57
+#: allianceauth/services/modules/openfire/views.py:78
+#: allianceauth/services/modules/openfire/views.py:151
+msgid "An error occurred while processing your jabber account."
+msgstr "在处理你的jabber账户时出错"
+
+#: allianceauth/services/modules/openfire/views.py:70
+msgid "Reset jabber password."
+msgstr "重置jabber密码"
+
+#: allianceauth/services/modules/openfire/views.py:119
+#, python-format
+msgid "Sent jabber broadcast to %s"
+msgstr "已经将jabber广播送到了%s"
+
+#: allianceauth/services/modules/openfire/views.py:148
+msgid "Set jabber password."
+msgstr "修改jabber密码"
+
+#: allianceauth/services/modules/phpbb3/views.py:34
+msgid "Activated forum account."
+msgstr "成功激活论坛账户"
+
+#: allianceauth/services/modules/phpbb3/views.py:43
+#: allianceauth/services/modules/phpbb3/views.py:57
+#: allianceauth/services/modules/phpbb3/views.py:80
+#: allianceauth/services/modules/phpbb3/views.py:103
+msgid "An error occurred while processing your forum account."
+msgstr "在处理你的论坛账户时发生了一个错误"
+
+#: allianceauth/services/modules/phpbb3/views.py:54
+msgid "Deactivated forum account."
+msgstr "停用论坛账户"
+
+#: allianceauth/services/modules/phpbb3/views.py:71
+msgid "Reset forum password."
+msgstr "重置论坛密码"
+
+#: allianceauth/services/modules/phpbb3/views.py:100
+msgid "Set forum password."
+msgstr "修改论坛密码"
+
+#: allianceauth/services/modules/smf/views.py:34
+msgid "Activated SMF account."
+msgstr "成功激活SMF论坛账户"
+
+#: allianceauth/services/modules/smf/views.py:43
+#: allianceauth/services/modules/smf/views.py:58
+#: allianceauth/services/modules/smf/views.py:80
+#: allianceauth/services/modules/smf/views.py:103
+msgid "An error occurred while processing your SMF account."
+msgstr "在处理你的SMF论坛账户时发生了一个错误"
+
+#: allianceauth/services/modules/smf/views.py:55
+msgid "Deactivated SMF account."
+msgstr "停用SMF论坛账户"
+
+#: allianceauth/services/modules/smf/views.py:72
+msgid "Reset SMF password."
+msgstr "重置SMF密码"
+
+#: allianceauth/services/modules/smf/views.py:100
+msgid "Set SMF password."
+msgstr "修改SMF论坛密码"
+
 #: allianceauth/services/modules/teamspeak3/forms.py:14
 #, python-format
 msgid "Unable to locate user %s on server"
@@ -1288,6 +1498,47 @@ msgstr "加入服务器"
 msgid "Continue"
 msgstr "下一个"
 
+#: allianceauth/services/modules/teamspeak3/views.py:34
+msgid "Activated TeamSpeak3 account."
+msgstr "成功激活TeamSpeak3账户"
+
+#: allianceauth/services/modules/teamspeak3/views.py:37
+#: allianceauth/services/modules/teamspeak3/views.py:74
+#: allianceauth/services/modules/teamspeak3/views.py:100
+msgid "An error occurred while processing your TeamSpeak3 account."
+msgstr "在处理你的TeamSpeak3账户时发生了错误"
+
+#: allianceauth/services/modules/teamspeak3/views.py:71
+msgid "Deactivated TeamSpeak3 account."
+msgstr "停用TeamSpeak3账户"
+
+#: allianceauth/services/modules/teamspeak3/views.py:97
+msgid "Reset TeamSpeak3 permission key."
+msgstr "重置TeamSpeak3授权秘钥"
+
+#: allianceauth/services/modules/xenforo/views.py:30
+msgid "Activated XenForo account."
+msgstr "成功激活XenForo账户"
+
+#: allianceauth/services/modules/xenforo/views.py:40
+#: allianceauth/services/modules/xenforo/views.py:52
+#: allianceauth/services/modules/xenforo/views.py:73
+#: allianceauth/services/modules/xenforo/views.py:94
+msgid "An error occurred while processing your XenForo account."
+msgstr "在处理你的XenForo账户时发生了一个错误"
+
+#: allianceauth/services/modules/xenforo/views.py:50
+msgid "Deactivated XenForo account."
+msgstr "停用XenForo论坛账户"
+
+#: allianceauth/services/modules/xenforo/views.py:65
+msgid "Reset XenForo account password."
+msgstr "重置XenForo密码"
+
+#: allianceauth/services/modules/xenforo/views.py:91
+msgid "Changed XenForo password."
+msgstr "修改XenForo密码"
+
 #: allianceauth/services/templates/services/fleetformattertool.html:6
 msgid "Fleet Formatter Tool"
 msgstr "起队工具"
@@ -1638,43 +1889,35 @@ msgid "Current"
 msgstr "当前版本"
 
 #: allianceauth/templates/allianceauth/admin-status/overview.html:40
-msgid "Latest Major"
+msgid "Latest Stable"
-msgstr "最新主版本号"
+msgstr ""
 
 #: allianceauth/templates/allianceauth/admin-status/overview.html:46
-#: allianceauth/templates/allianceauth/admin-status/overview.html:56
-#: allianceauth/templates/allianceauth/admin-status/overview.html:66
 msgid "Update available"
 msgstr "有更新！"
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:50
+#: allianceauth/templates/allianceauth/admin-status/overview.html:51
-msgid "Latest Minor"
+msgid "Latest Pre-Release"
-msgstr "最新小版本号"
+msgstr ""
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:60
+#: allianceauth/templates/allianceauth/admin-status/overview.html:57
-msgid "Latest Patch"
+msgid "Pre-Release available"
-msgstr "最新补丁版本"
+msgstr ""
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:73
+#: allianceauth/templates/allianceauth/admin-status/overview.html:65
 msgid "Task Queue"
 msgstr "任务队列"
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:90
+#: allianceauth/templates/allianceauth/admin-status/overview.html:82
 msgid "Error retrieving task queue length"
 msgstr "获取任务队列长度的时候出错啦！"
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:92
+#: allianceauth/templates/allianceauth/admin-status/overview.html:84
 #, python-format
 msgid "%(tasks)s task"
 msgid_plural "%(tasks)s tasks"
 msgstr[0] "%(tasks)s个任务"
 
-#: allianceauth/templates/allianceauth/help.html:4
-#: allianceauth/templates/allianceauth/help.html:9
-#: allianceauth/templates/allianceauth/side-menu.html:34
-msgid "Help"
-msgstr "帮助"
-
 #: allianceauth/templates/allianceauth/night-toggle.html:3
 msgid "Night"
 msgstr "暗色皮肤"

allianceauth/services/modules/discord/discord_client/app_settings.py

@@ -27,14 +27,14 @@ DISCORD_OAUTH_TOKEN_URL = clean_setting(
 )
 
 # How long the Discord guild names retrieved from the server are 
-# caches locally in milliseconds.
+# caches locally in seconds.
 DISCORD_GUILD_NAME_CACHE_MAX_AGE = clean_setting(
-    'DISCORD_GUILD_NAME_CACHE_MAX_AGE', 3600 * 1 * 1000
+    'DISCORD_GUILD_NAME_CACHE_MAX_AGE', 3600 * 24
 )
 
-# How long Discord roles retrieved from the server are caches locally in milliseconds.
+# How long Discord roles retrieved from the server are caches locally in seconds.
 DISCORD_ROLES_CACHE_MAX_AGE = clean_setting(
-    'DISCORD_ROLES_CACHE_MAX_AGE', 3600 * 1 * 1000
+    'DISCORD_ROLES_CACHE_MAX_AGE', 3600 * 1
 )
 
 # Turns off creation of new roles. In case the rate limit for creating roles is

allianceauth/services/modules/discord/discord_client/client.py

@@ -180,12 +180,19 @@ class DiscordClient:
         r = self._api_request(method='get', route=route)
         return r.json()
 
-    def guild_name(self, guild_id: int) -> str:
+    def guild_name(self, guild_id: int, use_cache: bool = True) -> str:
         """returns the name of this guild (cached) 
         or an empty string if something went wrong
+
+        Params:
+        - guild_id: ID of current guild
+        - use_cache: When set to False will force an API call to get the server name
         """
         key_name = self._guild_name_cache_key(guild_id)
-        guild_name = self._redis_decode(self._redis.get(key_name))
+        if use_cache:
+            guild_name = self._redis_decode(self._redis.get(key_name))
+        else:
+            guild_name = None
         if not guild_name:
             guild_infos = self.guild_infos(guild_id)
             if 'name' in guild_infos:
@@ -193,7 +200,7 @@ class DiscordClient:
                 self._redis.set(
                     name=key_name, 
                     value=guild_name, 
-                    px=DISCORD_GUILD_NAME_CACHE_MAX_AGE
+                    ex=DISCORD_GUILD_NAME_CACHE_MAX_AGE
                 )
             else:
                 guild_name = ''
@@ -230,7 +237,7 @@ class DiscordClient:
             self._redis.set(
                 name=cache_key, 
                 value=json.dumps(roles), 
-                px=DISCORD_ROLES_CACHE_MAX_AGE
+                ex=DISCORD_ROLES_CACHE_MAX_AGE
             )
         return roles
 
@@ -274,6 +281,11 @@ class DiscordClient:
         gen_key = cls._generate_hash(f'{guild_id}')
         return f'{cls._KEYPREFIX_GUILD_ROLES}__{gen_key}'
     
+    def match_role_from_name(self, guild_id: int, role_name: str) -> dict:
+        """returns Discord role matching the given name or an empty dict"""
+        guild_roles = DiscordRoles(self.guild_roles(guild_id))
+        return guild_roles.role_by_name(role_name)
+
     def match_or_create_roles_from_names(self, guild_id: int, role_names: list) -> list:
         """returns Discord roles matching the given names
         
@@ -281,6 +293,7 @@ class DiscordClient:
 
         Will try to match with existing roles names
         Non-existing roles will be created, then created flag will be True
+        
         Params:
         - guild_id: ID of guild
         - role_names: list of name strings each defining a role
@@ -311,6 +324,7 @@ class DiscordClient:
         
         Will try to match with existing roles names
         Non-existing roles will be created, then created flag will be True
+        
         Params:
         - guild_id: ID of guild
         - role_name: strings defining name of a role

allianceauth/services/modules/discord/discord_client/tests/test_client.py

@@ -280,6 +280,8 @@ class TestGuildGetName(TestCase):
         client = DiscordClient2(TEST_BOT_TOKEN, my_mock_redis)
         result = client.guild_name(TEST_GUILD_ID)
         self.assertEqual(result, guild_name)
+        self.assertTrue(my_mock_redis.get.called)
+        self.assertFalse(my_mock_redis.set.called)
 
     @patch(MODULE_PATH + '.DiscordClient.guild_infos')    
     def test_fetches_from_server_if_not_found_in_cache_and_stores_in_cache(
@@ -291,6 +293,20 @@ class TestGuildGetName(TestCase):
         client = DiscordClient2(TEST_BOT_TOKEN, my_mock_redis)
         result = client.guild_name(TEST_GUILD_ID)
         self.assertEqual(result, guild_name)
+        self.assertTrue(my_mock_redis.get.called)
+        self.assertTrue(my_mock_redis.set.called)
+
+    @patch(MODULE_PATH + '.DiscordClient.guild_infos')    
+    def test_fetches_from_server_if_asked_to_ignore_cache_and_stores_in_cache(
+        self, mock_guild_get_infos
+    ):
+        guild_name = 'Omega'
+        my_mock_redis = MagicMock(**{'get.return_value': False})
+        mock_guild_get_infos.return_value = {'id': TEST_GUILD_ID, 'name': guild_name}
+        client = DiscordClient2(TEST_BOT_TOKEN, my_mock_redis)
+        result = client.guild_name(TEST_GUILD_ID, use_cache=False)
+        self.assertFalse(my_mock_redis.get.called)
+        self.assertEqual(result, guild_name)
         self.assertTrue(my_mock_redis.set.called)
 
     @patch(MODULE_PATH + '.DiscordClient.guild_infos')    
@@ -302,6 +318,7 @@ class TestGuildGetName(TestCase):
         client = DiscordClient2(TEST_BOT_TOKEN, my_mock_redis)
         result = client.guild_name(TEST_GUILD_ID)
         self.assertEqual(result, '')
+        self.assertTrue(my_mock_redis.get.called)
         self.assertFalse(my_mock_redis.set.called)
 
 
@@ -844,9 +861,45 @@ class TestGuildMemberRemoveRole(TestCase):
         self.assertFalse(result)
 
 
+class TestMatchGuildRolesToName(TestCase):
+
+    def setUp(self):
+        self.url = f'{API_BASE_URL}guilds/{TEST_GUILD_ID}/roles'
+        
+    @requests_mock.Mocker()
+    def test_return_role_if_known(self, requests_mocker):
+        my_mock_redis = MagicMock(**{
+            'get.return_value': None,
+            'pttl.return_value': -1,
+        })
+        requests_mocker.get(     
+            url=self.url,
+            request_headers=DEFAULT_REQUEST_HEADERS,
+            json=ALL_ROLES
+        )
+        client = DiscordClient2(TEST_BOT_TOKEN, my_mock_redis)
+        result = client.match_role_from_name(TEST_GUILD_ID, "alpha")
+        self.assertDictEqual(result, ROLE_ALPHA)
+
+    @requests_mock.Mocker()
+    def test_return_empty_dict_if_not_known(self, requests_mocker):
+        my_mock_redis = MagicMock(**{
+            'get.return_value': None,
+            'pttl.return_value': -1,
+        })
+        requests_mocker.get(     
+            url=self.url,
+            request_headers=DEFAULT_REQUEST_HEADERS,
+            json=ALL_ROLES
+        )
+        client = DiscordClient2(TEST_BOT_TOKEN, my_mock_redis)
+        result = client.match_role_from_name(TEST_GUILD_ID, "unknown")
+        self.assertDictEqual(result, dict())
+
+
 @patch(MODULE_PATH + '.DiscordClient.create_guild_role')
 @patch(MODULE_PATH + '.DiscordClient.guild_roles')
-class TestMatchGuildRolesToName(TestCase):
+class TestMatchOrCreateGuildRolesToName(TestCase):
             
     def test_return_role_if_known(
         self, mock_guild_get_roles, mock_guild_create_role,
@@ -896,7 +949,7 @@ class TestMatchGuildRolesToName(TestCase):
 
 @patch(MODULE_PATH + '.DiscordClient.create_guild_role')
 @patch(MODULE_PATH + '.DiscordClient.guild_roles')
-class TestMatchGuildRolesToNames(TestCase):
+class TestMatchOrCreateGuildRolesToNames(TestCase):
 
     def test_return_roles_if_known(
         self, mock_guild_get_roles, mock_guild_create_role,

allianceauth/services/modules/discord/managers.py

@@ -4,7 +4,7 @@ from urllib.parse import urlencode
 from requests_oauthlib import OAuth2Session
 from requests.exceptions import HTTPError
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import User, Group
 from django.db import models
 from django.utils.timezone import now
 
@@ -19,7 +19,8 @@ from .app_settings import (
     DISCORD_GUILD_ID,    
     DISCORD_SYNC_NAMES
 )
-from .discord_client import DiscordClient, DiscordApiBackoff
+from .discord_client import DiscordClient
+from .discord_client.exceptions import DiscordClientException, DiscordApiBackoff
 from .discord_client.helpers import match_or_create_roles_from_names
 from .utils import LoggerAddTag
 
@@ -149,7 +150,7 @@ class DiscordUserManager(models.Manager):
         return self.filter(user=user).select_related('user').exists()
 
     @classmethod
-    def generate_bot_add_url(cls):
+    def generate_bot_add_url(cls) -> str:
         params = urlencode({
             'client_id': DISCORD_APP_ID,
             'scope': 'bot',
@@ -159,7 +160,7 @@ class DiscordUserManager(models.Manager):
         return f'{DiscordClient.OAUTH_BASE_URL}?{params}'        
 
     @classmethod
-    def generate_oauth_redirect_url(cls):
+    def generate_oauth_redirect_url(cls) -> str:
         oauth = OAuth2Session(
             DISCORD_APP_ID, redirect_uri=DISCORD_CALLBACK_URL, scope=cls.SCOPES
         )
@@ -178,18 +179,38 @@ class DiscordUserManager(models.Manager):
         return token['access_token']
     
     @classmethod
-    def server_name(cls):
+    def server_name(cls, use_cache: bool = True) -> str:
         """returns the name of the current Discord server 
         or an empty string if the name could not be retrieved
+
+        Params:
+        - use_cache: When set False will force an API call to get the server name
         """
         try:
-            server_name = cls._bot_client().guild_name(DISCORD_GUILD_ID)
+            server_name = cls._bot_client().guild_name(
-        except HTTPError:
+                guild_id=DISCORD_GUILD_ID, use_cache=use_cache
+            )
+        except (HTTPError, DiscordClientException):
+            server_name = ""
+        except Exception:
+            logger.warning(
+                "Unexpected error when trying to retrieve the server name from Discord", 
+                exc_info=True
+            )
             server_name = ""
 
         return server_name
 
+    @classmethod
+    def group_to_role(cls, group: Group) -> dict:
+        """returns the Discord role matching the given Django group by name
+        or an empty dict() if no matching role exist
+        """
+        return cls._bot_client().match_role_from_name(
+            guild_id=DISCORD_GUILD_ID, role_name=group.name
+        )
+
     @staticmethod
-    def _bot_client(is_rate_limited: bool = True):
+    def _bot_client(is_rate_limited: bool = True) -> DiscordClient:
         """returns a bot client for access to the Discord API"""
         return DiscordClient(DISCORD_BOT_TOKEN, is_rate_limited=is_rate_limited)

allianceauth/services/modules/discord/tasks.py

@@ -1,4 +1,5 @@
 import logging
+from typing import Any
 
 from celery import shared_task, chain
 from requests.exceptions import HTTPError
@@ -94,7 +95,7 @@ def _task_perform_user_action(self, user_pk: int, method: str, **kwargs) -> None
             raise self.retry(countdown=bo.retry_after_seconds)     
         
         except AttributeError:
-            raise ValueError(f'{method} not a valid method for DiscordUser: %r')
+            raise ValueError(f'{method} not a valid method for DiscordUser')
 
         except (HTTPError, ConnectionError):           
             logger.warning(
@@ -115,7 +116,7 @@ def _task_perform_user_action(self, user_pk: int, method: str, **kwargs) -> None
                 )
         except Exception:
             logger.error(
-                '%s for %s failed due to unexpected exception',
+                '%s for user %s failed due to unexpected exception',
                 method,
                 user,
                 exc_info=True
@@ -186,9 +187,58 @@ def _bulk_update_nicknames_for_users(discord_users_qs: QuerySet) -> None:
     chain(update_nicknames_chain).apply_async(priority=BULK_TASK_PRIORITY)
 
 
+def _task_perform_users_action(self, method: str, **kwargs) -> Any:   
+    """Perform an action that concerns a group of users or the whole server 
+    and that hits the API
+    """     
+    result = None
+    try:
+        result = getattr(DiscordUser.objects, method)(**kwargs)
+    
+    except AttributeError:
+        raise ValueError(f'{method} not a valid method for DiscordUser.objects')
+    
+    except DiscordApiBackoff as bo:
+        logger.info(
+            "API back off for %s due to %r, retrying in %s seconds",
+            method,
+            bo,
+            bo.retry_after_seconds
+        )
+        raise self.retry(countdown=bo.retry_after_seconds)     
+        
+    except (HTTPError, ConnectionError):           
+        logger.warning(
+            '%s failed, retrying in %d secs',             
+            method,
+            DISCORD_TASKS_RETRY_PAUSE,
+            exc_info=True
+        )
+        if self.request.retries < DISCORD_TASKS_MAX_RETRIES:
+            raise self.retry(countdown=DISCORD_TASKS_RETRY_PAUSE)
+        else:                                            
+            logger.error('%s failed after max retries', method, exc_info=True)
+    
+    except Exception:
+        logger.error('%s failed due to unexpected exception', method, exc_info=True)
+    
+    return result
+
+
+@shared_task(
+    bind=True, name='discord.update_servername', base=QueueOnce, max_retries=None
+)
+def update_servername(self) -> None:
+    """Updates the Discord server name"""
+    _task_perform_users_action(self, method="server_name", use_cache=False)
+
+
 @shared_task(name='discord.update_all_usernames')
 def update_all_usernames() -> None:
-    """Update all usernames for all known users with a Discord account."""
+    """Update all usernames for all known users with a Discord account. 
+    Also updates the server name
+    """
+    update_servername.delay()
     discord_users_qs = DiscordUser.objects.all()
     _bulk_update_usernames_for_users(discord_users_qs)
     

allianceauth/services/modules/discord/tests/__init__.py

@@ -10,6 +10,7 @@ from ..discord_client.tests import (    # noqa
     ROLE_BRAVO, 
     ROLE_CHARLIE, 
     ROLE_MIKE, 
+    ALL_ROLES,
     create_user_info
 )   
 

allianceauth/services/modules/discord/tests/test_integration.py

@@ -41,7 +41,9 @@ from . import (
     create_user_info
 )
 from ..discord_client.app_settings import DISCORD_API_BASE_URL
+from ..discord_client.exceptions import DiscordApiBackoff
 from ..models import DiscordUser
+from .. import tasks
 
 logger = logging.getLogger('allianceauth')
 
@@ -444,25 +446,26 @@ class TestUserFeatures(WebTest):
             disconnect_signals=True
         )
         add_permissions_to_members()
-        
+
     @patch(MODULE_PATH + '.views.messages')    
     @patch(MODULE_PATH + '.managers.OAuth2Session')
     def test_user_activation_normal(
         self, requests_mocker, mock_OAuth2Session, mock_messages
     ): 
-        # user_get_current()
+        # setup
+        requests_mocker.get(
+            guild_infos_request.url, json={'id': TEST_GUILD_ID, 'name': 'Test Guild'}
+        )                
         requests_mocker.get(
             user_get_current_request.url, 
             json=create_user_info(
                 TEST_USER_ID, TEST_USER_NAME, TEST_USER_DISCRIMINATOR
             )
-        )        
+        )                
-        # guild_roles()        
         requests_mocker.get(
             guild_roles_request.url, 
             json=[ROLE_ALPHA, ROLE_BRAVO, ROLE_MIKE, ROLE_MEMBER]
-        )        
+        )                
-        # add_guild_member()
         requests_mocker.put(add_guild_member_request.url, status_code=201)
         
         authentication_code = 'auth_code'        
@@ -474,8 +477,12 @@ class TestUserFeatures(WebTest):
         # login
         self.app.set_user(self.member)
         
-        # click activate on the service page
+        # user opens services page
-        response = self.app.get(reverse('discord:activate'))
+        services_page = self.app.get(reverse('services:services'))
+        self.assertEqual(services_page.status_code, 200)
+
+        # user clicks Discord service activation link on page        
+        response = services_page.click(href=reverse('discord:activate'))
         
         # check we got a redirect to Discord OAuth        
         self.assertRedirects(
@@ -497,7 +504,10 @@ class TestUserFeatures(WebTest):
             requests_made.append(obj)
                 
         expected = [
-            user_get_current_request, guild_roles_request, add_guild_member_request
+            guild_infos_request, 
+            user_get_current_request, 
+            guild_roles_request, 
+            add_guild_member_request
         ]
         self.assertListEqual(requests_made, expected)
 
@@ -506,19 +516,21 @@ class TestUserFeatures(WebTest):
     def test_user_activation_failed(
         self, requests_mocker, mock_OAuth2Session, mock_messages
     ): 
-        # user_get_current()
+        # setup
+        requests_mocker.get(
+            guild_infos_request.url, json={'id': TEST_GUILD_ID, 'name': 'Test Guild'}
+        )
         requests_mocker.get(
             user_get_current_request.url, 
             json=create_user_info(
                 TEST_USER_ID, TEST_USER_NAME, TEST_USER_DISCRIMINATOR
             )
-        )        
+        )                
-        # guild_roles()        
         requests_mocker.get(
             guild_roles_request.url, 
             json=[ROLE_ALPHA, ROLE_BRAVO, ROLE_MIKE, ROLE_MEMBER]
         )        
-        # add_guild_member()
+        
         mock_exception = HTTPError('error')
         mock_exception.response = Mock()
         mock_exception.response.status_code = 503
@@ -532,9 +544,13 @@ class TestUserFeatures(WebTest):
         
         # login
         self.app.set_user(self.member)
+
+        # user opens services page
+        services_page = self.app.get(reverse('services:services'))
+        self.assertEqual(services_page.status_code, 200)
         
         # click activate on the service page
-        response = self.app.get(reverse('discord:activate'))
+        response = services_page.click(href=reverse('discord:activate'))
         
         # check we got a redirect to Discord OAuth        
         self.assertRedirects(
@@ -556,27 +572,31 @@ class TestUserFeatures(WebTest):
             requests_made.append(obj)
                 
         expected = [
-            user_get_current_request, guild_roles_request, add_guild_member_request
+            guild_infos_request,
+            user_get_current_request, 
+            guild_roles_request, 
+            add_guild_member_request
         ]
         self.assertListEqual(requests_made, expected)
 
     @patch(MODULE_PATH + '.views.messages')
     def test_user_deactivation_normal(self, requests_mocker, mock_messages): 
-        # guild_infos()
+        # setup
         requests_mocker.get(
-            guild_infos_request.url, json={'id': TEST_GUILD_ID, 'name': 'Test Guild'})
+            guild_infos_request.url, json={'id': TEST_GUILD_ID, 'name': 'Test Guild'}
-
+        )        
-        # remove_guild_member()
         requests_mocker.delete(remove_guild_member_request.url, status_code=204)
-        
-        # user needs have an account
         DiscordUser.objects.create(user=self.member, uid=TEST_USER_ID)
         
         # login
         self.app.set_user(self.member)
         
-        # click deactivate on the service page
+        # user opens services page
-        response = self.app.get(reverse('discord:deactivate'))
+        services_page = self.app.get(reverse('services:services'))
+        self.assertEqual(services_page.status_code, 200)
+
+        # click deactivate on the service page        
+        response = services_page.click(href=reverse('discord:deactivate'))
         
         # check we got a redirect to service page
         self.assertRedirects(response, expected_url=reverse('services:services'))
@@ -590,29 +610,31 @@ class TestUserFeatures(WebTest):
             obj = DiscordRequest(r.method, r.url)            
             requests_made.append(obj)
                 
-        expected = [remove_guild_member_request, guild_infos_request]
+        expected = [guild_infos_request, remove_guild_member_request]
         self.assertListEqual(requests_made, expected)
 
     @patch(MODULE_PATH + '.views.messages')
     def test_user_deactivation_fails(self, requests_mocker, mock_messages): 
-        # guild_infos()
+        # setup
         requests_mocker.get(
-            guild_infos_request.url, json={'id': TEST_GUILD_ID, 'name': 'Test Guild'})
+            guild_infos_request.url, json={'id': TEST_GUILD_ID, 'name': 'Test Guild'}
-
+        )        
-        # remove_guild_member()        
         mock_exception = HTTPError('error')
         mock_exception.response = Mock()
         mock_exception.response.status_code = 503
         requests_mocker.delete(remove_guild_member_request.url, exc=mock_exception)
-        
+                
-        # user needs have an account
         DiscordUser.objects.create(user=self.member, uid=TEST_USER_ID)
         
         # login
         self.app.set_user(self.member)
         
-        # click deactivate on the service page
+        # user opens services page
-        response = self.app.get(reverse('discord:deactivate'))
+        services_page = self.app.get(reverse('services:services'))
+        self.assertEqual(services_page.status_code, 200)
+
+        # click deactivate on the service page        
+        response = services_page.click(href=reverse('discord:deactivate'))
         
         # check we got a redirect to service page
         self.assertRedirects(response, expected_url=reverse('services:services'))
@@ -626,15 +648,13 @@ class TestUserFeatures(WebTest):
             obj = DiscordRequest(r.method, r.url)            
             requests_made.append(obj)
                 
-        expected = [remove_guild_member_request, guild_infos_request]
+        expected = [guild_infos_request, remove_guild_member_request]
         self.assertListEqual(requests_made, expected)
 
     @patch(MODULE_PATH + '.views.messages')
     def test_user_add_new_server(self, requests_mocker, mock_messages): 
-        # guild_infos()
+        # setup                
-        mock_exception = HTTPError('can not get guild info from Discord API')
+        mock_exception = HTTPError(Mock(**{"response.status_code": 400}))
-        mock_exception.response = Mock()
-        mock_exception.response.status_code = 440
         requests_mocker.get(guild_infos_request.url, exc=mock_exception)
         
         # login        
@@ -649,3 +669,39 @@ class TestUserFeatures(WebTest):
         # check we got can see the page and the "link server" button
         self.assertEqual(response.status_int, 200)
         self.assertIsNotNone(response.html.find(id='btnLinkDiscordServer'))
+    
+    def test_when_server_name_fails_user_can_still_see_service_page(
+        self, requests_mocker
+    ): 
+        # setup
+        requests_mocker.get(guild_infos_request.url, exc=DiscordApiBackoff(1000))
+                
+        # login
+        self.app.set_user(self.member)
+        
+        # user opens services page
+        services_page = self.app.get(reverse('services:services'))
+        self.assertEqual(services_page.status_code, 200)
+
+    @override_settings(CELERY_ALWAYS_EAGER=True)
+    def test_server_name_is_updated_by_task(
+        self, requests_mocker
+    ): 
+        # setup
+        requests_mocker.get(
+            guild_infos_request.url, json={'id': TEST_GUILD_ID, 'name': 'Test Guild'}
+        )
+        # run task to update usernames
+        tasks.update_all_usernames()
+
+        # login
+        self.app.set_user(self.member)
+        
+        # disable API call to make sure server name is not retrieved from API
+        mock_exception = HTTPError(Mock(**{"response.status_code": 400}))
+        requests_mocker.get(guild_infos_request.url, exc=mock_exception)
+        
+        # user opens services page
+        services_page = self.app.get(reverse('services:services'))
+        self.assertEqual(services_page.status_code, 200)
+        self.assertIn("Test Guild", services_page.text)

allianceauth/services/modules/discord/tests/test_managers.py

@@ -17,7 +17,7 @@ from . import (
     MODULE_PATH,
     ROLE_ALPHA,
     ROLE_BRAVO,
-    ROLE_CHARLIE
+    ROLE_CHARLIE, 
 )
 from ..discord_client.tests import create_matched_role
 from ..app_settings import (
@@ -364,6 +364,7 @@ class TestUserHasAccount(TestCase):
 
 
 @patch(MODULE_PATH + '.managers.DiscordClient', spec=DiscordClient)
+@patch(MODULE_PATH + '.managers.logger')
 class TestServerName(TestCase):
 
     @classmethod
@@ -371,16 +372,50 @@ class TestServerName(TestCase):
         super().setUpClass()
         cls.user = AuthUtils.create_user(TEST_USER_NAME)
     
-    def test_returns_name_when_api_returns_it(self, mock_DiscordClient):
+    def test_returns_name_when_api_returns_it(self, mock_logger, mock_DiscordClient):
         server_name = "El Dorado"
         mock_DiscordClient.return_value.guild_name.return_value = server_name
 
         self.assertEqual(DiscordUser.objects.server_name(), server_name)
+        self.assertFalse(mock_logger.warning.called)
 
-    def test_returns_empty_string_when_api_throws_http_error(self, mock_DiscordClient):
+    def test_returns_empty_string_when_api_throws_http_error(
+        self, mock_logger, mock_DiscordClient
+    ):
         mock_exception = HTTPError('Test exception')
         mock_exception.response = Mock(**{"status_code": 440})        
         mock_DiscordClient.return_value.guild_name.side_effect = mock_exception
 
         self.assertEqual(DiscordUser.objects.server_name(), "")
+        self.assertFalse(mock_logger.warning.called)
 
+    def test_returns_empty_string_when_api_throws_service_error(
+        self, mock_logger, mock_DiscordClient
+    ):
+        mock_DiscordClient.return_value.guild_name.side_effect = DiscordApiBackoff(1000)
+
+        self.assertEqual(DiscordUser.objects.server_name(), "")
+        self.assertFalse(mock_logger.warning.called)
+
+    def test_returns_empty_string_when_api_throws_unexpected_error(
+        self, mock_logger, mock_DiscordClient
+    ):
+        mock_DiscordClient.return_value.guild_name.side_effect = RuntimeError
+
+        self.assertEqual(DiscordUser.objects.server_name(), "")
+        self.assertTrue(mock_logger.warning.called)
+
+
+@patch(MODULE_PATH + '.managers.DiscordClient', spec=DiscordClient)
+class TestRoleForGroup(TestCase):    
+    def test_return_role_if_found(self, mock_DiscordClient):
+        mock_DiscordClient.return_value.match_role_from_name.return_value = ROLE_ALPHA
+
+        group = Group.objects.create(name='alpha')
+        self.assertEqual(DiscordUser.objects.group_to_role(group), ROLE_ALPHA)
+
+    def test_return_empty_dict_if_not_found(self, mock_DiscordClient):
+        mock_DiscordClient.return_value.match_role_from_name.return_value = dict()
+
+        group = Group.objects.create(name='unknown')
+        self.assertEqual(DiscordUser.objects.group_to_role(group), dict())

allianceauth/services/modules/discord/tests/test_tasks.py

@@ -21,6 +21,7 @@ logger = set_logger_to_file(MODULE_PATH, __file__)
 
 
 @patch(MODULE_PATH + '.DiscordUser.update_groups')
+@patch(MODULE_PATH + ".logger")
 class TestUpdateGroups(TestCase):
     
     @classmethod
@@ -32,16 +33,18 @@ class TestUpdateGroups(TestCase):
         cls.group_1.user_set.add(cls.user)
         cls.group_2.user_set.add(cls.user)
         
-    def test_can_update_groups(self, mock_update_groups):
+    def test_can_update_groups(self, mock_logger, mock_update_groups):
         DiscordUser.objects.create(user=self.user, uid=TEST_USER_ID)
         tasks.update_groups(self.user.pk)
         self.assertTrue(mock_update_groups.called)
 
-    def test_no_action_if_user_has_no_discord_account(self, mock_update_groups):
+    def test_no_action_if_user_has_no_discord_account(
+        self, mock_logger, mock_update_groups
+    ):
         tasks.update_groups(self.user.pk)
         self.assertFalse(mock_update_groups.called)
     
-    def test_retries_on_api_backoff(self, mock_update_groups):
+    def test_retries_on_api_backoff(self, mock_logger, mock_update_groups):
         DiscordUser.objects.create(user=self.user, uid=TEST_USER_ID)
         mock_exception = DiscordApiBackoff(999)
         mock_update_groups.side_effect = mock_exception
@@ -49,7 +52,7 @@ class TestUpdateGroups(TestCase):
         with self.assertRaises(Retry):
             tasks.update_groups(self.user.pk)
 
-    def test_retry_on_http_error_except_404(self, mock_update_groups):
+    def test_retry_on_http_error_except_404(self, mock_logger, mock_update_groups):
         DiscordUser.objects.create(user=self.user, uid=TEST_USER_ID)
         mock_exception = HTTPError('error')
         mock_exception.response = MagicMock()
@@ -58,8 +61,12 @@ class TestUpdateGroups(TestCase):
 
         with self.assertRaises(Retry):
             tasks.update_groups(self.user.pk)
+
+        self.assertTrue(mock_logger.warning.called)
     
-    def test_retry_on_http_error_404_when_user_not_deleted(self, mock_update_groups):
+    def test_retry_on_http_error_404_when_user_not_deleted(
+        self, mock_logger, mock_update_groups
+    ):
         DiscordUser.objects.create(user=self.user, uid=TEST_USER_ID)
         mock_exception = HTTPError('error')
         mock_exception.response = MagicMock()
@@ -68,26 +75,31 @@ class TestUpdateGroups(TestCase):
 
         with self.assertRaises(Retry):
             tasks.update_groups(self.user.pk)
+
+        self.assertTrue(mock_logger.warning.called)
         
-    def test_retry_on_non_http_error(self, mock_update_groups):        
+    def test_retry_on_non_http_error(self, mock_logger, mock_update_groups):        
         DiscordUser.objects.create(user=self.user, uid=TEST_USER_ID)
         mock_update_groups.side_effect = ConnectionError
 
         with self.assertRaises(Retry):
             tasks.update_groups(self.user.pk)
+
+        self.assertTrue(mock_logger.warning.called)
         
     @patch(MODULE_PATH + '.DISCORD_TASKS_MAX_RETRIES', 3)
-    def test_log_error_if_retries_exhausted(self, mock_update_groups):
+    def test_log_error_if_retries_exhausted(self, mock_logger, mock_update_groups):
         DiscordUser.objects.create(user=self.user, uid=TEST_USER_ID)        
         mock_task = MagicMock(**{'request.retries': 3})
         mock_update_groups.side_effect = ConnectionError
         update_groups_inner = tasks.update_groups.__wrapped__.__func__
                 
         update_groups_inner(mock_task, self.user.pk)
+        self.assertTrue(mock_logger.error.called)
                 
     @patch(MODULE_PATH + '.delete_user.delay')
     def test_delete_user_if_user_is_no_longer_member_of_discord_server(
-        self, mock_delete_user, mock_update_groups
+        self, mock_delete_user, mock_logger, mock_update_groups
     ):
         mock_update_groups.return_value = None
         
@@ -222,6 +234,72 @@ class TestTaskPerformUserAction(TestCase):
         tasks._task_perform_user_action(mock_task, self.user.pk, 'update_groups')
 
 
+@patch(MODULE_PATH + '.DiscordUser.objects.server_name')
+@patch(MODULE_PATH + ".logger")
+class TestTaskUpdateServername(TestCase):
+
+    def test_normal(self, mock_logger, mock_server_name):
+        tasks.update_servername()
+        self.assertTrue(mock_server_name.called)
+        self.assertFalse(mock_logger.error.called)
+        _, kwargs = mock_server_name.call_args
+        self.assertFalse(kwargs["use_cache"])
+
+    def test_retries_on_api_backoff(self, mock_logger, mock_server_name):
+        mock_server_name.side_effect = DiscordApiBackoff(999)
+
+        with self.assertRaises(Retry):
+            tasks.update_servername()
+
+        self.assertFalse(mock_logger.error.called)
+
+    def test_retry_on_http_error(self, mock_logger, mock_server_name):        
+        mock_exception = HTTPError(MagicMock(**{"response.status_code": 500}))        
+        mock_server_name.side_effect = mock_exception
+
+        with self.assertRaises(Retry):
+            tasks.update_servername()
+
+        self.assertTrue(mock_logger.warning.called)
+
+    def test_retry_on_connection_error(self, mock_logger, mock_server_name):        
+        mock_server_name.side_effect = ConnectionError
+
+        with self.assertRaises(Retry):
+            tasks.update_servername()
+
+        self.assertTrue(mock_logger.warning.called)
+    
+    @patch(MODULE_PATH + '.DISCORD_TASKS_MAX_RETRIES', 3)
+    def test_log_error_if_retries_exhausted(self, mock_logger, mock_server_name):
+        mock_task = MagicMock(**{'request.retries': 3})
+        mock_server_name.side_effect = ConnectionError
+        update_groups_inner = tasks.update_servername.__wrapped__.__func__
+                
+        update_groups_inner(mock_task)
+        self.assertTrue(mock_logger.error.called)
+
+
+@patch(MODULE_PATH + '.DiscordUser.objects.server_name')
+class TestTaskPerformUsersAction(TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()        
+
+    def test_raise_value_error_on_unknown_method(self, mock_server_name):
+        mock_task = MagicMock(**{'request.retries': 0})
+        
+        with self.assertRaises(ValueError):
+            tasks._task_perform_users_action(mock_task, 'invalid_method')
+    
+    def test_catch_and_log_unexpected_exceptions(self, mock_server_name):
+        mock_server_name.side_effect = RuntimeError
+        mock_task = MagicMock(**{'request.retries': 0})
+        
+        tasks._task_perform_users_action(mock_task, 'server_name')
+
+
 @override_settings(CELERY_ALWAYS_EAGER=True)
 class TestBulkTasks(TestCase):
     
@@ -299,15 +377,19 @@ class TestBulkTasks(TestCase):
         
         self.assertSetEqual(set(current_pks), set(expected_pks))
 
-    @patch(MODULE_PATH + '.update_username.si')
+    @patch(MODULE_PATH + '.update_username')
-    def test_can_update_all_usernames(self, mock_update_username):
+    @patch(MODULE_PATH + '.update_servername')    
+    def test_can_update_all_usernames(
+        self, mock_update_servername, mock_update_username
+    ):
         du_1 = DiscordUser.objects.create(user=self.user_1, uid=123)
         du_2 = DiscordUser.objects.create(user=self.user_2, uid=456)
         du_3 = DiscordUser.objects.create(user=self.user_3, uid=789)
 
         tasks.update_all_usernames()
-        self.assertEqual(mock_update_username.call_count, 3)
+        self.assertTrue(mock_update_servername.delay.called)
-        current_pks = [args[0][0] for args in mock_update_username.call_args_list]
+        self.assertEqual(mock_update_username.si.call_count, 3)
+        current_pks = [args[0][0] for args in mock_update_username.si.call_args_list]
         expected_pks = [du_1.pk, du_2.pk, du_3.pk]
         self.assertSetEqual(set(current_pks), set(expected_pks))
 

allianceauth/templates/bundles/fontawesome.html

@@ -1,5 +1,4 @@
 {% load staticfiles %}
 <!-- Font Awesome Bundle -->
-<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.13.0/css/all.min.css" rel="stylesheet" type="text/css">
+<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.14.0/css/all.min.css" rel="stylesheet" type="text/css">
-<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.13.0/css/v4-shims.min.css" rel="stylesheet" type="text/css">
 <!-- End Font Awesome Bundle -->

allianceauth/templatetags/admin_status.py

@@ -33,8 +33,8 @@ GITLAB_AUTH_ANNOUNCEMENT_ISSUES_URL = (
 logger = logging.getLogger(__name__)
 
 
-@register.inclusion_tag('allianceauth/admin-status/overview.html', takes_context=True)
+@register.inclusion_tag('allianceauth/admin-status/overview.html')
-def status_overview(context):
+def status_overview() -> dict:
     response = {
         'notifications': list(),        
         'current_version': __version__,
@@ -46,7 +46,7 @@ def status_overview(context):
     return response
 
 
-def _fetch_celery_queue_length():
+def _fetch_celery_queue_length() -> int:
     try:
         app = app_or_default(None)
         with app.connection_or_acquire() as conn:
@@ -69,11 +69,15 @@ def _current_notifications() -> dict:
             'gitlab_notification_issues', 
             _fetch_notification_issues_from_gitlab,
             NOTIFICATION_CACHE_TIME
-        )        
+        )                
-        top_notifications = notifications[:5]
     except requests.RequestException:
         logger.exception('Error while getting gitlab notifications')
         top_notifications = []
+    else:
+        if notifications:
+            top_notifications = notifications[:5]
+        else:
+            top_notifications = []
     
     response = {
         'notifications': top_notifications,
@@ -95,8 +99,15 @@ def _current_version_summary() -> dict:
         logger.exception('Error while getting gitlab release tags')
         return {}
         
-    latest_major_version, latest_minor_version, latest_patch_version, latest_beta_version = \
+    if not tags:
-        _latests_versions(tags)    
+        return {}
+        
+    (
+        latest_major_version, 
+        latest_minor_version, 
+        latest_patch_version, 
+        latest_beta_version
+    ) = _latests_versions(tags)    
     current_version = Pep440Version(__version__)
 
     has_latest_major = \
@@ -107,8 +118,8 @@ def _current_version_summary() -> dict:
         current_version >= latest_patch_version if latest_patch_version else False
     has_current_beta = \
         current_version.base_version <= latest_beta_version.base_version \
-            and latest_major_version.base_version <= latest_beta_version.base_version \
+        and latest_major_version.base_version <= latest_beta_version.base_version \
-                if latest_beta_version else False
+        if latest_beta_version else False
 
     response = {        
         'latest_major': has_latest_major,
@@ -146,7 +157,6 @@ def _latests_versions(tags: list) -> tuple:
             else:
                 versions.append(version)
 
-    
     latest_version = latest_patch_version = max(versions)
     latest_major_version = min([
         v for v in versions if v.major == latest_version.major
@@ -156,10 +166,15 @@ def _latests_versions(tags: list) -> tuple:
         if v.major == latest_version.major and v.minor == latest_version.minor
     ])
     latest_beta_version = max(betas)
-    return latest_major_version, latest_minor_version, latest_patch_version, latest_beta_version
+    return (
+        latest_major_version, 
+        latest_minor_version, 
+        latest_patch_version, 
+        latest_beta_version
+    )
 
 
-def _fetch_list_from_gitlab(url: str, max_pages: int = MAX_PAGES):
+def _fetch_list_from_gitlab(url: str, max_pages: int = MAX_PAGES) -> list:
     """returns a list from the GitLab API. Supports pageing"""
     result = list()    
     for page in range(1, max_pages + 1):

docs/features/services/discord.md

@@ -131,8 +131,8 @@ Name                                Description
 `DISCORD_BOT_TOKEN`                 Generated bot token for the Discord Auth app                                                  `''`
 `DISCORD_CALLBACK_URL`              Oauth callback URL                                                                            `''`
 `DISCORD_GUILD_ID`                  Discord ID of your Discord server                                                             `''`
-`DISCORD_GUILD_NAME_CACHE_MAX_AGE`  How long the Discord server name is cached locally in milliseconds                            `3600000`
+`DISCORD_GUILD_NAME_CACHE_MAX_AGE`  How long the Discord server name is cached locally in seconds                                 `86400`
-`DISCORD_ROLES_CACHE_MAX_AGE`       How long roles retrieved from the Discord server are cached locally in milliseconds           `3600000`
+`DISCORD_ROLES_CACHE_MAX_AGE`       How long roles retrieved from the Discord server are cached locally in seconds                `3600`
 `DISCORD_SYNC_NAMES`                When set to True the nicknames of Discord users will be set to the user's main character name `False`
 `DISCORD_TASKS_RETRY_PAUSE`         Pause in seconds until next retry for tasks after an error occurred                           `60`
 `DISCORD_TASKS_MAX_RETRIES`         max retries of tasks after an error occurred                                                  `3`

docs/features/services/mumble.md

@@ -215,3 +215,29 @@ On a freshly installed mumble server only your superuser has the right to config
 
 - user: `SuperUser`
 - password: *what you defined when configuring your mumble server*
+
+## General notes
+
+### Setting a server password
+
+With the default configuration your mumble server is public. Meaning that everyone who has the address can at least connect to it and might also be able join all channels that don't have any permissions set (Depending on your ACL configured for the root channel). If you want only registered member being able to join your mumble, you have to set a server password. To do so open your mumble server configuration which is by default located at `/etc/mumble-server.ini`.
+
+```bash
+nano /etc/mumble-server.ini
+```
+
+Now search for `serverpassword=` and set your password here. If there is no such line, simply add it.
+
+```text
+serverpassword=YourSuperSecretServerPassword
+```
+
+Save the file and restart your mumble server afterwards.
+
+```bash
+service mumble-server restart
+```
+
+From now on, only registerd member can join your mumble server. Now if you still want to allow guests to join you have 2 options.
+- Allow the "Guest" state to activate the Mumble service in your Auth instance
+- Use [Mumble temporary links](https://github.com/pvyParts/allianceauth-mumble-temp)

docs/features/services/teamspeak3.md

@@ -101,7 +101,7 @@ The method which populates these runs every 30 minutes. To populate manually, st
 
 And execute the update:
 
-    from services.modules.teamspeak3.tasks import Teamspeak3Tasks
+    from allianceauth.services.modules.teamspeak3.tasks import Teamspeak3Tasks
     Teamspeak3Tasks.run_ts3_group_update()
 
 Ensure that command does not return an error.