Merge pull request #295 from rriehle/master

jpadilla · web-flow · commit e3524ad09aab · 2016-12-31T10:11:26.000-05:00
Replace login with log in when used as a verb
diff --git a/rest_framework_jwt/locale/en_US/LC_MESSAGES/django.po b/rest_framework_jwt/locale/en_US/LC_MESSAGES/django.po
@@ -47,7 +47,7 @@ msgid "User account is disabled."
 msgstr ""
 
 #: serializers.py:76
-msgid "Unable to login with provided credentials."
+msgid "Unable to log in with provided credentials."
 msgstr ""
 
 #: serializers.py:79
diff --git a/rest_framework_jwt/serializers.py b/rest_framework_jwt/serializers.py
@@ -61,7 +61,7 @@ def validate(self, attrs):
                     'user': user
                 }
             else:
-                msg = _('Unable to login with provided credentials.')
+                msg = _('Unable to log in with provided credentials.')
                 raise serializers.ValidationError(msg)
         else:
             msg = _('Must include "{username_field}" and "password".')
diff --git a/tests/test_serializers.py b/tests/test_serializers.py
@@ -64,7 +64,7 @@ def test_invalid_credentials(self):
         is_valid = serializer.is_valid()
 
         expected_error = {
-            'non_field_errors': ['Unable to login with provided credentials.']
+            'non_field_errors': ['Unable to log in with provided credentials.']
         }
 
         self.assertFalse(is_valid)

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ def validate(self, attrs):`
`61`	`61`	`'user': user`
`62`	`62`	`}`
`63`	`63`	`else:`
`64`		`- msg = _('Unable to login with provided credentials.')`
	`64`	`+ msg = _('Unable to log in with provided credentials.')`
`65`	`65`	`raise serializers.ValidationError(msg)`
`66`	`66`	`else:`
`67`	`67`	`msg = _('Must include "{username_field}" and "password".')`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ def test_invalid_credentials(self):`
`64`	`64`	`is_valid = serializer.is_valid()`
`65`	`65`
`66`	`66`	`expected_error = {`
`67`		`- 'non_field_errors': ['Unable to login with provided credentials.']`
	`67`	`+ 'non_field_errors': ['Unable to log in with provided credentials.']`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`self.assertFalse(is_valid)`