Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-06 07:06:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Localisation & German translation updates (#701)

Browse Source
This commit is contained in:
iAddz
2017-02-12 04:04:18 +00:00
committed by Adarnof
parent a33c8c14ee
commit a6c48f8d71
46 changed files with 1426 additions and 1302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
authentication/views.py
View File

@@ -4,6 +4,7 @@ from django.contrib.auth import logout
from django.contrib.auth import authenticate
from django.shortcuts import render, redirect
from django.contrib.auth.decorators import login_required
from django.utils.translation import ugettext_lazy as _
from eveonline.managers import EveManager
from eveonline.models import EveCharacter
from authentication.models import AuthServicesInfo
@@ -34,10 +35,10 @@ def login_user(request):
return redirect(redirect_to)
else:
logger.info("Login attempt failed for user %s: user marked inactive." % user)
messages.warning(request, 'Your account has been disabled.')
messages.warning(request, _('Your account has been disabled.'))
else:
logger.info("Failed login attempt: provided username %s" % form.cleaned_data['username'])
messages.error(request, 'Username/password invalid.')
messages.error(request, _('Username/password invalid.'))
return render(request, 'public/login.html', context={'form': form})
else:
logger.debug("Providing new login form.")
@@ -68,7 +69,7 @@ def register_user_view(request):
user.save()
logger.info("Created new user %s" % user)
login(request, user)
messages.warning(request, 'Add an API key to set up your account.')
messages.warning(request, _('Add an API key to set up your account.'))
return redirect("auth_dashboard")
else:
@@ -106,10 +107,10 @@ def sso_login(request, token):
token.save()
return redirect('auth_dashboard')
else:
messages.error(request, 'Your account has been disabled.')
messages.error(request, _('Your account has been disabled.'))
else:
messages.warning(request,
'Authenticated character has no owning account. Please log in with username and password.')
_('Authenticated character has no owning account. Please log in with username and password.'))
except EveCharacter.DoesNotExist:
messages.error(request, 'No account exists with the authenticated character. Please create an account first.')
messages.error(request, _('No account exists with the authenticated character. Please create an account first.'))
return redirect(login_user)