From 4c32083b8b59a50877633910055313dad7bb117e Mon Sep 17 00:00:00 2001
From: Craig Blaszczyk
Date: Wed, 7 Jan 2015 12:01:11 +0000
Subject: use double quotes for user visible strings; end user visible strings
 in full stops; add some missing translation tags

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

(limited to 'rest_framework/authtoken')

diff --git a/rest_framework/authtoken/serializers.py b/rest_framework/authtoken/serializers.py
index f31dded1..78fe6a11 100644
--- a/rest_framework/authtoken/serializers.py
+++ b/rest_framework/authtoken/serializers.py
@@ -17,13 +17,13 @@ class AuthTokenSerializer(serializers.Serializer):
 
             if user:
                 if not user.is_active:
-                    msg = _('User account is disabled.')
+                    msg = _("User account is disabled.")
                     raise exceptions.ValidationError(msg)
             else:
-                msg = _('Unable to log in with provided credentials.')
+                msg = _("Unable to log in with provided credentials.")
                 raise exceptions.ValidationError(msg)
         else:
-            msg = _('Must include "username" and "password"')
+            msg = _("Must include \"username\" and \"password\"")
             raise exceptions.ValidationError(msg)
 
         attrs['user'] = user
-- 
cgit v1.2.3


From 91e316f7810157474d6246cd0024bd7f7cc31ff7 Mon Sep 17 00:00:00 2001
From: Craig Blaszczyk
Date: Wed, 7 Jan 2015 12:46:23 +0000
Subject: prefer single quotes in source and double quotes in user visible
 strings; add some missing full stops to user visible strings

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

(limited to 'rest_framework/authtoken')

diff --git a/rest_framework/authtoken/serializers.py b/rest_framework/authtoken/serializers.py
index 78fe6a11..37ade255 100644
--- a/rest_framework/authtoken/serializers.py
+++ b/rest_framework/authtoken/serializers.py
@@ -17,13 +17,13 @@ class AuthTokenSerializer(serializers.Serializer):
 
             if user:
                 if not user.is_active:
-                    msg = _("User account is disabled.")
+                    msg = _('User account is disabled.')
                     raise exceptions.ValidationError(msg)
             else:
-                msg = _("Unable to log in with provided credentials.")
+                msg = _('Unable to log in with provided credentials.')
                 raise exceptions.ValidationError(msg)
         else:
-            msg = _("Must include \"username\" and \"password\"")
+            msg = _('Must include "username" and "password".')
             raise exceptions.ValidationError(msg)
 
         attrs['user'] = user
-- 
cgit v1.2.3


From a1eba885e287f59dd269441dfebb3b3de3eea692 Mon Sep 17 00:00:00 2001
From: Lucas Wiman
Date: Tue, 27 Jan 2015 19:01:40 -0800
Subject: Use the proper db_table argument when constructing meta

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

(limited to 'rest_framework/authtoken')

diff --git a/rest_framework/authtoken/south_migrations/0001_initial.py b/rest_framework/authtoken/south_migrations/0001_initial.py
index 926de02b..5b927f3e 100644
--- a/rest_framework/authtoken/south_migrations/0001_initial.py
+++ b/rest_framework/authtoken/south_migrations/0001_initial.py
@@ -40,7 +40,7 @@ class Migration(SchemaMigration):
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
         "%s.%s" % (User._meta.app_label, User._meta.module_name): {
-            'Meta': {'object_name': User._meta.module_name},
+            'Meta': {'object_name': User._meta.module_name, 'db_table': repr(User._meta.db_table)},
         },
         'authtoken.token': {
             'Meta': {'object_name': 'Token'},
-- 
cgit v1.2.3