Merge pull request #68 from migonzalvar/add_translation

Add translation utils

Author: jpadilla

rest_framework_jwt/authentication.py

@@ -1,6 +1,7 @@
 import jwt
 
 from django.utils.encoding import smart_text
+from django.utils.translation import ugettext as _
 from rest_framework import exceptions
 from rest_framework_jwt.settings import api_settings
 from rest_framework.authentication import (BaseAuthentication,
@@ -42,20 +43,20 @@ def authenticate(self, request):
             return None
 
         if len(auth) == 1:
-            msg = 'Invalid Authorization header. No credentials provided.'
+            msg = _('Invalid Authorization header. No credentials provided.')
             raise exceptions.AuthenticationFailed(msg)
         elif len(auth) > 2:
-            msg = ('Invalid Authorization header. Credentials string '
-                   'should not contain spaces.')
+            msg = _('Invalid Authorization header. Credentials string '
+                    'should not contain spaces.')
             raise exceptions.AuthenticationFailed(msg)
 
         try:
             payload = jwt_decode_handler(auth[1])
         except jwt.ExpiredSignature:
-            msg = 'Signature has expired.'
+            msg = _('Signature has expired.')
             raise exceptions.AuthenticationFailed(msg)
         except jwt.DecodeError:
-            msg = 'Error decoding signature.'
+            msg = _('Error decoding signature.')
             raise exceptions.AuthenticationFailed(msg)
 
         user = self.authenticate_credentials(payload)
@@ -72,10 +73,10 @@ def authenticate_credentials(self, payload):
             if user_id is not None:
                 user = User.objects.get(pk=user_id, is_active=True)
             else:
-                msg = 'Invalid payload'
+                msg = _('Invalid payload.')
                 raise exceptions.AuthenticationFailed(msg)
         except User.DoesNotExist:
-            msg = 'Invalid signature'
+            msg = _('Invalid signature.')
             raise exceptions.AuthenticationFailed(msg)
 
         return user

rest_framework_jwt/locale/en_US/LC_MESSAGES/django.po

@@ -0,0 +1,68 @@
+# 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: 2015-01-16 18:06+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[email protected]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: authentication.py:46
+msgid "Invalid Authorization header. No credentials provided."
+msgstr ""
+
+#: authentication.py:49
+msgid ""
+"Invalid Authorization header. Credentials string should not contain spaces."
+msgstr ""
+
+#: authentication.py:56 serializers.py:92
+msgid "Signature has expired."
+msgstr ""
+
+#: authentication.py:59 serializers.py:95
+msgid "Error decoding signature."
+msgstr ""
+
+#: authentication.py:76 serializers.py:105
+msgid "Invalid payload."
+msgstr ""
+
+#: authentication.py:79
+msgid "Invalid signature."
+msgstr ""
+
+#: serializers.py:53
+msgid "User account is disabled."
+msgstr ""
+
+#: serializers.py:69
+msgid "Unable to login with provided credentials."
+msgstr ""
+
+#: serializers.py:72
+#, python-brace-format
+msgid "Must include \"{username_field}\" and \"password\"."
+msgstr ""
+
+#: serializers.py:108
+msgid "User doesn't exist."
+msgstr ""
+
+#: serializers.py:126
+msgid "Refresh has expired."
+msgstr ""
+
+#: serializers.py:129
+msgid "orig_iat field is required."
+msgstr ""

rest_framework_jwt/serializers.py

@@ -3,6 +3,7 @@
 import jwt
 
 from django.contrib.auth import authenticate
+from django.utils.translation import ugettext as _
 from rest_framework import serializers
 from .compat import Serializer
 
@@ -49,7 +50,7 @@ def validate(self, attrs):
 
             if user:
                 if not user.is_active:
-                    msg = 'User account is disabled.'
+                    msg = _('User account is disabled.')
                     raise serializers.ValidationError(msg)
 
                 payload = jwt_payload_handler(user)
@@ -65,11 +66,11 @@ def validate(self, attrs):
                     'token': jwt_encode_handler(payload)
                 }
             else:
-                msg = 'Unable to login with provided credentials.'
+                msg = _('Unable to login with provided credentials.')
                 raise serializers.ValidationError(msg)
         else:
-            msg = 'Must include "{0}" and "password"'.format(
-                self.username_field)
+            msg = _('Must include "{username_field}" and "password".')
+            msg = msg.format(username_field=self.username_field)
             raise serializers.ValidationError(msg)
 
 
@@ -88,10 +89,10 @@ def validate(self, attrs):
         try:
             payload = jwt_decode_handler(token)
         except jwt.ExpiredSignature:
-            msg = 'Signature has expired.'
+            msg = _('Signature has expired.')
             raise serializers.ValidationError(msg)
         except jwt.DecodeError:
-            msg = 'Error decoding signature.'
+            msg = _('Error decoding signature.')
             raise serializers.ValidationError(msg)
 
         # Make sure user exists (may want to refactor this)
@@ -101,10 +102,10 @@ def validate(self, attrs):
             if user_id is not None:
                 user = User.objects.get(pk=user_id, is_active=True)
             else:
-                msg = 'Invalid payload'
+                msg = _('Invalid payload.')
                 raise serializers.ValidationError(msg)
         except User.DoesNotExist:
-            msg = "User doesn't exist"
+            msg = _("User doesn't exist.")
             raise serializers.ValidationError(msg)
 
         # Get and check 'orig_iat'
@@ -122,10 +123,10 @@ def validate(self, attrs):
             now_timestamp = timegm(datetime.utcnow().utctimetuple())
 
             if now_timestamp > expiration_timestamp:
-                msg = 'Refresh has expired'
+                msg = _('Refresh has expired.')
                 raise serializers.ValidationError(msg)
         else:
-            msg = 'orig_iat field is required'
+            msg = _('orig_iat field is required.')
             raise serializers.ValidationError(msg)
 
         new_payload = jwt_payload_handler(user)

tests/test_authentication.py

@@ -220,7 +220,7 @@ def test_post_form_passing_jwt_invalid_payload(self):
         response = self.csrf_client.post(
             '/jwt/', {'example': 'example'}, HTTP_AUTHORIZATION=auth)
 
-        msg = 'Invalid payload'
+        msg = 'Invalid payload.'
 
         self.assertEqual(response.data['detail'], msg)
         self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED)

tests/test_views.py

@@ -265,7 +265,7 @@ def test_refresh_jwt_after_refresh_expiration(self):
                                format='json')
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
         self.assertEqual(response.data['non_field_errors'][0],
-                         'Refresh has expired')
+                         'Refresh has expired.')
 
     def tearDown(self):
         # Restore original settings