Compile translations and small text fixes

This commit is contained in:
Maxim Kukhtenkov 2016-12-22 11:57:23 -08:00
parent aa677d51c0
commit 951f3ce284
6 changed files with 47 additions and 44 deletions

View File

@ -10,7 +10,7 @@ Basic
- email - email
- password - password
Returns Token Object's key Returns Token key
- /rest-auth/logout/ (POST) - /rest-auth/logout/ (POST)

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-02-02 14:11+0100\n" "POT-Creation-Date: 2016-12-22 11:37-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -18,19 +18,19 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: registration/serializers.py:54 #: registration/serializers.py:53
msgid "View is not defined, pass it as a context variable" msgid "View is not defined, pass it as a context variable"
msgstr "\"View\" ist nicht definiert, übergib es als Contextvariable" msgstr "\"View\" ist nicht definiert, übergib es als Contextvariable"
#: registration/serializers.py:59 #: registration/serializers.py:58
msgid "Define adapter_class in view" msgid "Define adapter_class in view"
msgstr "Definier \"adapter_class\" in view" msgstr "Definier \"adapter_class\" in view"
#: registration/serializers.py:78 #: registration/serializers.py:77
msgid "Define callback_url in view" msgid "Define callback_url in view"
msgstr "Definier \"callback_url\" in view" msgstr "Definier \"callback_url\" in view"
#: registration/serializers.py:82 #: registration/serializers.py:81
msgid "Define client_class in view" msgid "Define client_class in view"
msgstr "Definier \"client_class\" in view" msgstr "Definier \"client_class\" in view"
@ -50,50 +50,49 @@ msgstr "Ein User mit dieser E-Mail Adresse ist schon registriert."
msgid "The two password fields didn't match." msgid "The two password fields didn't match."
msgstr "Die beiden Passwörter sind nicht identisch." msgstr "Die beiden Passwörter sind nicht identisch."
#: registration/views.py:64 #: registration/views.py:82
msgid "ok" msgid "ok"
msgstr "Ok" msgstr "Ok"
#: serializers.py:29 #: serializers.py:30
msgid "Must include \"email\" and \"password\"." msgid "Must include \"email\" and \"password\"."
msgstr "Muss \"email\" und \"password\" enthalten." msgstr "Muss \"email\" und \"password\" enthalten."
#: serializers.py:40 #: serializers.py:41
msgid "Must include \"username\" and \"password\"." msgid "Must include \"username\" and \"password\"."
msgstr "Muss \"username\" und \"password\" enthalten." msgstr "Muss \"username\" und \"password\" enthalten."
#: serializers.py:53 #: serializers.py:54
msgid "Must include either \"username\" or \"email\" and \"password\"." msgid "Must include either \"username\" or \"email\" and \"password\"."
msgstr "Muss entweder \"username\" oder \"email\" und password \"password\"" msgstr "Muss entweder \"username\" oder \"email\" und password \"password\""
#: serializers.py:94 #: serializers.py:95
msgid "User account is disabled." msgid "User account is disabled."
msgstr "Der Useraccount ist deaktiviert." msgstr "Der Useraccount ist deaktiviert."
#: serializers.py:97 #: serializers.py:98
msgid "Unable to log in with provided credentials." msgid "Unable to log in with provided credentials."
msgstr "Kann nicht mit den angegeben Zugangsdaten anmelden." msgstr "Kann nicht mit den angegeben Zugangsdaten anmelden."
#: serializers.py:106 #: serializers.py:107
msgid "E-mail is not verified." msgid "E-mail is not verified."
msgstr "E-Mail Adresse ist nicht verifiziert." msgstr "E-Mail Adresse ist nicht verifiziert."
#: serializers.py:152 #: views.py:114
msgid "Error"
msgstr "Fehler"
#: views.py:71
msgid "Successfully logged out." msgid "Successfully logged out."
msgstr "Erfolgreich ausgeloggt." msgstr "Erfolgreich ausgeloggt."
#: views.py:111 #: views.py:162
msgid "Password reset e-mail has been sent." msgid "Password reset e-mail has been sent."
msgstr "Die E-Mail zum Zurücksetzen des Passwortes wurde verschickt." msgstr "Die E-Mail zum Zurücksetzen des Passwortes wurde verschickt."
#: views.py:132 #: views.py:184
msgid "Password has been reset with the new password." msgid "Password has been reset with the new password."
msgstr "Das Passwort wurde mit dem neuen Passwort ersetzt." msgstr "Das Passwort wurde mit dem neuen Passwort ersetzt."
#: views.py:150 #: views.py:202
msgid "New password has been saved." msgid "New password has been saved."
msgstr "Das neue Passwort wurde gespeichert." msgstr "Das neue Passwort wurde gespeichert."
#~ msgid "Error"
#~ msgstr "Fehler"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-27 09:24+0300\n" "POT-Creation-Date: 2016-12-22 11:37-0800\n"
"PO-Revision-Date: 2016-08-01 07:48+0300\n" "PO-Revision-Date: 2016-08-01 07:48+0300\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
@ -20,78 +20,82 @@ msgstr ""
"%100>=11 && n%100<=14)? 2 : 3);\n" "%100>=11 && n%100<=14)? 2 : 3);\n"
"X-Generator: Poedit 1.8.5\n" "X-Generator: Poedit 1.8.5\n"
#: registration/serializers.py:52 #: registration/serializers.py:53
msgid "View is not defined, pass it as a context variable" msgid "View is not defined, pass it as a context variable"
msgstr "View неизвестен, передайте его как переменную контекста" msgstr "View неизвестен, передайте его как переменную контекста"
#: registration/serializers.py:57 #: registration/serializers.py:58
msgid "Define adapter_class in view" msgid "Define adapter_class in view"
msgstr "Установите adapter_class в view" msgstr "Установите adapter_class в view"
#: registration/serializers.py:76 #: registration/serializers.py:77
msgid "Define callback_url in view" msgid "Define callback_url in view"
msgstr "Установите callback_url в view" msgstr "Установите callback_url в view"
#: registration/serializers.py:80 #: registration/serializers.py:81
msgid "Define client_class in view" msgid "Define client_class in view"
msgstr "Установите client_class в view" msgstr "Установите client_class в view"
#: registration/serializers.py:100 #: registration/serializers.py:102
msgid "Incorrect input. access_token or code is required." msgid "Incorrect input. access_token or code is required."
msgstr "Некорректный ввод. Необходим access_token или code." msgstr "Некорректный ввод. Необходим access_token или code."
#: registration/serializers.py:109 #: registration/serializers.py:111
msgid "Incorrect value" msgid "Incorrect value"
msgstr "Некорректное значение" msgstr "Некорректное значение"
#: registration/serializers.py:138 #: registration/serializers.py:140
msgid "A user is already registered with this e-mail address." msgid "A user is already registered with this e-mail address."
msgstr "Пользователь с таким e-mail уже зарегистрирован." msgstr "Пользователь с таким e-mail адресом уже зарегистрирован."
#: registration/serializers.py:146 #: registration/serializers.py:148
msgid "The two password fields didn't match." msgid "The two password fields didn't match."
msgstr "Пароли не совпадают." msgstr "Пароли не совпадают."
#: registration/views.py:78 #: registration/views.py:35
msgid "Verification e-mail sent."
msgstr "Письмо с подтверждением выслано."
#: registration/views.py:82
msgid "ok" msgid "ok"
msgstr "ок" msgstr "ок"
#: serializers.py:29 #: serializers.py:30
msgid "Must include \"email\" and \"password\"." msgid "Must include \"email\" and \"password\"."
msgstr "Должно включать \"email\" и \"password\"." msgstr "Должно включать \"email\" и \"password\"."
#: serializers.py:40 #: serializers.py:41
msgid "Must include \"username\" and \"password\"." msgid "Must include \"username\" and \"password\"."
msgstr "Должно включать \"username\" и \"password\"." msgstr "Должно включать \"username\" и \"password\"."
#: serializers.py:53 #: serializers.py:54
msgid "Must include either \"username\" or \"email\" and \"password\"." msgid "Must include either \"username\" or \"email\" and \"password\"."
msgstr "Должно включать либо \"username\" либо \"email\" и \"password\"." msgstr "Должно включать либо \"username\" либо \"email\" и \"password\"."
#: serializers.py:94 #: serializers.py:95
msgid "User account is disabled." msgid "User account is disabled."
msgstr "Пользовательский аккаунт отключён." msgstr "Пользовательский аккаунт отключён."
#: serializers.py:97 #: serializers.py:98
msgid "Unable to log in with provided credentials." msgid "Unable to log in with provided credentials."
msgstr "Невозможно войти в систему с указанными учётными данными." msgstr "Невозможно войти в систему с указанными учётными данными."
#: serializers.py:106 #: serializers.py:107
msgid "E-mail is not verified." msgid "E-mail is not verified."
msgstr "E-mail не подтверждён." msgstr "E-mail не подтверждён."
#: views.py:118 #: views.py:114
msgid "Successfully logged out." msgid "Successfully logged out."
msgstr "Успешно вышли." msgstr "Успешно вышли."
#: views.py:160 #: views.py:162
msgid "Password reset e-mail has been sent." msgid "Password reset e-mail has been sent."
msgstr "Письмо с инструкциями по восстановлению пароля выслано." msgstr "Письмо с инструкциями по восстановлению пароля выслано."
#: views.py:181 #: views.py:184
msgid "Password has been reset with the new password." msgid "Password has been reset with the new password."
msgstr "Пароль изменён на новый." msgstr "Пароль изменён на новый."
#: views.py:199 #: views.py:202
msgid "New password has been saved." msgid "New password has been saved."
msgstr "Новый пароль сохранён." msgstr "Новый пароль сохранён."

View File

@ -20,7 +20,7 @@ def jwt_encode(user):
try: try:
from rest_framework_jwt.settings import api_settings from rest_framework_jwt.settings import api_settings
except ImportError: except ImportError:
raise ImportError('rest_framework_jwt needs to be installed') raise ImportError("djangorestframework_jwt needs to be installed")
jwt_payload_handler = api_settings.JWT_PAYLOAD_HANDLER jwt_payload_handler = api_settings.JWT_PAYLOAD_HANDLER
jwt_encode_handler = api_settings.JWT_ENCODE_HANDLER jwt_encode_handler = api_settings.JWT_ENCODE_HANDLER