mirror of
https://github.com/Tivix/django-rest-auth.git
synced 2024-11-28 20:13:43 +03:00
Adds ugettext_lazy to more texts
Also adds a first german translation.
This commit is contained in:
parent
00415301d6
commit
152b0a6fb6
99
rest_auth/locale/de/LC_MESSAGES/django.po
Normal file
99
rest_auth/locale/de/LC_MESSAGES/django.po
Normal file
|
@ -0,0 +1,99 @@
|
||||||
|
# SOME DESCRIPTIVE TITLE.
|
||||||
|
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||||
|
# This file is distributed under the same license as the PACKAGE package.
|
||||||
|
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||||
|
#
|
||||||
|
#, fuzzy
|
||||||
|
msgid ""
|
||||||
|
msgstr ""
|
||||||
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
"POT-Creation-Date: 2016-02-02 14:11+0100\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"
|
||||||
|
"Language: \n"
|
||||||
|
"MIME-Version: 1.0\n"
|
||||||
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||||
|
|
||||||
|
#: registration/serializers.py:54
|
||||||
|
msgid "View is not defined, pass it as a context variable"
|
||||||
|
msgstr "\"View\" ist nicht definiert, übergib es als Contextvariable"
|
||||||
|
|
||||||
|
#: registration/serializers.py:59
|
||||||
|
msgid "Define adapter_class in view"
|
||||||
|
msgstr "Definier \"adapter_class\" in view"
|
||||||
|
|
||||||
|
#: registration/serializers.py:78
|
||||||
|
msgid "Define callback_url in view"
|
||||||
|
msgstr "Definier \"callback_url\" in view"
|
||||||
|
|
||||||
|
#: registration/serializers.py:82
|
||||||
|
msgid "Define client_class in view"
|
||||||
|
msgstr "Definier \"client_class\" in view"
|
||||||
|
|
||||||
|
#: registration/serializers.py:102
|
||||||
|
msgid "Incorrect input. access_token or code is required."
|
||||||
|
msgstr "Falsche Eingabe. \"access_token\" oder \"code\" erforderlich."
|
||||||
|
|
||||||
|
#: registration/serializers.py:111
|
||||||
|
msgid "Incorrect value"
|
||||||
|
msgstr "Falscher Wert."
|
||||||
|
|
||||||
|
#: registration/serializers.py:140
|
||||||
|
msgid "A user is already registered with this e-mail address."
|
||||||
|
msgstr "Ein User mit dieser E-Mail Adresse ist schon registriert."
|
||||||
|
|
||||||
|
#: registration/serializers.py:148
|
||||||
|
msgid "The two password fields didn't match."
|
||||||
|
msgstr "Die beiden Passwörter sind nicht identisch."
|
||||||
|
|
||||||
|
#: registration/views.py:64
|
||||||
|
msgid "ok"
|
||||||
|
msgstr "Ok"
|
||||||
|
|
||||||
|
#: serializers.py:29
|
||||||
|
msgid "Must include \"email\" and \"password\"."
|
||||||
|
msgstr "Muss \"email\" und \"password\" enthalten."
|
||||||
|
|
||||||
|
#: serializers.py:40
|
||||||
|
msgid "Must include \"username\" and \"password\"."
|
||||||
|
msgstr "Muss \"username\" und \"password\" enthalten."
|
||||||
|
|
||||||
|
#: serializers.py:53
|
||||||
|
msgid "Must include either \"username\" or \"email\" and \"password\"."
|
||||||
|
msgstr "Muss entweder \"username\" oder \"email\" und password \"password\""
|
||||||
|
|
||||||
|
#: serializers.py:94
|
||||||
|
msgid "User account is disabled."
|
||||||
|
msgstr "Der Useraccount ist deaktiviert."
|
||||||
|
|
||||||
|
#: serializers.py:97
|
||||||
|
msgid "Unable to log in with provided credentials."
|
||||||
|
msgstr "Kann nicht mit den angegeben Zugangsdaten anmelden."
|
||||||
|
|
||||||
|
#: serializers.py:106
|
||||||
|
msgid "E-mail is not verified."
|
||||||
|
msgstr "E-Mail Adresse ist nicht verifiziert."
|
||||||
|
|
||||||
|
#: serializers.py:152
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "Fehler"
|
||||||
|
|
||||||
|
#: views.py:71
|
||||||
|
msgid "Successfully logged out."
|
||||||
|
msgstr "Erfolgreich ausgeloggt."
|
||||||
|
|
||||||
|
#: views.py:111
|
||||||
|
msgid "Password reset e-mail has been sent."
|
||||||
|
msgstr "Die E-Mail zum Zurücksetzen des Passwortes wurde verschickt."
|
||||||
|
|
||||||
|
#: views.py:132
|
||||||
|
msgid "Password has been reset with the new password."
|
||||||
|
msgstr "Das Passwort wurde mit dem neuen Passwort ersetzt."
|
||||||
|
|
||||||
|
#: views.py:150
|
||||||
|
msgid "New password has been saved."
|
||||||
|
msgstr "Das neue Passwort wurde gespeichert."
|
|
@ -1,5 +1,6 @@
|
||||||
from django.http import HttpRequest
|
from django.http import HttpRequest
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from allauth.account import app_settings as allauth_settings
|
from allauth.account import app_settings as allauth_settings
|
||||||
|
@ -53,12 +54,12 @@ class SocialLoginSerializer(serializers.Serializer):
|
||||||
|
|
||||||
if not view:
|
if not view:
|
||||||
raise serializers.ValidationError(
|
raise serializers.ValidationError(
|
||||||
'View is not defined, pass it as a context variable'
|
_('View is not defined, pass it as a context variable')
|
||||||
)
|
)
|
||||||
|
|
||||||
adapter_class = getattr(view, 'adapter_class', None)
|
adapter_class = getattr(view, 'adapter_class', None)
|
||||||
if not adapter_class:
|
if not adapter_class:
|
||||||
raise serializers.ValidationError('Define adapter_class in view')
|
raise serializers.ValidationError(_('Define adapter_class in view'))
|
||||||
|
|
||||||
adapter = adapter_class()
|
adapter = adapter_class()
|
||||||
app = adapter.get_provider().get_app(request)
|
app = adapter.get_provider().get_app(request)
|
||||||
|
@ -77,11 +78,11 @@ class SocialLoginSerializer(serializers.Serializer):
|
||||||
|
|
||||||
if not self.callback_url:
|
if not self.callback_url:
|
||||||
raise serializers.ValidationError(
|
raise serializers.ValidationError(
|
||||||
'Define callback_url in view'
|
_('Define callback_url in view')
|
||||||
)
|
)
|
||||||
if not self.client_class:
|
if not self.client_class:
|
||||||
raise serializers.ValidationError(
|
raise serializers.ValidationError(
|
||||||
'Define client_class in view'
|
_('Define client_class in view')
|
||||||
)
|
)
|
||||||
|
|
||||||
code = attrs.get('code')
|
code = attrs.get('code')
|
||||||
|
@ -101,7 +102,7 @@ class SocialLoginSerializer(serializers.Serializer):
|
||||||
access_token = token['access_token']
|
access_token = token['access_token']
|
||||||
|
|
||||||
else:
|
else:
|
||||||
raise serializers.ValidationError('Incorrect input. access_token or code is required.')
|
raise serializers.ValidationError(_('Incorrect input. access_token or code is required.'))
|
||||||
|
|
||||||
token = adapter.parse_token({'access_token': access_token})
|
token = adapter.parse_token({'access_token': access_token})
|
||||||
token.app = app
|
token.app = app
|
||||||
|
@ -110,7 +111,7 @@ class SocialLoginSerializer(serializers.Serializer):
|
||||||
login = self.get_social_login(adapter, app, token, access_token)
|
login = self.get_social_login(adapter, app, token, access_token)
|
||||||
complete_social_login(request, login)
|
complete_social_login(request, login)
|
||||||
except HTTPError:
|
except HTTPError:
|
||||||
raise serializers.ValidationError('Incorrect value')
|
raise serializers.ValidationError(_('Incorrect value'))
|
||||||
|
|
||||||
if not login.is_existing:
|
if not login.is_existing:
|
||||||
login.lookup()
|
login.lookup()
|
||||||
|
@ -139,7 +140,7 @@ class RegisterSerializer(serializers.Serializer):
|
||||||
if allauth_settings.UNIQUE_EMAIL:
|
if allauth_settings.UNIQUE_EMAIL:
|
||||||
if email and email_address_exists(email):
|
if email and email_address_exists(email):
|
||||||
raise serializers.ValidationError(
|
raise serializers.ValidationError(
|
||||||
"A user is already registered with this e-mail address.")
|
_("A user is already registered with this e-mail address."))
|
||||||
return email
|
return email
|
||||||
|
|
||||||
def validate_password1(self, password):
|
def validate_password1(self, password):
|
||||||
|
@ -147,7 +148,7 @@ class RegisterSerializer(serializers.Serializer):
|
||||||
|
|
||||||
def validate(self, data):
|
def validate(self, data):
|
||||||
if data['password1'] != data['password2']:
|
if data['password1'] != data['password2']:
|
||||||
raise serializers.ValidationError("The two password fields didn't match.")
|
raise serializers.ValidationError(_("The two password fields didn't match."))
|
||||||
return data
|
return data
|
||||||
|
|
||||||
def custom_signup(self, request, user):
|
def custom_signup(self, request, user):
|
||||||
|
|
|
@ -61,7 +61,7 @@ class VerifyEmailView(APIView, ConfirmEmailView):
|
||||||
self.kwargs['key'] = serializer.validated_data['key']
|
self.kwargs['key'] = serializer.validated_data['key']
|
||||||
confirmation = self.get_object()
|
confirmation = self.get_object()
|
||||||
confirmation.confirm(self.request)
|
confirmation.confirm(self.request)
|
||||||
return Response({'message': 'ok'}, status=status.HTTP_200_OK)
|
return Response({'message': _('ok')}, status=status.HTTP_200_OK)
|
||||||
|
|
||||||
|
|
||||||
class SocialLoginView(LoginView):
|
class SocialLoginView(LoginView):
|
||||||
|
|
|
@ -103,7 +103,7 @@ class LoginSerializer(serializers.Serializer):
|
||||||
if app_settings.EMAIL_VERIFICATION == app_settings.EmailVerificationMethod.MANDATORY:
|
if app_settings.EMAIL_VERIFICATION == app_settings.EmailVerificationMethod.MANDATORY:
|
||||||
email_address = user.emailaddress_set.get(email=user.email)
|
email_address = user.emailaddress_set.get(email=user.email)
|
||||||
if not email_address.verified:
|
if not email_address.verified:
|
||||||
raise serializers.ValidationError('E-mail is not verified.')
|
raise serializers.ValidationError(_('E-mail is not verified.'))
|
||||||
|
|
||||||
attrs['user'] = user
|
attrs['user'] = user
|
||||||
return attrs
|
return attrs
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
from django.contrib.auth import login, logout
|
from django.contrib.auth import login, logout
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.core.exceptions import ObjectDoesNotExist
|
from django.core.exceptions import ObjectDoesNotExist
|
||||||
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
from rest_framework import status
|
from rest_framework import status
|
||||||
from rest_framework.views import APIView
|
from rest_framework.views import APIView
|
||||||
|
@ -69,12 +70,11 @@ class LogoutView(APIView):
|
||||||
|
|
||||||
logout(request)
|
logout(request)
|
||||||
|
|
||||||
return Response({"success": "Successfully logged out."},
|
return Response({"success": _("Successfully logged out.")},
|
||||||
status=status.HTTP_200_OK)
|
status=status.HTTP_200_OK)
|
||||||
|
|
||||||
|
|
||||||
class UserDetailsView(RetrieveUpdateAPIView):
|
class UserDetailsView(RetrieveUpdateAPIView):
|
||||||
|
|
||||||
"""
|
"""
|
||||||
Returns User's details in JSON format.
|
Returns User's details in JSON format.
|
||||||
|
|
||||||
|
@ -111,13 +111,12 @@ class PasswordResetView(GenericAPIView):
|
||||||
serializer.save()
|
serializer.save()
|
||||||
# Return the success message with OK HTTP status
|
# Return the success message with OK HTTP status
|
||||||
return Response(
|
return Response(
|
||||||
{"success": "Password reset e-mail has been sent."},
|
{"success": _("Password reset e-mail has been sent.")},
|
||||||
status=status.HTTP_200_OK
|
status=status.HTTP_200_OK
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class PasswordResetConfirmView(GenericAPIView):
|
class PasswordResetConfirmView(GenericAPIView):
|
||||||
|
|
||||||
"""
|
"""
|
||||||
Password reset e-mail link is confirmed, therefore this resets the user's password.
|
Password reset e-mail link is confirmed, therefore this resets the user's password.
|
||||||
|
|
||||||
|
@ -133,11 +132,10 @@ class PasswordResetConfirmView(GenericAPIView):
|
||||||
serializer = self.get_serializer(data=request.data)
|
serializer = self.get_serializer(data=request.data)
|
||||||
serializer.is_valid(raise_exception=True)
|
serializer.is_valid(raise_exception=True)
|
||||||
serializer.save()
|
serializer.save()
|
||||||
return Response({"success": "Password has been reset with the new password."})
|
return Response({"success": _("Password has been reset with the new password.")})
|
||||||
|
|
||||||
|
|
||||||
class PasswordChangeView(GenericAPIView):
|
class PasswordChangeView(GenericAPIView):
|
||||||
|
|
||||||
"""
|
"""
|
||||||
Calls Django Auth SetPasswordForm save method.
|
Calls Django Auth SetPasswordForm save method.
|
||||||
|
|
||||||
|
@ -152,4 +150,4 @@ class PasswordChangeView(GenericAPIView):
|
||||||
serializer = self.get_serializer(data=request.data)
|
serializer = self.get_serializer(data=request.data)
|
||||||
serializer.is_valid(raise_exception=True)
|
serializer.is_valid(raise_exception=True)
|
||||||
serializer.save()
|
serializer.save()
|
||||||
return Response({"success": "New password has been saved."})
|
return Response({"success": _("New password has been saved.")})
|
||||||
|
|
Loading…
Reference in New Issue
Block a user