Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #871 from matiasb/ticket_19945

Fixed #19945 -- Fixed default User model Meta inheritance.
  • Loading branch information...
commit 03e40140ff3d9506aed1d69cd0e7f764e1c8bce9 2 parents 60dd4ea + f39fead
@ramiro ramiro authored
View
2  django/contrib/auth/models.py
@@ -461,7 +461,7 @@ class User(AbstractUser):
Username, password and email are required. Other fields are optional.
"""
- class Meta:
+ class Meta(AbstractUser.Meta):
swappable = 'AUTH_USER_MODEL'
View
11 django/contrib/auth/tests/basic.py
@@ -12,6 +12,7 @@
from django.core.management import call_command
from django.test import TestCase
from django.test.utils import override_settings
+from django.utils import translation
from django.utils.encoding import force_str
from django.utils.six import binary_type, PY3, StringIO
@@ -232,3 +233,13 @@ def test_swappable_user_nonexistent_model(self):
"The current user model must point to an installed model"
with self.assertRaises(ImproperlyConfigured):
get_user_model()
+
+ @skipIfCustomUser
+ def test_user_verbose_names_translatable(self):
+ "Default User model verbose names are translatable (#19945)"
+ with translation.override('en'):
+ self.assertEqual(User._meta.verbose_name, 'user')
+ self.assertEqual(User._meta.verbose_name_plural, 'users')
+ with translation.override('es'):
+ self.assertEqual(User._meta.verbose_name, 'usuario')
+ self.assertEqual(User._meta.verbose_name_plural, 'usuarios')
Please sign in to comment.
Something went wrong with that request. Please try again.