From c15dab903d3759578449279cc034d766d362d41f Mon Sep 17 00:00:00 2001
From: Charlie Denton
Date: Thu, 1 May 2014 10:18:16 +0100
Subject: Mark strings in AuthTokenSerializer as translatable

---
 rest_framework/authtoken/serializers.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'rest_framework/authtoken/serializers.py')

diff --git a/rest_framework/authtoken/serializers.py b/rest_framework/authtoken/serializers.py
index 60a3740e..995f2e64 100644
--- a/rest_framework/authtoken/serializers.py
+++ b/rest_framework/authtoken/serializers.py
@@ -1,4 +1,6 @@
 from django.contrib.auth import authenticate
+from django.utils.translation import ugettext_lazy as _
+
 from rest_framework import serializers
 
 
@@ -15,10 +17,13 @@ class AuthTokenSerializer(serializers.Serializer):
 
             if user:
                 if not user.is_active:
-                    raise serializers.ValidationError('User account is disabled.')
+                    msg = _('User account is disabled.')
+                    raise serializers.ValidationError()
                 attrs['user'] = user
                 return attrs
             else:
-                raise serializers.ValidationError('Unable to login with provided credentials.')
+                msg = _('Unable to login with provided credentials.')
+                raise serializers.ValidationError(msg)
         else:
-            raise serializers.ValidationError('Must include "username" and "password"')
+            msg = _('Must include "username" and "password"')
+            raise serializers.ValidationError(msg)
-- 
cgit v1.2.3


From ccf3c508bd6750073ea3bbaefff567b92880df73 Mon Sep 17 00:00:00 2001
From: Charlie Denton
Date: Fri, 2 May 2014 21:58:49 +0100
Subject: Fix missing message in ValidationError

---
 rest_framework/authtoken/serializers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rest_framework/authtoken/serializers.py')

diff --git a/rest_framework/authtoken/serializers.py b/rest_framework/authtoken/serializers.py
index 995f2e64..99e99ae3 100644
--- a/rest_framework/authtoken/serializers.py
+++ b/rest_framework/authtoken/serializers.py
@@ -18,7 +18,7 @@ class AuthTokenSerializer(serializers.Serializer):
             if user:
                 if not user.is_active:
                     msg = _('User account is disabled.')
-                    raise serializers.ValidationError()
+                    raise serializers.ValidationError(msg)
                 attrs['user'] = user
                 return attrs
             else:
-- 
cgit v1.2.3