Django

Code

Show
Ignore:
Timestamp:
07/04/07 07:11:04 (2 years ago)
Author:
mtredinnick
Message:

Merged Unicode branch into trunk (r4952:5608). This should be fully
backwards compatible for all practical purposes.

Fixed #2391, #2489, #2996, #3322, #3344, #3370, #3406, #3432, #3454, #3492, #3582, #3690, #3878, #3891, #3937, #4039, #4141, #4227, #4286, #4291, #4300, #4452, #4702

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk

    • Property svnmerge-integrated set to /django/trunk:1-5600

  • django/trunk/django/contrib/redirects/models.py

    r4265 r5609  
    11from django.db import models 
    22from django.contrib.sites.models import Site 
    3 from django.utils.translation import gettext_lazy as _ 
     3from django.utils.translation import ugettext_lazy as _ 
    44 
    55class Redirect(models.Model): 
    …… 
    2121        search_fields = ('old_path', 'new_path') 
    2222 
    23     def __str__(self): 
    24         return "%s ---> %s" % (self.old_path, self.new_path) 
     23    def __unicode__(self): 
     24        return u"%s ---> %s" % (self.old_path, self.new_path)