From 951f3ce28441835b6408104465c01654add1c74a Mon Sep 17 00:00:00 2001 From: Maxim Kukhtenkov Date: Thu, 22 Dec 2016 11:57:23 -0800 Subject: [PATCH] Compile translations and small text fixes --- docs/api_endpoints.rst | 2 +- rest_auth/locale/de/LC_MESSAGES/django.mo | Bin 2300 -> 2271 bytes rest_auth/locale/de/LC_MESSAGES/django.po | 39 +++++++++--------- rest_auth/locale/ru/LC_MESSAGES/django.mo | Bin 2697 -> 2814 bytes rest_auth/locale/ru/LC_MESSAGES/django.po | 48 ++++++++++++---------- rest_auth/utils.py | 2 +- 6 files changed, 47 insertions(+), 44 deletions(-) diff --git a/docs/api_endpoints.rst b/docs/api_endpoints.rst index 788f16b..46d2a05 100644 --- a/docs/api_endpoints.rst +++ b/docs/api_endpoints.rst @@ -10,7 +10,7 @@ Basic - email - password - Returns Token Object's key + Returns Token key - /rest-auth/logout/ (POST) diff --git a/rest_auth/locale/de/LC_MESSAGES/django.mo b/rest_auth/locale/de/LC_MESSAGES/django.mo index 07861ff6d19caf35d4f2e04407f02f6af7402bd5..a021c21f0c0a8ab162fb62aad7e67604cd845dcd 100644 GIT binary patch delta 503 zcmXxhy-LGS6u|M5n5OZonkuN&j|{CMS~0iyjfjgNF5+Bwp^Frp^8g*C;ON*<2#A9Z zpo5?;E>_VO@C6+FpY(d*-e3hEaS4BL3QJyZgEgd< zoMD4QHBbw`H*)8^JT#nSrn~`-ctV9P7ETA$S^r(=SERaN}a5r{vs|zLh?WQ n?SSTGh#a`=I-RuT9=e6tRE>$^c)PYyUENH-y(cHV^$*-X=5{L@ delta 531 zcmXxhze~eF6u|M9nAG3ZRK-da3$_-iN)mrSEsjFbK^)v&3IQuZaJD!If;fq|xVSkv z7#wvHC+nYJb#N31CqcyTUE?F~eJ+>q?s925KTiE6Wt|BzM2?aV549c!)k8V;|mQ4xh1rUs%FSo9\n" "Language-Team: LANGUAGE \n" @@ -18,19 +18,19 @@ msgstr "" "Content-Transfer-Encoding: 8bit\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" msgstr "\"View\" ist nicht definiert, übergib es als Contextvariable" -#: registration/serializers.py:59 +#: registration/serializers.py:58 msgid "Define adapter_class in view" msgstr "Definier \"adapter_class\" in view" -#: registration/serializers.py:78 +#: registration/serializers.py:77 msgid "Define callback_url in view" msgstr "Definier \"callback_url\" in view" -#: registration/serializers.py:82 +#: registration/serializers.py:81 msgid "Define 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." msgstr "Die beiden Passwörter sind nicht identisch." -#: registration/views.py:64 +#: registration/views.py:82 msgid "ok" msgstr "Ok" -#: serializers.py:29 +#: serializers.py:30 msgid "Must include \"email\" and \"password\"." msgstr "Muss \"email\" und \"password\" enthalten." -#: serializers.py:40 +#: serializers.py:41 msgid "Must include \"username\" and \"password\"." msgstr "Muss \"username\" und \"password\" enthalten." -#: serializers.py:53 +#: serializers.py:54 msgid "Must include either \"username\" or \"email\" and \"password\"." msgstr "Muss entweder \"username\" oder \"email\" und password \"password\"" -#: serializers.py:94 +#: serializers.py:95 msgid "User account is disabled." msgstr "Der Useraccount ist deaktiviert." -#: serializers.py:97 +#: serializers.py:98 msgid "Unable to log in with provided credentials." msgstr "Kann nicht mit den angegeben Zugangsdaten anmelden." -#: serializers.py:106 +#: serializers.py:107 msgid "E-mail is not verified." msgstr "E-Mail Adresse ist nicht verifiziert." -#: serializers.py:152 -msgid "Error" -msgstr "Fehler" - -#: views.py:71 +#: views.py:114 msgid "Successfully logged out." msgstr "Erfolgreich ausgeloggt." -#: views.py:111 +#: views.py:162 msgid "Password reset e-mail has been sent." 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." msgstr "Das Passwort wurde mit dem neuen Passwort ersetzt." -#: views.py:150 +#: views.py:202 msgid "New password has been saved." msgstr "Das neue Passwort wurde gespeichert." + +#~ msgid "Error" +#~ msgstr "Fehler" diff --git a/rest_auth/locale/ru/LC_MESSAGES/django.mo b/rest_auth/locale/ru/LC_MESSAGES/django.mo index cdd5b2d642d8bbcbcb602428dfd77ef40f32ff0a..2ccbb0f1f2817c6c7e6e5cc68b15010048b4cd71 100644 GIT binary patch delta 556 zcmXZWJ4jn$6u|Lw)8G>oAJ_OSS4=5tQ)+xa76(_wO$QN?DA6Q>brns)LD~-WlF7kY zTqKDSFo~iLZk{_hbP>B(cOBIKRS%r+_dO2hJ6qgHOhybA;ud@H zAG+^#9+5`ud3OSRoTC`TO{~BS`tcG!;~fs5`Qfe4IDQpbmk1lTa0lz~6hGl#?7(NN z#}4nCqv(D#gY=Ybyk@ur&T(EU5NXFNY{SQQ{e>c}oX2n+SFnx$<%~@?7yq#jTZ%*` za0=Z9`}hT~aREKWA`Q5R?x35vi2FE#wIw3MIEn5+31l{TK<0c6W_pb(J8D!{Rv^qNnyZQp( z`cpY?(kRyhO*FZ*Weh+Ot!C~y+9Nu9TKhVK}Q1H$ME{W8oOyOTV!*T3l2A?sHzc_&@Gx)(O z@|GOoJ401*hu#f~=11 && n%100<=14)? 2 : 3);\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" msgstr "View неизвестен, передайте его как переменную контекста" -#: registration/serializers.py:57 +#: registration/serializers.py:58 msgid "Define adapter_class in view" msgstr "Установите adapter_class в view" -#: registration/serializers.py:76 +#: registration/serializers.py:77 msgid "Define callback_url in view" msgstr "Установите callback_url в view" -#: registration/serializers.py:80 +#: registration/serializers.py:81 msgid "Define client_class in view" msgstr "Установите client_class в view" -#: registration/serializers.py:100 +#: registration/serializers.py:102 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" msgstr "Некорректное значение" -#: registration/serializers.py:138 +#: registration/serializers.py:140 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." msgstr "Пароли не совпадают." -#: registration/views.py:78 +#: registration/views.py:35 +msgid "Verification e-mail sent." +msgstr "Письмо с подтверждением выслано." + +#: registration/views.py:82 msgid "ok" msgstr "ок" -#: serializers.py:29 +#: serializers.py:30 msgid "Must include \"email\" and \"password\"." msgstr "Должно включать \"email\" и \"password\"." -#: serializers.py:40 +#: serializers.py:41 msgid "Must include \"username\" and \"password\"." msgstr "Должно включать \"username\" и \"password\"." -#: serializers.py:53 +#: serializers.py:54 msgid "Must include either \"username\" or \"email\" and \"password\"." msgstr "Должно включать либо \"username\" либо \"email\" и \"password\"." -#: serializers.py:94 +#: serializers.py:95 msgid "User account is disabled." msgstr "Пользовательский аккаунт отключён." -#: serializers.py:97 +#: serializers.py:98 msgid "Unable to log in with provided credentials." msgstr "Невозможно войти в систему с указанными учётными данными." -#: serializers.py:106 +#: serializers.py:107 msgid "E-mail is not verified." msgstr "E-mail не подтверждён." -#: views.py:118 +#: views.py:114 msgid "Successfully logged out." msgstr "Успешно вышли." -#: views.py:160 +#: views.py:162 msgid "Password reset e-mail has been sent." msgstr "Письмо с инструкциями по восстановлению пароля выслано." -#: views.py:181 +#: views.py:184 msgid "Password has been reset with the new password." msgstr "Пароль изменён на новый." -#: views.py:199 +#: views.py:202 msgid "New password has been saved." msgstr "Новый пароль сохранён." diff --git a/rest_auth/utils.py b/rest_auth/utils.py index 99d80b8..800f184 100644 --- a/rest_auth/utils.py +++ b/rest_auth/utils.py @@ -20,7 +20,7 @@ def jwt_encode(user): try: from rest_framework_jwt.settings import api_settings 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_encode_handler = api_settings.JWT_ENCODE_HANDLER