diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-07-29 05:17:47 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-07-29 05:17:47 +0000 |
| commit | af7773f2800961c7a9628a3f8997e2e7ed81a7dd (patch) | |
| tree | 4f56b27ee7d47aaa19aa70df67419846855179c9 | |
| parent | b3b71a0922334c70bbc646a4873010f808196671 (diff) | |
Fixed #8011 -- Be careful not to evalute lazy-translated Meta.verbose_name
values whilst importing models.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8132 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/db/models/fields/related.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index ca25df2503..cb86f00c86 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -114,7 +114,8 @@ class RelatedField(object): def set_attributes_from_rel(self): self.name = self.name or (self.rel.to._meta.object_name.lower() + '_' + self.rel.to._meta.pk.name) - self.verbose_name = self.verbose_name or self.rel.to._meta.verbose_name + if self.verbose_name is None: + self.verbose_name = self.rel.to._meta.verbose_name self.rel.field_name = self.rel.field_name or self.rel.to._meta.pk.name def do_related_class(self, other, cls): |