mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

Updated a few localization formats to stop the changes done in r17473 from breaking the tests.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17486 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel
2012-02-10 01:13:29 +00:00
parent 8ae02fde2b
commit c1acda6d8f
21 changed files with 43 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/regressiontests/defaultfilters/tests.py
View File

@@ -487,7 +487,7 @@ class DefaultFiltersTests(TestCase):
# real testing of date() is in dateformat.py
self.assertEqual(date(datetime.datetime(2005, 12, 29), u"d F Y"),
u'29 December 2005')
self.assertEqual(date(datetime.datetime(2005, 12, 29), ur'jS o\f F'),
self.assertEqual(date(datetime.datetime(2005, 12, 29), ur'jS \o\f F'),
u'29th of December')
def test_time(self):

2
tests/regressiontests/i18n/tests.py
View File

@@ -439,7 +439,7 @@ class FormattingTests(TestCase):
settings.USE_L10N = True
# Catalan locale
with translation.override('ca', deactivate=True):
self.assertEqual('j \de F \de Y', get_format('DATE_FORMAT'))
self.assertEqual('j \d\e F \d\e Y', get_format('DATE_FORMAT'))
self.assertEqual(1, get_format('FIRST_DAY_OF_WEEK'))
self.assertEqual(',', get_format('DECIMAL_SEPARATOR'))
self.assertEqual(u'10:15:48', time_format(self.t))

2
tests/regressiontests/utils/dateformat.py
View File

@@ -104,7 +104,7 @@ class DateFormatTests(unittest.TestCase):
self.assertEqual(dateformat.format(my_birthday, r'Y z \C\E\T'), u'1979 189 CET')
self.assertEqual(dateformat.format(my_birthday, r'jS o\f F'), u'8th of July')
self.assertEqual(dateformat.format(my_birthday, r'jS \o\f F'), u'8th of July')
def test_futuredates(self):
the_future = datetime(2100, 10, 25, 0, 00)