- | {{ action.action_time|date:_("DATETIME_FORMAT") }} |
+ {{ action.action_time|date }} |
{{ action.user.username }}{% if action.user.get_full_name %} ({{ action.user.get_full_name }}){% endif %} |
{{ action.change_message }} |
Index: django/contrib/databrowse/datastructures.py
===================================================================
--- django/contrib/databrowse/datastructures.py (.../trunk) (revision 11464)
+++ django/contrib/databrowse/datastructures.py (.../branches/soc2009/i18n-improvements) (revision 11464)
@@ -4,9 +4,8 @@
"""
from django.db import models
-from django.utils import dateformat
+from django.utils import formats
from django.utils.text import capfirst
-from django.utils.translation import get_date_formats
from django.utils.encoding import smart_unicode, smart_str, iri_to_uri
from django.utils.safestring import mark_safe
from django.db.models.query import QuerySet
@@ -156,13 +155,12 @@
objs = dict(self.field.choices).get(self.raw_value, EMPTY_VALUE)
elif isinstance(self.field, models.DateField) or isinstance(self.field, models.TimeField):
if self.raw_value:
- date_format, datetime_format, time_format = get_date_formats()
if isinstance(self.field, models.DateTimeField):
- objs = capfirst(dateformat.format(self.raw_value, datetime_format))
+ objs = capfirst(formats.date_format(self.raw_value, 'DATETIME_FORMAT'))
elif isinstance(self.field, models.TimeField):
- objs = capfirst(dateformat.time_format(self.raw_value, time_format))
+ objs = capfirst(formats.date_format(self.raw_value, 'TIME_FORMAT'))
else:
- objs = capfirst(dateformat.format(self.raw_value, date_format))
+ objs = capfirst(formats.date_format(self.raw_value, 'DATE_FORMAT'))
else:
objs = EMPTY_VALUE
elif isinstance(self.field, models.BooleanField) or isinstance(self.field, models.NullBooleanField):
Index: django/template/defaultfilters.py
===================================================================
--- django/template/defaultfilters.py (.../trunk) (revision 11464)
+++ django/template/defaultfilters.py (.../branches/soc2009/i18n-improvements) (revision 11464)
@@ -18,6 +18,7 @@
from django.utils.translation import ugettext, ungettext
from django.utils.encoding import force_unicode, iri_to_uri
from django.utils.safestring import mark_safe, SafeData
+from django.utils.formats import date_format, number_format
register = Library()
@@ -166,14 +167,14 @@
return input_val
if not m and p < 0:
- return mark_safe(u'%d' % (int(d)))
+ return mark_safe(number_format(u'%d' % (int(d)), 0))
if p == 0:
exp = Decimal(1)
else:
exp = Decimal('1.0') / (Decimal(10) ** abs(p))
try:
- return mark_safe(u'%s' % str(d.quantize(exp, ROUND_HALF_UP)))
+ return mark_safe(number_format(u'%s' % str(d.quantize(exp, ROUND_HALF_UP)), abs(p)))
except InvalidOperation:
return input_val
floatformat.is_safe = True
@@ -684,9 +685,12 @@
if arg is None:
arg = settings.DATE_FORMAT
try:
- return format(value, arg)
+ return date_format(value, arg)
except AttributeError:
- return ''
+ try:
+ return format(value, arg)
+ except AttributeError:
+ return ''
date.is_safe = False
def time(value, arg=None):
@@ -697,9 +701,12 @@
if arg is None:
arg = settings.TIME_FORMAT
try:
- return time_format(value, arg)
+ return date_format(value, arg)
except AttributeError:
- return ''
+ try:
+ return time_format(value, arg)
+ except AttributeError:
+ return ''
time.is_safe = False
def timesince(value, arg=None):
Index: django/template/__init__.py
===================================================================
--- django/template/__init__.py (.../trunk) (revision 11464)
+++ django/template/__init__.py (.../branches/soc2009/i18n-improvements) (revision 11464)
@@ -60,6 +60,7 @@
from django.utils.encoding import smart_unicode, force_unicode, smart_str
from django.utils.translation import ugettext as _
from django.utils.safestring import SafeData, EscapeData, mark_safe, mark_for_escaping
+from django.utils.formats import localize
from django.utils.html import escape
__all__ = ('Template', 'Context', 'RequestContext', 'compile_string')
@@ -808,6 +809,7 @@
means escaping, if required, and conversion to a unicode object. If value
is a string, it is expected to have already been translated.
"""
+ value = localize(value)
value = force_unicode(value)
if (context.autoescape and not isinstance(value, SafeData)) or isinstance(value, EscapeData):
return escape(value)
Index: django/template/debug.py
===================================================================
--- django/template/debug.py (.../trunk) (revision 11464)
+++ django/template/debug.py (.../branches/soc2009/i18n-improvements) (revision 11464)
@@ -2,6 +2,7 @@
from django.utils.encoding import force_unicode
from django.utils.html import escape
from django.utils.safestring import SafeData, EscapeData
+from django.utils.formats import localize
class DebugLexer(Lexer):
def __init__(self, template_string, origin):
@@ -84,7 +85,9 @@
class DebugVariableNode(VariableNode):
def render(self, context):
try:
- output = force_unicode(self.filter_expression.resolve(context))
+ output = self.filter_expression.resolve(context)
+ output = localize(output)
+ output = force_unicode(output)
except TemplateSyntaxError, e:
if not hasattr(e, 'source'):
e.source = self.source
Index: tests/regressiontests/i18n/tests.py
===================================================================
--- tests/regressiontests/i18n/tests.py (.../trunk) (revision 11464)
+++ tests/regressiontests/i18n/tests.py (.../branches/soc2009/i18n-improvements) (revision 11464)
@@ -64,6 +64,283 @@
'as'
>>> print s
Password
+
+Translations on files with mac or dos end of lines will be converted
+to unix eof in .po catalogs, and they have to match when retrieved
+
+>>> from django.utils.translation.trans_real import translation
+>>> ca_translation = translation('ca')
+>>> ca_translation._catalog[u'Mac\nEOF\n'] = u'Catalan Mac\nEOF\n'
+>>> ca_translation._catalog[u'Win\nEOF\n'] = u'Catalan Win\nEOF\n'
+>>> activate('ca')
+>>> ugettext(u'Mac\rEOF\r')
+u'Catalan Mac\nEOF\n'
+>>> ugettext(u'Win\r\nEOF\r\n')
+u'Catalan Win\nEOF\n'
+>>> deactivate()
+
+Localization of dates and numbers
+
+>>> import datetime
+>>> import decimal
+>>> from django.conf import settings
+>>> from django.utils.formats import getformat, date_format, number_format, localize
+>>> from django.utils.numberformat import format
+>>> from django import template
+>>> from django import forms
+>>> from django.forms.extras import SelectDateWidget
+
+>>> old_use_i18n = settings.USE_I18N
+>>> old_use_format_i18n = settings.USE_FORMAT_I18N
+>>> old_use_thousand_separator = settings.USE_THOUSAND_SEPARATOR
+
+>>> n = decimal.Decimal('66666.666')
+>>> f = 99999.999
+>>> d = datetime.date(2009, 12, 31)
+>>> dt = datetime.datetime(2009, 12, 31, 20, 50)
+>>> ctxt = template.Context({'n': n, 'd': d, 'dt': dt, 'f': f})
+>>> class I18nForm(forms.Form):
+... decimal_field = forms.DecimalField()
+... float_field = forms.FloatField()
+... date_field = forms.DateField()
+... datetime_field = forms.DateTimeField()
+... time_field = forms.TimeField()
+>>> class SelectDateForm(forms.Form):
+... date_field = forms.DateField(widget=SelectDateWidget)
+
+Locale independent
+
+>>> settings.USE_FORMAT_I18N = True
+>>> settings.USE_THOUSAND_SEPARATOR = False
+>>> format(n, decimal_sep='.', decimal_pos=2, grouping=3, thousand_sep=',')
+u'66666.66'
+>>> format(n, decimal_sep='A', decimal_pos=1, grouping=1, thousand_sep='B')
+u'66666A6'
+>>> settings.USE_THOUSAND_SEPARATOR = True
+>>> format(n, decimal_sep='.', decimal_pos=2, grouping=3, thousand_sep=',')
+u'66,666.66'
+>>> format(n, decimal_sep='A', decimal_pos=1, grouping=1, thousand_sep='B')
+u'6B6B6B6B6A6'
+
+Catalan locale with format i18n disabled
+translations will be used, but not formats
+
+>>> settings.USE_FORMAT_I18N = False
+>>> activate('ca')
+>>> getformat('DATE_FORMAT')
+'N j, Y'
+>>> getformat('FIRST_DAY_OF_WEEK')
+0
+>>> getformat('DECIMAL_SEPARATOR')
+'.'
+>>> date_format(d)
+u'des. 31, 2009'
+>>> date_format(d, 'YEAR_MONTH_FORMAT')
+u'desembre 2009'
+>>> date_format(dt, 'SHORT_DATETIME_FORMAT')
+u'12/31/2009 8:50 p.m.'
+>>> localize('No localizable')
+'No localizable'
+>>> localize(n)
+Decimal('66666.666')
+>>> localize(f)
+99999.999
+>>> localize(d)
+datetime.date(2009, 12, 31)
+>>> localize(dt)
+datetime.datetime(2009, 12, 31, 20, 50)
+>>> template.Template('{{ n }}').render(ctxt)
+u'66666.666'
+>>> template.Template('{{ f }}').render(ctxt)
+u'99999.999'
+>>> template.Template('{{ d }}').render(ctxt)
+u'2009-12-31'
+>>> template.Template('{{ dt }}').render(ctxt)
+u'2009-12-31 20:50:00'
+>>> template.Template('{{ n|floatformat:2 }}').render(ctxt)
+u'66666.67'
+>>> template.Template('{{ f|floatformat }}').render(ctxt)
+u'100000.0'
+>>> template.Template('{{ d|date:"SHORT_DATE_FORMAT" }}').render(ctxt)
+u'12/31/2009'
+>>> template.Template('{{ dt|date:"SHORT_DATETIME_FORMAT" }}').render(ctxt)
+u'12/31/2009 8:50 p.m.'
+>>> form = I18nForm({'decimal_field': u'66666,666', 'float_field': u'99999,999', 'date_field': u'31/12/2009', 'datetime_field': u'31/12/2009 20:50', 'time_field': u'20:50'})
+>>> form.is_valid()
+False
+>>> form.errors['float_field']
+[u'Introdu\xefu un n\xfamero.']
+>>> form.errors['decimal_field']
+[u'Introdu\xefu un n\xfamero.']
+>>> form.errors['date_field']
+[u'Introdu\xefu una data v\xe0lida.']
+>>> form.errors['datetime_field']
+[u'Introdu\xefu una data/hora v\xe0lides.']
+>>> form2 = SelectDateForm({'date_field_month': u'12', 'date_field_day': u'31', 'date_field_year': u'2009'})
+>>> form2.is_valid()
+True
+>>> form2.cleaned_data['date_field']
+datetime.date(2009, 12, 31)
+>>> SelectDateWidget().render('mydate', datetime.date(2009, 12, 31))
+u'