Version bump to 2.8.0 Stable

Add French and Japanese Translations + QoL Translation Fixes

See merge request allianceauth/allianceauth!1263

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.8.0a2'
+__version__ = '2.8.0'
 __title__ = 'Alliance Auth'
 __url__ = 'https://gitlab.com/allianceauth/allianceauth'
 NAME = '%s v%s' % (__title__, __version__)

allianceauth/authentication/views.py

@@ -137,7 +137,12 @@ class RegistrationView(BaseRegistrationView):
     template_name = "public/register.html"
     email_body_template = "registration/activation_email.txt"
     email_subject_template = "registration/activation_email_subject.txt"
-    success_url = reverse_lazy('registration_complete')    
+    success_url = reverse_lazy('registration_complete') 
+
+    def get_success_url(self, user):
+        if not getattr(settings, 'REGISTRATION_VERIFY_EMAIL', True):
+            return reverse_lazy('authentication:dashboard')
+        return super().get_success_url(user)
 
     def dispatch(self, request, *args, **kwargs):
         # We're storing a key in the session to pass user information from OAuth response. Make sure it's there.
@@ -208,5 +213,5 @@ def activation_complete(request):
 
 
 def registration_closed(request):
-    messages.error(request, _('Registraion of new accounts it not allowed at this time.'))
+    messages.error(request, _('Registration of new accounts is not allowed at this time.'))
     return redirect('authentication:login')

allianceauth/locale/de/LC_MESSAGES/django.po

@@ -6,16 +6,16 @@
 # Translators:
 # Erik Kalkoken <erik.kalkoken@gmail.com>, 2020
 # Joel Falknau <ozirascal@gmail.com>, 2020
-# Rounon Dax <rounon.dax@terra-nanotech.de>, 2020
+# Peter Pfeufer <rounon.dax@terra-nanotech.de>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-21 01:35+0000\n"
+"POT-Creation-Date: 2020-10-11 03:43+0000\n"
 "PO-Revision-Date: 2020-02-18 03:14+0000\n"
-"Last-Translator: Rounon Dax <rounon.dax@terra-nanotech.de>, 2020\n"
+"Last-Translator: Peter Pfeufer <rounon.dax@terra-nanotech.de>, 2020\n"
 "Language-Team: German (https://www.transifex.com/alliance-auth/teams/107430/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +28,7 @@ msgid "A main character is required to perform that action. Add one below."
 msgstr ""
 "Für diese Aktion wird ein Hauptcharacter benötigt. Bitte füge einen hinzu."
 
-#: allianceauth/authentication/forms.py:6
+#: allianceauth/authentication/forms.py:5
 msgid "Email"
 msgstr "E-Mail"
 
@@ -168,11 +168,11 @@ msgstr ""
 msgid "Unable to authenticate as the selected character."
 msgstr "Authentifizierung mit dem ausgewählten Charakter nicht möglich."
 
-#: allianceauth/authentication/views.py:148
+#: allianceauth/authentication/views.py:146
 msgid "Registration token has expired."
 msgstr "Token zur Registrierung ist abgelaufen."
 
-#: allianceauth/authentication/views.py:200
+#: allianceauth/authentication/views.py:201
 msgid ""
 "Sent confirmation email. Please follow the link to confirm your email "
 "address."
@@ -180,12 +180,12 @@ msgstr ""
 "Bestätigungsmail gesendet. Bitte folge dem Link in der E-Mail zur "
 "Bestätigung."
 
-#: allianceauth/authentication/views.py:205
+#: allianceauth/authentication/views.py:206
 msgid "Confirmed your email address. Please login to continue."
 msgstr ""
 "Deine E-Mail Adresse wurde bestätigt. Bitte log Dich ein um fortzufahren."
 
-#: allianceauth/authentication/views.py:210
+#: allianceauth/authentication/views.py:211
 msgid "Registraion of new accounts it not allowed at this time."
 msgstr "Registrierung von neuen Konten ist zur Zeit nicht erlaubt."
 
@@ -825,7 +825,7 @@ msgstr "Du hast Dich bereits für diese Gruppe beworben."
 #: allianceauth/hrapplications/templates/hrapplications/management.html:144
 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:38
 #: allianceauth/hrapplications/templates/hrapplications/view.html:20
-#: allianceauth/srp/templates/srp/data.html:128
+#: allianceauth/srp/templates/srp/data.html:134
 #: allianceauth/srp/templates/srp/management.html:81
 msgid "Pending"
 msgstr "Beantragt"
@@ -919,7 +919,7 @@ msgstr "Aktionen"
 #: allianceauth/hrapplications/templates/hrapplications/management.html:147
 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:40
 #: allianceauth/hrapplications/templates/hrapplications/view.html:16
-#: allianceauth/srp/templates/srp/data.html:120
+#: allianceauth/srp/templates/srp/data.html:126
 msgid "Approved"
 msgstr "Akzeptiert"
 
@@ -927,7 +927,7 @@ msgstr "Akzeptiert"
 #: allianceauth/hrapplications/templates/hrapplications/management.html:104
 #: allianceauth/hrapplications/templates/hrapplications/management.html:149
 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:42
-#: allianceauth/srp/templates/srp/data.html:124
+#: allianceauth/srp/templates/srp/data.html:130
 msgid "Rejected"
 msgstr "Abgelehnt"
 
@@ -1310,11 +1310,11 @@ msgstr "Passwort"
 msgid "Password must be at least 8 characters long."
 msgstr "Passwort muss mindestens 8 Zeichen lang sein"
 
-#: allianceauth/services/modules/discord/models.py:224
+#: allianceauth/services/modules/discord/models.py:225
 msgid "Discord Account Disabled"
 msgstr "Discord Konto deaktiviert"
 
-#: allianceauth/services/modules/discord/models.py:226
+#: allianceauth/services/modules/discord/models.py:227
 msgid ""
 "Your Discord account was disabeled automatically by Auth. If you think this "
 "was a mistake, please contact an admin."
@@ -1684,18 +1684,18 @@ msgid "Mark Completed"
 msgstr "Als vollständig markieren"
 
 #: allianceauth/srp/templates/srp/data.html:70
-#: allianceauth/srp/templates/srp/data.html:150
+#: allianceauth/srp/templates/srp/data.html:156
 msgid "Total Losses:"
 msgstr "Verluste insgesamt:"
 
 #: allianceauth/srp/templates/srp/data.html:71
-#: allianceauth/srp/templates/srp/data.html:151
+#: allianceauth/srp/templates/srp/data.html:157
 #: allianceauth/srp/templates/srp/management.html:30
 msgid "Total ISK Cost:"
 msgstr "ISK-Kosten insgesamt:"
 
 #: allianceauth/srp/templates/srp/data.html:79
-#: allianceauth/srp/templates/srp/data.html:159
+#: allianceauth/srp/templates/srp/data.html:165
 msgid "Are you sure you want to delete SRP requests?"
 msgstr "Bist Du sicher das Du SRP Anfragen löschen willst?"
 
@@ -1729,7 +1729,7 @@ msgstr ""
 msgid "Post Time"
 msgstr "Veröffentlichungszeit"
 
-#: allianceauth/srp/templates/srp/data.html:168
+#: allianceauth/srp/templates/srp/data.html:174
 msgid "No SRP requests for this fleet."
 msgstr "Keine SRP Anfragen für diese Flotte."
 

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-09-21 01:41+0000\n"
+"POT-Creation-Date: 2020-10-01 02:59+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"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "A main character is required to perform that action. Add one below."
 msgstr ""
 
-#: allianceauth/authentication/forms.py:6
+#: allianceauth/authentication/forms.py:5
 msgid "Email"
 msgstr ""
 
@@ -154,22 +154,22 @@ msgstr ""
 msgid "Unable to authenticate as the selected character."
 msgstr ""
 
-#: allianceauth/authentication/views.py:148
+#: allianceauth/authentication/views.py:146
 msgid "Registration token has expired."
 msgstr ""
 
-#: allianceauth/authentication/views.py:200
+#: allianceauth/authentication/views.py:201
 msgid ""
 "Sent confirmation email. Please follow the link to confirm your email "
 "address."
 msgstr ""
 
-#: allianceauth/authentication/views.py:205
+#: allianceauth/authentication/views.py:206
 msgid "Confirmed your email address. Please login to continue."
 msgstr ""
 
-#: allianceauth/authentication/views.py:210
-msgid "Registraion of new accounts it not allowed at this time."
+#: allianceauth/authentication/views.py:211
+msgid "Registration of new accounts is not allowed at this time."
 msgstr ""
 
 #: allianceauth/corputils/auth_hooks.py:10
@@ -1289,13 +1289,13 @@ msgstr ""
 msgid "Password must be at least 8 characters long."
 msgstr ""
 
-#: allianceauth/services/modules/discord/models.py:224
+#: allianceauth/services/modules/discord/models.py:225
 msgid "Discord Account Disabled"
 msgstr ""
 
-#: allianceauth/services/modules/discord/models.py:226
+#: allianceauth/services/modules/discord/models.py:227
 msgid ""
-"Your Discord account was disabeled automatically by Auth. If you think this "
+"Your Discord account was disabled automatically by Auth. If you think this "
 "was a mistake, please contact an admin."
 msgstr ""
 

allianceauth/locale/es/LC_MESSAGES/django.po

@@ -4,17 +4,17 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Joel Falknau <ozirascal@gmail.com>, 2020
 # frank1210 <francolopez_16@hotmail.com>, 2020
+# Joel Falknau <ozirascal@gmail.com>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-21 01:35+0000\n"
+"POT-Creation-Date: 2020-10-11 03:43+0000\n"
 "PO-Revision-Date: 2020-02-18 03:14+0000\n"
-"Last-Translator: frank1210 <francolopez_16@hotmail.com>, 2020\n"
+"Last-Translator: Joel Falknau <ozirascal@gmail.com>, 2020\n"
 "Language-Team: Spanish (https://www.transifex.com/alliance-auth/teams/107430/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +27,7 @@ msgid "A main character is required to perform that action. Add one below."
 msgstr ""
 "Un personaje principal es requerido para completar esta accion. Agregue uno"
 
-#: allianceauth/authentication/forms.py:6
+#: allianceauth/authentication/forms.py:5
 msgid "Email"
 msgstr "E-mail"
 
@@ -161,24 +161,24 @@ msgstr ""
 msgid "Unable to authenticate as the selected character."
 msgstr "Imposible validar con el personaje seleccionado."
 
-#: allianceauth/authentication/views.py:148
+#: allianceauth/authentication/views.py:146
 msgid "Registration token has expired."
 msgstr "El token de registracion expiro."
 
-#: allianceauth/authentication/views.py:200
+#: allianceauth/authentication/views.py:201
 msgid ""
 "Sent confirmation email. Please follow the link to confirm your email "
 "address."
 msgstr ""
 "Confirmacion de mail enviada. Por favor siga el enlace para confirmar "
 
-#: allianceauth/authentication/views.py:205
+#: allianceauth/authentication/views.py:206
 msgid "Confirmed your email address. Please login to continue."
 msgstr ""
 "Se ha confirmado su direccion de mail. Por favor igrese su token para "
 "continuar."
 
-#: allianceauth/authentication/views.py:210
+#: allianceauth/authentication/views.py:211
 msgid "Registraion of new accounts it not allowed at this time."
 msgstr "Registracion de nuevas cuentas no es permitido por el momento."
 
@@ -818,7 +818,7 @@ msgstr ""
 #: allianceauth/hrapplications/templates/hrapplications/management.html:144
 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:38
 #: allianceauth/hrapplications/templates/hrapplications/view.html:20
-#: allianceauth/srp/templates/srp/data.html:128
+#: allianceauth/srp/templates/srp/data.html:134
 #: allianceauth/srp/templates/srp/management.html:81
 msgid "Pending"
 msgstr "Pendiente"
@@ -912,7 +912,7 @@ msgstr "Acciones"
 #: allianceauth/hrapplications/templates/hrapplications/management.html:147
 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:40
 #: allianceauth/hrapplications/templates/hrapplications/view.html:16
-#: allianceauth/srp/templates/srp/data.html:120
+#: allianceauth/srp/templates/srp/data.html:126
 msgid "Approved"
 msgstr "Aprovado"
 
@@ -920,7 +920,7 @@ msgstr "Aprovado"
 #: allianceauth/hrapplications/templates/hrapplications/management.html:104
 #: allianceauth/hrapplications/templates/hrapplications/management.html:149
 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:42
-#: allianceauth/srp/templates/srp/data.html:124
+#: allianceauth/srp/templates/srp/data.html:130
 msgid "Rejected"
 msgstr "Rechazado"
 
@@ -1303,11 +1303,11 @@ msgstr "Contraseña"
 msgid "Password must be at least 8 characters long."
 msgstr "La contraseña tiene que tener 8 caracteres de largo minimo"
 
-#: allianceauth/services/modules/discord/models.py:224
+#: allianceauth/services/modules/discord/models.py:225
 msgid "Discord Account Disabled"
 msgstr ""
 
-#: allianceauth/services/modules/discord/models.py:226
+#: allianceauth/services/modules/discord/models.py:227
 msgid ""
 "Your Discord account was disabeled automatically by Auth. If you think this "
 "was a mistake, please contact an admin."
@@ -1666,18 +1666,18 @@ msgid "Mark Completed"
 msgstr "Marcar como Completo"
 
 #: allianceauth/srp/templates/srp/data.html:70
-#: allianceauth/srp/templates/srp/data.html:150
+#: allianceauth/srp/templates/srp/data.html:156
 msgid "Total Losses:"
 msgstr "Perdidas Totales:"
 
 #: allianceauth/srp/templates/srp/data.html:71
-#: allianceauth/srp/templates/srp/data.html:151
+#: allianceauth/srp/templates/srp/data.html:157
 #: allianceauth/srp/templates/srp/management.html:30
 msgid "Total ISK Cost:"
 msgstr "Costo Total:"
 
 #: allianceauth/srp/templates/srp/data.html:79
-#: allianceauth/srp/templates/srp/data.html:159
+#: allianceauth/srp/templates/srp/data.html:165
 msgid "Are you sure you want to delete SRP requests?"
 msgstr "Estas seguro que quiere borrar las solicitudes de SRP"
 
@@ -1709,7 +1709,7 @@ msgstr ""
 msgid "Post Time"
 msgstr "Tiempo"
 
-#: allianceauth/srp/templates/srp/data.html:168
+#: allianceauth/srp/templates/srp/data.html:174
 msgid "No SRP requests for this fleet."
 msgstr "No hay solicitudes de SRP para esta flota."
 

allianceauth/locale/ko_KR/LC_MESSAGES/django.po

@@ -5,8 +5,8 @@
 # 
 # Translators:
 # None None <khd1226543@gmail.com>, 2020
-# Seowon Jung <seowon@hawaii.edu>, 2020
 # Olgeda Choi <undead.choi@gmail.com>, 2020
+# Seowon Jung <seowon@hawaii.edu>, 2020
 # Lahty <js03js70@gmail.com>, 2020
 # 
 #, fuzzy
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-21 01:35+0000\n"
+"POT-Creation-Date: 2020-10-11 03:43+0000\n"
 "PO-Revision-Date: 2020-02-18 03:14+0000\n"
 "Last-Translator: Lahty <js03js70@gmail.com>, 2020\n"
 "Language-Team: Korean (Korea) (https://www.transifex.com/alliance-auth/teams/107430/ko_KR/)\n"
@@ -28,7 +28,7 @@ msgstr ""
 msgid "A main character is required to perform that action. Add one below."
 msgstr "해당 기능을 수행하려면 주 캐릭터가 요구됨. 아래에 하나를 추가하시오."
 
-#: allianceauth/authentication/forms.py:6
+#: allianceauth/authentication/forms.py:5
 msgid "Email"
 msgstr "이메일"
 
@@ -163,21 +163,21 @@ msgstr "계정에 %(name)s를 추가하지 못했습니다. 이미 추가된 계
 msgid "Unable to authenticate as the selected character."
 msgstr "선택한 캐릭터로 인증을 수행할 수 없음"
 
-#: allianceauth/authentication/views.py:148
+#: allianceauth/authentication/views.py:146
 msgid "Registration token has expired."
 msgstr "등록토큰 만료"
 
-#: allianceauth/authentication/views.py:200
+#: allianceauth/authentication/views.py:201
 msgid ""
 "Sent confirmation email. Please follow the link to confirm your email "
 "address."
 msgstr "확인 메일 전송됨. 다음 링크를 눌러 이메일 주소를 확인하세요."
 
-#: allianceauth/authentication/views.py:205
+#: allianceauth/authentication/views.py:206
 msgid "Confirmed your email address. Please login to continue."
 msgstr "이메일 주소가 확인되었습니다. 로그인 해주세요."
 
-#: allianceauth/authentication/views.py:210
+#: allianceauth/authentication/views.py:211
 msgid "Registraion of new accounts it not allowed at this time."
 msgstr "현재 새로운 계정 등록은 받지않습니다."
 
@@ -811,7 +811,7 @@ msgstr "해당 그룹에 대한 참여신청이 보류되었습니다."
 #: allianceauth/hrapplications/templates/hrapplications/management.html:144
 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:38
 #: allianceauth/hrapplications/templates/hrapplications/view.html:20
-#: allianceauth/srp/templates/srp/data.html:128
+#: allianceauth/srp/templates/srp/data.html:134
 #: allianceauth/srp/templates/srp/management.html:81
 msgid "Pending"
 msgstr "보류 중"
@@ -905,7 +905,7 @@ msgstr "활동"
 #: allianceauth/hrapplications/templates/hrapplications/management.html:147
 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:40
 #: allianceauth/hrapplications/templates/hrapplications/view.html:16
-#: allianceauth/srp/templates/srp/data.html:120
+#: allianceauth/srp/templates/srp/data.html:126
 msgid "Approved"
 msgstr "승인"
 
@@ -913,7 +913,7 @@ msgstr "승인"
 #: allianceauth/hrapplications/templates/hrapplications/management.html:104
 #: allianceauth/hrapplications/templates/hrapplications/management.html:149
 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:42
-#: allianceauth/srp/templates/srp/data.html:124
+#: allianceauth/srp/templates/srp/data.html:130
 msgid "Rejected"
 msgstr "거절"
 
@@ -1296,11 +1296,11 @@ msgstr "비밀번호"
 msgid "Password must be at least 8 characters long."
 msgstr "비밀번호는 8글자 이상이어야 합니다."
 
-#: allianceauth/services/modules/discord/models.py:224
+#: allianceauth/services/modules/discord/models.py:225
 msgid "Discord Account Disabled"
 msgstr "디스코드 계정 비활성화"
 
-#: allianceauth/services/modules/discord/models.py:226
+#: allianceauth/services/modules/discord/models.py:227
 msgid ""
 "Your Discord account was disabeled automatically by Auth. If you think this "
 "was a mistake, please contact an admin."
@@ -1659,18 +1659,18 @@ msgid "Mark Completed"
 msgstr "표시 완료"
 
 #: allianceauth/srp/templates/srp/data.html:70
-#: allianceauth/srp/templates/srp/data.html:150
+#: allianceauth/srp/templates/srp/data.html:156
 msgid "Total Losses:"
 msgstr "전체 손실:"
 
 #: allianceauth/srp/templates/srp/data.html:71
-#: allianceauth/srp/templates/srp/data.html:151
+#: allianceauth/srp/templates/srp/data.html:157
 #: allianceauth/srp/templates/srp/management.html:30
 msgid "Total ISK Cost:"
 msgstr "전체 ISK 비용:"
 
 #: allianceauth/srp/templates/srp/data.html:79
-#: allianceauth/srp/templates/srp/data.html:159
+#: allianceauth/srp/templates/srp/data.html:165
 msgid "Are you sure you want to delete SRP requests?"
 msgstr "SRP 보상 요청을 삭제하시겠습니까?"
 
@@ -1702,7 +1702,7 @@ msgstr "금액을 수정하려면 클릭, 저장을 하고 다음으로 가려
 msgid "Post Time"
 msgstr "작성 시간"
 
-#: allianceauth/srp/templates/srp/data.html:168
+#: allianceauth/srp/templates/srp/data.html:174
 msgid "No SRP requests for this fleet."
 msgstr "이 플릿에는 SRP 보상 요청이 없습니다."
 

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-09-21 01:35+0000\n"
+"POT-Creation-Date: 2020-10-11 03:43+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"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "A main character is required to perform that action. Add one below."
 msgstr "Необходимо указать основного персонажа. Добавим?"
 
-#: allianceauth/authentication/forms.py:6
+#: allianceauth/authentication/forms.py:5
 msgid "Email"
 msgstr "Email"
 
@@ -163,21 +163,21 @@ msgstr "Персонаж %(name)s уже добавлен."
 msgid "Unable to authenticate as the selected character."
 msgstr "Невозможно авторизировать этого персонажа. "
 
-#: allianceauth/authentication/views.py:148
+#: allianceauth/authentication/views.py:146
 msgid "Registration token has expired."
 msgstr "Регистрационный токен просрочен."
 
-#: allianceauth/authentication/views.py:200
+#: allianceauth/authentication/views.py:201
 msgid ""
 "Sent confirmation email. Please follow the link to confirm your email "
 "address."
 msgstr "Отправить подтверждающее письмо. Пожалуйста, подтвердите почту.  "
 
-#: allianceauth/authentication/views.py:205
+#: allianceauth/authentication/views.py:206
 msgid "Confirmed your email address. Please login to continue."
 msgstr "Подтвердите Ваш email адрес. Зайти для подтверждения. "
 
-#: allianceauth/authentication/views.py:210
+#: allianceauth/authentication/views.py:211
 msgid "Registraion of new accounts it not allowed at this time."
 msgstr "Регистрация нового аккаунта сейчас невозможна."
 
@@ -821,7 +821,7 @@ msgstr "Вы уже подали заявку на вступление этой
 #: allianceauth/hrapplications/templates/hrapplications/management.html:144
 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:38
 #: allianceauth/hrapplications/templates/hrapplications/view.html:20
-#: allianceauth/srp/templates/srp/data.html:128
+#: allianceauth/srp/templates/srp/data.html:134
 #: allianceauth/srp/templates/srp/management.html:81
 msgid "Pending"
 msgstr "Ожидание"
@@ -915,7 +915,7 @@ msgstr "Действия"
 #: allianceauth/hrapplications/templates/hrapplications/management.html:147
 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:40
 #: allianceauth/hrapplications/templates/hrapplications/view.html:16
-#: allianceauth/srp/templates/srp/data.html:120
+#: allianceauth/srp/templates/srp/data.html:126
 msgid "Approved"
 msgstr "Проверено"
 
@@ -923,7 +923,7 @@ msgstr "Проверено"
 #: allianceauth/hrapplications/templates/hrapplications/management.html:104
 #: allianceauth/hrapplications/templates/hrapplications/management.html:149
 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:42
-#: allianceauth/srp/templates/srp/data.html:124
+#: allianceauth/srp/templates/srp/data.html:130
 msgid "Rejected"
 msgstr "Отменено "
 
@@ -1306,11 +1306,11 @@ msgstr "Пароль"
 msgid "Password must be at least 8 characters long."
 msgstr "Пароль должен быть не менее 8 символов."
 
-#: allianceauth/services/modules/discord/models.py:224
+#: allianceauth/services/modules/discord/models.py:225
 msgid "Discord Account Disabled"
 msgstr "Discord персонаж отключен"
 
-#: allianceauth/services/modules/discord/models.py:226
+#: allianceauth/services/modules/discord/models.py:227
 msgid ""
 "Your Discord account was disabeled automatically by Auth. If you think this "
 "was a mistake, please contact an admin."
@@ -1679,18 +1679,18 @@ msgid "Mark Completed"
 msgstr "Пометить законченным"
 
 #: allianceauth/srp/templates/srp/data.html:70
-#: allianceauth/srp/templates/srp/data.html:150
+#: allianceauth/srp/templates/srp/data.html:156
 msgid "Total Losses:"
 msgstr "Суммарные потери:"
 
 #: allianceauth/srp/templates/srp/data.html:71
-#: allianceauth/srp/templates/srp/data.html:151
+#: allianceauth/srp/templates/srp/data.html:157
 #: allianceauth/srp/templates/srp/management.html:30
 msgid "Total ISK Cost:"
 msgstr "Оценочная стоимость (ISK):"
 
 #: allianceauth/srp/templates/srp/data.html:79
-#: allianceauth/srp/templates/srp/data.html:159
+#: allianceauth/srp/templates/srp/data.html:165
 msgid "Are you sure you want to delete SRP requests?"
 msgstr "Вы уверенны что хотите удалить запрос на SRP?"
 
@@ -1722,7 +1722,7 @@ msgstr "Нажмите на значение для редактирования
 msgid "Post Time"
 msgstr "Опубликованно"
 
-#: allianceauth/srp/templates/srp/data.html:168
+#: allianceauth/srp/templates/srp/data.html:174
 msgid "No SRP requests for this fleet."
 msgstr "SRP запросы отсутствуют"
 

allianceauth/locale/zh_Hans/LC_MESSAGES/django.po

@@ -4,18 +4,18 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Joel Falknau <ozirascal@gmail.com>, 2020
 # Jesse . <sgeine@hotmail.com>, 2020
 # Aaron BuBu <351793078@qq.com>, 2020
+# Joel Falknau <ozirascal@gmail.com>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-21 01:35+0000\n"
+"POT-Creation-Date: 2020-10-11 03:43+0000\n"
 "PO-Revision-Date: 2020-02-18 03:14+0000\n"
-"Last-Translator: Aaron BuBu <351793078@qq.com>, 2020\n"
+"Last-Translator: Joel Falknau <ozirascal@gmail.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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "A main character is required to perform that action. Add one below."
 msgstr "只有主要角色才能执行这个操作。在下面添加一个"
 
-#: allianceauth/authentication/forms.py:6
+#: allianceauth/authentication/forms.py:5
 msgid "Email"
 msgstr "电子邮箱"
 
@@ -159,21 +159,21 @@ msgstr "添加%(name)s到您的账户失败：他们已经在一个账户中了"
 msgid "Unable to authenticate as the selected character."
 msgstr "无法作为选定的角色进行身份验证"
 
-#: allianceauth/authentication/views.py:148
+#: allianceauth/authentication/views.py:146
 msgid "Registration token has expired."
 msgstr "注册令牌过期。"
 
-#: allianceauth/authentication/views.py:200
+#: allianceauth/authentication/views.py:201
 msgid ""
 "Sent confirmation email. Please follow the link to confirm your email "
 "address."
 msgstr "已经发送了确认邮件。请按照链接确定您的电邮地址"
 
-#: allianceauth/authentication/views.py:205
+#: allianceauth/authentication/views.py:206
 msgid "Confirmed your email address. Please login to continue."
 msgstr "已确认您的电邮地址。请登录以继续"
 
-#: allianceauth/authentication/views.py:210
+#: allianceauth/authentication/views.py:211
 msgid "Registraion of new accounts it not allowed at this time."
 msgstr "现在不允许注册新账户。"
 
@@ -807,7 +807,7 @@ msgstr "你已经有了该组的未决申请"
 #: allianceauth/hrapplications/templates/hrapplications/management.html:144
 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:38
 #: allianceauth/hrapplications/templates/hrapplications/view.html:20
-#: allianceauth/srp/templates/srp/data.html:128
+#: allianceauth/srp/templates/srp/data.html:134
 #: allianceauth/srp/templates/srp/management.html:81
 msgid "Pending"
 msgstr "待定"
@@ -901,7 +901,7 @@ msgstr "操作"
 #: allianceauth/hrapplications/templates/hrapplications/management.html:147
 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:40
 #: allianceauth/hrapplications/templates/hrapplications/view.html:16
-#: allianceauth/srp/templates/srp/data.html:120
+#: allianceauth/srp/templates/srp/data.html:126
 msgid "Approved"
 msgstr "通过"
 
@@ -909,7 +909,7 @@ msgstr "通过"
 #: allianceauth/hrapplications/templates/hrapplications/management.html:104
 #: allianceauth/hrapplications/templates/hrapplications/management.html:149
 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:42
-#: allianceauth/srp/templates/srp/data.html:124
+#: allianceauth/srp/templates/srp/data.html:130
 msgid "Rejected"
 msgstr "拒绝"
 
@@ -1292,11 +1292,11 @@ msgstr "密码"
 msgid "Password must be at least 8 characters long."
 msgstr "密码至少要有8个字符啊，你也太不注重安全啦"
 
-#: allianceauth/services/modules/discord/models.py:224
+#: allianceauth/services/modules/discord/models.py:225
 msgid "Discord Account Disabled"
 msgstr ""
 
-#: allianceauth/services/modules/discord/models.py:226
+#: allianceauth/services/modules/discord/models.py:227
 msgid ""
 "Your Discord account was disabeled automatically by Auth. If you think this "
 "was a mistake, please contact an admin."
@@ -1655,18 +1655,18 @@ msgid "Mark Completed"
 msgstr "标记为已完成"
 
 #: allianceauth/srp/templates/srp/data.html:70
-#: allianceauth/srp/templates/srp/data.html:150
+#: allianceauth/srp/templates/srp/data.html:156
 msgid "Total Losses:"
 msgstr "损失总额："
 
 #: allianceauth/srp/templates/srp/data.html:71
-#: allianceauth/srp/templates/srp/data.html:151
+#: allianceauth/srp/templates/srp/data.html:157
 #: allianceauth/srp/templates/srp/management.html:30
 msgid "Total ISK Cost:"
 msgstr "ISK花费总额："
 
 #: allianceauth/srp/templates/srp/data.html:79
-#: allianceauth/srp/templates/srp/data.html:159
+#: allianceauth/srp/templates/srp/data.html:165
 msgid "Are you sure you want to delete SRP requests?"
 msgstr "老哥，你确定要删了补损请求么？"
 
@@ -1698,7 +1698,7 @@ msgstr "点击数值就可以编辑啦，按回车确认，按ESC取消"
 msgid "Post Time"
 msgstr "发布时间"
 
-#: allianceauth/srp/templates/srp/data.html:168
+#: allianceauth/srp/templates/srp/data.html:174
 msgid "No SRP requests for this fleet."
 msgstr "这次起队没有补损请求！大捷"
 

allianceauth/project_template/project_name/settings/base.py

@@ -64,12 +64,12 @@ BASE_DIR = os.path.dirname(PROJECT_DIR)
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.locale.LocaleMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'django.middleware.locale.LocaleMiddleware',
 ]
 
 ROOT_URLCONF = 'allianceauth.urls'
@@ -86,6 +86,8 @@ LANGUAGES = (
     ('zh-hans', ugettext('Chinese Simplified')),
     ('ru', ugettext('Russian')),
     ('ko', ugettext('Korean')),
+    ('fr', ugettext('French')),
+    ('ja', ugettext('Japanese')),
 )
 
 TEMPLATES = [
@@ -138,6 +140,8 @@ AUTHENTICATION_BACKENDS = ['allianceauth.authentication.backends.StateBackend',
 
 LANGUAGE_CODE = 'en-us'
 
+LANGUAGE_COOKIE_AGE = 1209600
+
 TIME_ZONE = 'UTC'
 
 USE_I18N = True

allianceauth/services/modules/discord/models.py

@@ -224,7 +224,7 @@ class DiscordUser(models.Model):
                             user=_user, 
                             title=gettext_lazy('Discord Account Disabled'), 
                             message=gettext_lazy(
-                                'Your Discord account was disabeled automatically '
+                                'Your Discord account was disabled automatically '
                                 'by Auth. If you think this was a mistake, '
                                 'please contact an admin.'
                             ),

allianceauth/services/modules/mumble/migrations/0011_auto_20201011_1009.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.2 on 2020-10-11 10:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mumble', '0010_mumbleuser_certhash'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='mumbleuser',
+            name='pwhash',
+            field=models.CharField(max_length=90),
+        ),
+    ]

allianceauth/services/modules/mumble/models.py

@@ -63,7 +63,7 @@ class MumbleManager(models.Manager):
 
 class MumbleUser(AbstractServiceModel):
     username = models.CharField(max_length=254, unique=True)
-    pwhash = models.CharField(max_length=80)
+    pwhash = models.CharField(max_length=90)
     hashfn = models.CharField(max_length=20, default='sha1')
     groups = models.TextField(blank=True, null=True)
     certhash = models.CharField(

allianceauth/services/modules/mumble/tests.py

@@ -211,4 +211,4 @@ class MumbleManagerTestCase(TestCase):
         pwhash = self.manager.gen_pwhash('test')
 
         self.assertEqual(pwhash[:15], '$bcrypt-sha256$')
-        self.assertEqual(len(pwhash), 75)
+        self.assertEqual(len(pwhash), 83)

allianceauth/srp/templates/srp/data.html

@@ -61,7 +61,7 @@
                     {% endif %}
                 </div>
             </h1>
-            
+
             {% if srpfleetrequests %}
                 <form method="POST">
                     {% csrf_token %}
@@ -104,7 +104,13 @@ ESC to cancel{% endblocktrans %}"id="blah"></i></th>
                             <tbody>
                             {% for srpfleetrequest in srpfleetrequests %}
                                 <tr>
-                                    <td class="text-center">{{ srpfleetrequest.character.character_name }}</td>
+                                    <td class="text-center">
+                                        {% if srpfleetrequest.character.alliance.alliance_ticker %}
+                                            {{ srpfleetrequest.character.alliance.alliance_ticker }}
+                                        {% endif %}
+                                        [{{ srpfleetrequest.character.corporation.corporation_ticker }}]
+                                        {{ srpfleetrequest.character.character_name }}
+                                    </td>
                                     <td class="text-center">
                                         <a href="{{ srpfleetrequest.killboard_link }}"
                                         target="_blank" class="label label-warning">Link</a>
@@ -136,7 +142,7 @@ ESC to cancel{% endblocktrans %}"id="blah"></i></th>
                                                     <input type="checkbox" name="{{srpfleetrequest.id}}">
                                                     <span class="cr"><i class="cr-icon fas fa-check"></i></span>
                                                 </label>
-                                            </div>                            
+                                            </div>
                                         </td>
                                     {% endif %}
                                 </tr>
@@ -205,7 +211,7 @@ ESC to cancel{% endblocktrans %}"id="blah"></i></th>
               var $next = $(this).closest('tr').next().find('.editable');
               setTimeout(function() {
                   $next.editable('show');
-              }, 400); 
+              }, 400);
           }
      });
   });
@@ -248,4 +254,4 @@ ESC to cancel{% endblocktrans %}"id="blah"></i></th>
     });
   });
 
-{% endblock extra_script %}
+{% endblock extra_script %}

allianceauth/static/css/auth-base.css

@@ -53,22 +53,34 @@ ul.list-group.list-group-horizontal > li.list-group-item {
 .table-aa > thead > tr > th{
     border-bottom: 1px solid #f2f2f2;
 }
-.table-aa > thead > tr > th{    
+.table-aa > thead > tr > th{
     vertical-align: middle;
 }
 .table-aa > tbody > tr > td{
     border-bottom: 1px solid #f2f2f2;
 }
-.table-aa > tbody > tr > td {    
+.table-aa > tbody > tr > td {
     vertical-align: middle;
 }
-.table-aa > tbody > tr:last-child {    
+.table-aa > tbody > tr:last-child {
     border-bottom: none;
 }
 
+/* highlight active menu items
+--------------------------------------------------------------------------------------------------------------------- */
+@media all {
+    .template-light-mode .nav-pills > li > a.active {
+        background-color: rgb(236, 240, 241);
+    }
+
+    .template-dark-mode .nav-pills > li > a.active {
+        background-color: rgb(48, 48, 48);
+    }
+}
+
 /* Small devices (tablets, 768px and up) */
 @media (min-width: 768px) {
-    
+
     /* class for vertically aligning columns in a bootstrap row */
     .row.vertical-flexbox-row2 {
         display:  -webkit-box;
@@ -77,7 +89,7 @@ ul.list-group.list-group-horizontal > li.list-group-item {
         display:         flex;
         flex-wrap: wrap;
       }
-      
+
       .row.vertical-flexbox-row2 > [class*='col-'] {
         display: flex;
         flex-direction: column;
@@ -89,4 +101,4 @@ ul.list-group.list-group-horizontal > li.list-group-item {
     .button-wrapper .btn {
         margin-bottom:5px;
     }
-}
+}

allianceauth/templates/allianceauth/base.html

@@ -3,52 +3,60 @@
 {% load navactive %}
 <!DOCTYPE html>
 <html lang="en">
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    {% include 'allianceauth/icons.html' %}
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="description" content="">
+        <meta name="author" content="">
 
-    <title>{% block title %}{% block page_title %}{% endblock page_title %} - Alliance Auth{% endblock title %}</title>
+        {% include 'allianceauth/icons.html' %}
 
-    {% include 'bundles/bootstrap-css.html' %}
-    {% include 'bundles/fontawesome.html' %}
+        <title>{% block title %}{% block page_title %}{% endblock page_title %} - Alliance Auth{% endblock title %}</title>
 
-    <link href="{% static 'css/auth-base.css' %}" type="text/css" rel="stylesheet">
-    {% block extra_css %}{% endblock extra_css %}
-</head>
-<body>
-{% if user.is_authenticated %}
-    <div id="wrapper" class="container">
-        <!-- Navigation -->
-        {% include 'allianceauth/top-menu.html' %}
-        <div class="row" id="site-body-wrapper">
-            {% include 'allianceauth/side-menu.html' %}
-            <div class="col-sm-10">
-                {% if messages %}
-                    <br>
-                    {% for message in messages %}
-                        <div class="alert alert-{{ message.level_tag }}">{{ message }}</div>
-                        {% if not forloop.last %}
+        {% include 'bundles/bootstrap-css.html' %}
+        {% include 'bundles/fontawesome.html' %}
+
+        <link href="{% static 'css/auth-base.css' %}" type="text/css" rel="stylesheet">
+
+        {% block extra_css %}{% endblock extra_css %}
+    </head>
+
+    <body class="{% if NIGHT_MODE %}template-dark-mode{% else %}template-light-mode{% endif %}">
+        {% if user.is_authenticated %}
+            <div id="wrapper" class="container">
+                <!-- Navigation -->
+                {% include 'allianceauth/top-menu.html' %}
+
+                <div class="row" id="site-body-wrapper">
+                    {% include 'allianceauth/side-menu.html' %}
+                    <div class="col-sm-10">
+                        {% if messages %}
                             <br>
+                            {% for message in messages %}
+                                <div class="alert alert-{{ message.level_tag }}">{{ message }}</div>
+                                {% if not forloop.last %}
+                                    <br>
+                                {% endif %}
+                            {% endfor %}
                         {% endif %}
-                    {% endfor %}
-                {% endif %}
-                {% block content %}
-                {% endblock content %}
+
+                        {% block content %}
+                        {% endblock content %}
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
             </div>
-            <div class="clearfix"></div>
-        </div>
-    </div>
-{% endif %}
-{% include 'bundles/bootstrap-js.html' %}
-{% block extra_javascript %}
-{% endblock extra_javascript %}
-<script>
-    {% block extra_script %}
-    {% endblock extra_script %}
-</script>
-</body>
+        {% endif %}
+
+        {% include 'bundles/bootstrap-js.html' %}
+
+        {% block extra_javascript %}
+        {% endblock extra_javascript %}
+
+        <script>
+            {% block extra_script %}
+            {% endblock extra_script %}
+        </script>
+    </body>
 </html>

allianceauth/templates/allianceauth/night-toggle.html

@@ -1,5 +1,5 @@
 {% load i18n %}
 <a href="{% url 'nightmode' %}?next={{ request.path|urlencode }}">
     {% trans "Night" %}
-    <i class="fa {% if NIGHT_MODE %}fa-toggle-on{% else %}fa-toggle-off{% endif %}" aria-hidden="true"></i>
+    <i class="fas {% if NIGHT_MODE %}fa-toggle-on{% else %}fa-toggle-off{% endif %}" aria-hidden="true"></i>
 </a>

docs/conf.py

@@ -28,8 +28,6 @@ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
 
 # Support for recommonmark module
 import recommonmark
-
-from recommonmark.parser import CommonMarkParser
 from recommonmark.transform import AutoStructify
 
 # -- General configuration ------------------------------------------------
@@ -41,8 +39,11 @@ from recommonmark.transform import AutoStructify
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
+
 extensions = [
+    'sphinx_rtd_theme',
     'sphinx.ext.autodoc',    
+    'recommonmark',
 ]
 
 # Add any paths that contain templates here, relative to this directory.
@@ -76,7 +77,7 @@ version = u'2.0'
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+language = 'en'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
@@ -171,12 +172,6 @@ texinfo_documents = [
      'Miscellaneous'),
 ]
 
-# Markdown support
-source_parsers = {
-    '.md': CommonMarkParser,
-}
-
-
 def setup(app):
     app.add_config_value('recommonmark_config', {
             'auto_toc_tree_section': 'Contents',

docs/requirements.txt

@@ -1,3 +1,3 @@
-sphinx>=1.4.0,<1.5.0
-sphinx_rtd_theme>=0.1.9
-recommonmark==0.4.0
+sphinx=>3.2.1,<4.0.0
+sphinx_rtd_theme=0.5.0
+recommonmark=0.6.0

setup.py

@@ -26,7 +26,7 @@ install_requires = [
     'django-bootstrap-form',
     'django-registration>=3.1',
     'django-sortedm2m',
-    'django-redis-cache>=2.1.0,<3.0.0',
+    'django-redis-cache>=2.1.0,<3.0.0,!=2.1.3',  # 2.1.3 != Django 3 (Issue 1264)
     'django-celery-beat>=2.0.0',
 
     'openfire-restapi',