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/utils/dates.py

    r2912 r5609  
    11"Commonly-used date structures" 
    22 
    3 from django.utils.translation import gettext_lazy as _ 
     3from django.utils.translation import ugettext_lazy as _ 
    44 
    55WEEKDAYS = { 
    66    0:_('Monday'), 1:_('Tuesday'), 2:_('Wednesday'), 3:_('Thursday'), 4:_('Friday'), 
    77    5:_('Saturday'), 6:_('Sunday') 
     8} 
     9WEEKDAYS_ABBR = { 
     10    0:_('Mon'), 1:_('Tue'), 2:_('Wed'), 3:_('Thu'), 4:_('Fri'), 
     11    5:_('Sat'), 6:_('Sun') 
    812} 
    913WEEKDAYS_REV = {