Skip to content

Commit 951f3ce

Browse files
committed
Compile translations and small text fixes
1 parent aa677d5 commit 951f3ce

File tree

6 files changed

+47
-44
lines changed

6 files changed

+47
-44
lines changed

docs/api_endpoints.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Basic
1010
- email
1111
- password
1212

13-
Returns Token Object's key
13+
Returns Token key
1414

1515
- /rest-auth/logout/ (POST)
1616

-29 Bytes
Binary file not shown.

rest_auth/locale/de/LC_MESSAGES/django.po

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2016-02-02 14:11+0100\n"
11+
"POT-Creation-Date: 2016-12-22 11:37-0800\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -18,19 +18,19 @@ msgstr ""
1818
"Content-Transfer-Encoding: 8bit\n"
1919
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
2020

21-
#: registration/serializers.py:54
21+
#: registration/serializers.py:53
2222
msgid "View is not defined, pass it as a context variable"
2323
msgstr "\"View\" ist nicht definiert, übergib es als Contextvariable"
2424

25-
#: registration/serializers.py:59
25+
#: registration/serializers.py:58
2626
msgid "Define adapter_class in view"
2727
msgstr "Definier \"adapter_class\" in view"
2828

29-
#: registration/serializers.py:78
29+
#: registration/serializers.py:77
3030
msgid "Define callback_url in view"
3131
msgstr "Definier \"callback_url\" in view"
3232

33-
#: registration/serializers.py:82
33+
#: registration/serializers.py:81
3434
msgid "Define client_class in view"
3535
msgstr "Definier \"client_class\" in view"
3636

@@ -50,50 +50,49 @@ msgstr "Ein User mit dieser E-Mail Adresse ist schon registriert."
5050
msgid "The two password fields didn't match."
5151
msgstr "Die beiden Passwörter sind nicht identisch."
5252

53-
#: registration/views.py:64
53+
#: registration/views.py:82
5454
msgid "ok"
5555
msgstr "Ok"
5656

57-
#: serializers.py:29
57+
#: serializers.py:30
5858
msgid "Must include \"email\" and \"password\"."
5959
msgstr "Muss \"email\" und \"password\" enthalten."
6060

61-
#: serializers.py:40
61+
#: serializers.py:41
6262
msgid "Must include \"username\" and \"password\"."
6363
msgstr "Muss \"username\" und \"password\" enthalten."
6464

65-
#: serializers.py:53
65+
#: serializers.py:54
6666
msgid "Must include either \"username\" or \"email\" and \"password\"."
6767
msgstr "Muss entweder \"username\" oder \"email\" und password \"password\""
6868

69-
#: serializers.py:94
69+
#: serializers.py:95
7070
msgid "User account is disabled."
7171
msgstr "Der Useraccount ist deaktiviert."
7272

73-
#: serializers.py:97
73+
#: serializers.py:98
7474
msgid "Unable to log in with provided credentials."
7575
msgstr "Kann nicht mit den angegeben Zugangsdaten anmelden."
7676

77-
#: serializers.py:106
77+
#: serializers.py:107
7878
msgid "E-mail is not verified."
7979
msgstr "E-Mail Adresse ist nicht verifiziert."
8080

81-
#: serializers.py:152
82-
msgid "Error"
83-
msgstr "Fehler"
84-
85-
#: views.py:71
81+
#: views.py:114
8682
msgid "Successfully logged out."
8783
msgstr "Erfolgreich ausgeloggt."
8884

89-
#: views.py:111
85+
#: views.py:162
9086
msgid "Password reset e-mail has been sent."
9187
msgstr "Die E-Mail zum Zurücksetzen des Passwortes wurde verschickt."
9288

93-
#: views.py:132
89+
#: views.py:184
9490
msgid "Password has been reset with the new password."
9591
msgstr "Das Passwort wurde mit dem neuen Passwort ersetzt."
9692

97-
#: views.py:150
93+
#: views.py:202
9894
msgid "New password has been saved."
9995
msgstr "Das neue Passwort wurde gespeichert."
96+
97+
#~ msgid "Error"
98+
#~ msgstr "Fehler"
117 Bytes
Binary file not shown.

rest_auth/locale/ru/LC_MESSAGES/django.po

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2016-11-27 09:24+0300\n"
10+
"POT-Creation-Date: 2016-12-22 11:37-0800\n"
1111
"PO-Revision-Date: 2016-08-01 07:48+0300\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -20,78 +20,82 @@ msgstr ""
2020
"%100>=11 && n%100<=14)? 2 : 3);\n"
2121
"X-Generator: Poedit 1.8.5\n"
2222

23-
#: registration/serializers.py:52
23+
#: registration/serializers.py:53
2424
msgid "View is not defined, pass it as a context variable"
2525
msgstr "View неизвестен, передайте его как переменную контекста"
2626

27-
#: registration/serializers.py:57
27+
#: registration/serializers.py:58
2828
msgid "Define adapter_class in view"
2929
msgstr "Установите adapter_class в view"
3030

31-
#: registration/serializers.py:76
31+
#: registration/serializers.py:77
3232
msgid "Define callback_url in view"
3333
msgstr "Установите callback_url в view"
3434

35-
#: registration/serializers.py:80
35+
#: registration/serializers.py:81
3636
msgid "Define client_class in view"
3737
msgstr "Установите client_class в view"
3838

39-
#: registration/serializers.py:100
39+
#: registration/serializers.py:102
4040
msgid "Incorrect input. access_token or code is required."
41-
msgstr "Некорректный ввод. Необходим access_token или code."
41+
msgstr "Некорректный ввод. Необходим access_token или code."
4242

43-
#: registration/serializers.py:109
43+
#: registration/serializers.py:111
4444
msgid "Incorrect value"
4545
msgstr "Некорректное значение"
4646

47-
#: registration/serializers.py:138
47+
#: registration/serializers.py:140
4848
msgid "A user is already registered with this e-mail address."
49-
msgstr "Пользователь с таким e-mail уже зарегистрирован."
49+
msgstr "Пользователь с таким e-mail адресом уже зарегистрирован."
5050

51-
#: registration/serializers.py:146
51+
#: registration/serializers.py:148
5252
msgid "The two password fields didn't match."
5353
msgstr "Пароли не совпадают."
5454

55-
#: registration/views.py:78
55+
#: registration/views.py:35
56+
msgid "Verification e-mail sent."
57+
msgstr "Письмо с подтверждением выслано."
58+
59+
#: registration/views.py:82
5660
msgid "ok"
5761
msgstr "ок"
5862

59-
#: serializers.py:29
63+
#: serializers.py:30
6064
msgid "Must include \"email\" and \"password\"."
6165
msgstr "Должно включать \"email\" и \"password\"."
6266

63-
#: serializers.py:40
67+
#: serializers.py:41
6468
msgid "Must include \"username\" and \"password\"."
6569
msgstr "Должно включать \"username\" и \"password\"."
6670

67-
#: serializers.py:53
71+
#: serializers.py:54
6872
msgid "Must include either \"username\" or \"email\" and \"password\"."
6973
msgstr "Должно включать либо \"username\" либо \"email\" и \"password\"."
7074

71-
#: serializers.py:94
75+
#: serializers.py:95
7276
msgid "User account is disabled."
7377
msgstr "Пользовательский аккаунт отключён."
7478

75-
#: serializers.py:97
79+
#: serializers.py:98
7680
msgid "Unable to log in with provided credentials."
7781
msgstr "Невозможно войти в систему с указанными учётными данными."
7882

79-
#: serializers.py:106
83+
#: serializers.py:107
8084
msgid "E-mail is not verified."
8185
msgstr "E-mail не подтверждён."
8286

83-
#: views.py:118
87+
#: views.py:114
8488
msgid "Successfully logged out."
8589
msgstr "Успешно вышли."
8690

87-
#: views.py:160
91+
#: views.py:162
8892
msgid "Password reset e-mail has been sent."
8993
msgstr "Письмо с инструкциями по восстановлению пароля выслано."
9094

91-
#: views.py:181
95+
#: views.py:184
9296
msgid "Password has been reset with the new password."
9397
msgstr "Пароль изменён на новый."
9498

95-
#: views.py:199
99+
#: views.py:202
96100
msgid "New password has been saved."
97101
msgstr "Новый пароль сохранён."

rest_auth/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def jwt_encode(user):
2020
try:
2121
from rest_framework_jwt.settings import api_settings
2222
except ImportError:
23-
raise ImportError('rest_framework_jwt needs to be installed')
23+
raise ImportError("djangorestframework_jwt needs to be installed")
2424

2525
jwt_payload_handler = api_settings.JWT_PAYLOAD_HANDLER
2626
jwt_encode_handler = api_settings.JWT_ENCODE_HANDLER

0 commit comments

Comments
 (0)