Commit af7773f2 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

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
parent b3b71a09

django/db/models/fields/related.py

+2 −1
Original line number Diff line number Diff line
@@ -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):