Django

Code

Changeset 918

Show
Ignore:
Timestamp:
10/17/05 17:33:08 (3 years ago)
Author:
hugo
Message:

i18n: fixed a problem with the object history and lazy translations of field names

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/i18n/django/utils/text.py

    r638 r918  
    5656    if len(list_) == 0: return '' 
    5757    if len(list_) == 1: return list_[0] 
    58     return '%s %s %s' % (', '.join([i for i in list_][:-1]), last_word, list_[-1]) 
     58    return '%s %s %s' % (', '.join([str(i) for i in list_][:-1]), last_word, list_[-1]) 
    5959 
    6060def normalize_newlines(text):