renamed localization messages and ordered them alphabetically

Author: StegSchreck

core/localization/messages.py

@@ -1,14 +1,14 @@
+ACCOUNT_CREATED = "Account wurde erstellt. Jetzt kannst du dich einloggen."
+ALREADY_LOGGED_IN = "Du bist bereits eingeloggt. Du kannst dich im Menü ausloggen."
 EMAIL_ALREADY_EXISTS = "Ein Account mit dieser E-Mail-Adresse existiert bereits."
-MSG_ACCOUNT_CREATED = "Account wurde erstellt. Jetzt kannst du dich einloggen."
-MSG_ALREADY_LOGGED_IN = "Du bist bereits eingeloggt. Du kannst dich im Menü ausloggen."
-MSG_NOT_LOGGED_IN = "Du bist nicht eingeloggt!"
-MSG_OFM_PASSWORDS_UNEQUAL = "Die eingegeben OFM Passwörter stimmen nicht überein."
-MSG_PASSWORDS_UNEQUAL = "Die eingegeben Passwörter stimmen nicht überein."
-MSG_SETTINGS_SAVED = "Die neuen Einstellungen wurden gespeichert."
+LOGGED_OUT = "Du wurdest abgemeldet."
+LOGIN_IMPOSSIBLE_ACCOUNT_IS_DEACTIVATED = "Login nicht möglich. Dein Account wurde deaktiviert."
+LOGIN_SUCCESSFUL = "Login erfolgreich."
 NEWER_OFM_VERSION_AVAILABLE = "Es ist eine neuere Version von OFM Helper verfügbar: %s. Du nutzt noch: %s."
+NOT_LOGGED_IN = "Du bist nicht eingeloggt!"
+OFM_PASSWORDS_UNEQUAL = "Die eingegeben OFM Passwörter stimmen nicht überein."
 OFM_USERNAME_ALREADY_EXISTS = "Es existiert bereits ein Account für diesen OFM Benutzernamen."
+PASSWORDS_UNEQUAL = "Die eingegeben Passwörter stimmen nicht überein."
+SETTINGS_SAVED = "Die neuen Einstellungen wurden gespeichert."
 USERNAME_ALREADY_EXISTS = "Ein Account mit diesem Benutzernamen existiert bereits."
-LOGGED_OUT = "Du wurdest abgemeldet."
 USERNAME_OR_PASSWORD_INVALID = "Benutzername und/oder Passwort nicht korrekt."
-LOGIN_IMPOSSIBLE_ACCOUNT_IS_DEACTIVATED = "Login nicht möglich. Dein Account wurde deaktiviert."
-LOGIN_SUCCESSFUL = "Login erfolgreich."

core/views/account_views.py

@@ -2,16 +2,16 @@
 from django.contrib.auth import authenticate, login, logout
 from django.shortcuts import render, redirect
 
-from core.localization.messages import MSG_PASSWORDS_UNEQUAL, MSG_OFM_PASSWORDS_UNEQUAL, MSG_NOT_LOGGED_IN, \
-    OFM_USERNAME_ALREADY_EXISTS, USERNAME_ALREADY_EXISTS, EMAIL_ALREADY_EXISTS, MSG_ALREADY_LOGGED_IN, \
-    MSG_ACCOUNT_CREATED, LOGGED_OUT, USERNAME_OR_PASSWORD_INVALID, LOGIN_IMPOSSIBLE_ACCOUNT_IS_DEACTIVATED, \
+from core.localization.messages import PASSWORDS_UNEQUAL, OFM_PASSWORDS_UNEQUAL, NOT_LOGGED_IN, \
+    OFM_USERNAME_ALREADY_EXISTS, USERNAME_ALREADY_EXISTS, EMAIL_ALREADY_EXISTS, ALREADY_LOGGED_IN, \
+    ACCOUNT_CREATED, LOGGED_OUT, USERNAME_OR_PASSWORD_INVALID, LOGIN_IMPOSSIBLE_ACCOUNT_IS_DEACTIVATED, \
     LOGIN_SUCCESSFUL
 from users.models import OFMUser
 
 
 def register_view(request):
     if request.user.is_authenticated():
-        messages.error(request, MSG_ALREADY_LOGGED_IN)
+        messages.error(request, ALREADY_LOGGED_IN)
         return render(request, 'core/account/home.html')
     if request.POST:
         username = request.POST.get('username')
@@ -31,15 +31,15 @@ def register_view(request):
             return redirect('core:register')
 
         if password != password2:
-            messages.error(request, MSG_PASSWORDS_UNEQUAL)
+            messages.error(request, PASSWORDS_UNEQUAL)
             return redirect('core:register')
 
         if OFMUser.objects.filter(ofm_username=ofm_username).exists():
             messages.error(request, OFM_USERNAME_ALREADY_EXISTS)
             return redirect('core:register')
 
         if ofm_password != ofm_password2:
-            messages.error(request, MSG_OFM_PASSWORDS_UNEQUAL)
+            messages.error(request, OFM_PASSWORDS_UNEQUAL)
             return redirect('core:register')
 
         OFMUser.objects.create_user(
@@ -50,7 +50,7 @@ def register_view(request):
             ofm_password=ofm_password,
         )
 
-        messages.success(request, MSG_ACCOUNT_CREATED)
+        messages.success(request, ACCOUNT_CREATED)
         return redirect('core:login')
 
     else:
@@ -91,5 +91,5 @@ def account_view(request):
     if request.user.is_authenticated():
         return render(request, 'core/account/home.html')
     else:
-        messages.error(request, MSG_NOT_LOGGED_IN)
+        messages.error(request, NOT_LOGGED_IN)
         return redirect('core:login')

core/views/settings_views.py

@@ -1,8 +1,8 @@
 from django.contrib import messages
 from django.shortcuts import redirect, render
 
-from core.localization.messages import MSG_PASSWORDS_UNEQUAL, MSG_SETTINGS_SAVED, MSG_OFM_PASSWORDS_UNEQUAL, \
-    MSG_NOT_LOGGED_IN
+from core.localization.messages import PASSWORDS_UNEQUAL, SETTINGS_SAVED, OFM_PASSWORDS_UNEQUAL, \
+    NOT_LOGGED_IN
 from users.models import OFMUser
 
 
@@ -14,21 +14,21 @@ def _handle_account_data_change(request, email, password, password2):
         request.user.email = email
     if password and password2:
         if password != password2:
-            messages.error(request, MSG_PASSWORDS_UNEQUAL)
+            messages.error(request, PASSWORDS_UNEQUAL)
             return
         request.user.set_password(password)
     request.user.save()
-    messages.success(request, MSG_SETTINGS_SAVED)
+    messages.success(request, SETTINGS_SAVED)
 
 
 def _handle_ofm_data_change(request, ofm_password, ofm_password2):
     if ofm_password != ofm_password2:
-        messages.error(request, MSG_OFM_PASSWORDS_UNEQUAL)
+        messages.error(request, OFM_PASSWORDS_UNEQUAL)
         return redirect('core:register')
 
     request.user.ofm_password = ofm_password
     request.user.save()
-    messages.success(request, MSG_SETTINGS_SAVED)
+    messages.success(request, SETTINGS_SAVED)
 
 
 def settings_view(request):
@@ -49,5 +49,5 @@ def settings_view(request):
 
         return render(request, 'core/account/settings.html')
     else:
-        messages.error(request, MSG_NOT_LOGGED_IN)
+        messages.error(request, NOT_LOGGED_IN)
         return redirect('core:login')

core/views/trigger_parsing_views.py

@@ -1,7 +1,7 @@
 from django.contrib import messages
 from django.shortcuts import redirect
 
-from core.localization.messages import MSG_NOT_LOGGED_IN, NEWER_OFM_VERSION_AVAILABLE
+from core.localization.messages import NOT_LOGGED_IN, NEWER_OFM_VERSION_AVAILABLE
 from core.managers.parser_manager import ParserManager
 from core.managers.site_manager import SiteManager
 
@@ -27,7 +27,7 @@ def trigger_parsing(request):
 
         return redirect('core:ofm:player_statistics')
     else:
-        messages.error(request, MSG_NOT_LOGGED_IN)
+        messages.error(request, NOT_LOGGED_IN)
         return redirect('core:login')
 
 
@@ -38,7 +38,7 @@ def trigger_single_parsing(request, parsing_function, redirect_to='core:account'
         parsing_function(request, site_manager)
         return redirect(redirect_to)
     else:
-        messages.error(request, MSG_NOT_LOGGED_IN)
+        messages.error(request, NOT_LOGGED_IN)
         return redirect('core:login')