Fixed #5641 -- Handle lazy translations correctly when used as default arguments. Thanks, permon.

malcolmt · malcolmt · commit 185848a526f9 · 2007-10-04T01:55:51.000Z
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6453 bcc190cf-cafb-0310-a4f2-bffc1f526a37
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
@@ -238,7 +238,7 @@ def get_default(self):
         if self.default is not NOT_PROVIDED:
             if callable(self.default):
                 return self.default()
-            return self.default
+            return force_unicode(self.default, strings_only=True)
         if not self.empty_strings_allowed or (self.null and settings.DATABASE_ENGINE != 'oracle'):
             return None
         return ""
diff --git a/tests/modeltests/basic/models.py b/tests/modeltests/basic/models.py
@@ -152,7 +152,7 @@ def __unicode__(self):
 >>> a6 = Article(pub_date=datetime(2005, 7, 31))
 >>> a6.save()
 >>> a6.headline
-'Default headline'
+u'Default headline'
 
 # For DateTimeFields, Django saves as much precision (in seconds) as you
 # give it.
diff --git a/tests/modeltests/field_defaults/models.py b/tests/modeltests/field_defaults/models.py
@@ -42,7 +42,7 @@ def __unicode__(self):
 
 # Access database columns via Python attributes.
 >>> a.headline
-'Default headline'
+u'Default headline'
 
 # make sure the two dates are sufficiently close
 >>> d = now - a.pub_date
diff --git a/tests/regressiontests/i18n/models.py b/tests/regressiontests/i18n/models.py
@@ -0,0 +1,12 @@
+from django.db import models
+from django.utils.translation import ugettext_lazy as _
+
+class TestModel(models.Model):
+    text = models.CharField(max_length=10, default=_('Anything'))
+
+__test__ = {'API_TESTS': '''
+>>> tm = TestModel()
+>>> tm.save()
+'''
+}
+
