Django

Code

Changeset 8132

Show
Ignore:
Timestamp:
07/29/08 00:17:47 (5 months ago)
Author:
mtredinnick
Message:

Fixed #8011 -- Be careful not to evalute lazy-translated Meta.verbose_name
values whilst importing models.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/trunk/django/db/models/fields/related.py

    r8046 r8132  
    115115    def set_attributes_from_rel(self): 
    116116        self.name = self.name or (self.rel.to._meta.object_name.lower() + '_' + self.rel.to._meta.pk.name) 
    117         self.verbose_name = self.verbose_name or self.rel.to._meta.verbose_name 
     117        if self.verbose_name is None: 
     118            self.verbose_name = self.rel.to._meta.verbose_name 
    118119        self.rel.field_name = self.rel.field_name or self.rel.to._meta.pk.name 
    119120