mirrors/django
mirrors/django
0
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-01 15:42:04 +01:00
Code Issues Releases Wiki Activity

Merge pull request #871 from matiasb/ticket_19945

Browse Source 
Fixed #19945 -- Fixed default User model Meta inheritance.
This commit is contained in:
Ramiro Morales 2013-03-03 14:30:36 -08:00
commit 03e40140ff
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/auth/models.py
View File

@ -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'

11
django/contrib/auth/tests/basic.py
View File

@ -12,6 +12,7 @@ from django.core.exceptions import ImproperlyConfigured
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 @@ class BasicTestCase(TestCase):
"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')