From 2cf448152eaff0a5fbcf078ccf5a62f7a91ef3e1 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Sun, 11 Mar 2007 10:15:35 +0000 Subject: [PATCH] Fixed #2998 -- Wrapped a couple more strings for translation. Thanks, Jannis Leidel. git-svn-id: http://code.djangoproject.com/svn/django/trunk@4701 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/utils/dateformat.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/django/utils/dateformat.py b/django/utils/dateformat.py index e3712175af1..a558e3a69f8 100644 --- a/django/utils/dateformat.py +++ b/django/utils/dateformat.py @@ -13,6 +13,7 @@ Usage: from django.utils.dates import MONTHS, MONTHS_3, MONTHS_AP, WEEKDAYS from django.utils.tzinfo import LocalTimezone +from django.utils.translation import gettext as _ from calendar import isleap, monthrange import re, time @@ -36,14 +37,14 @@ class TimeFormat(Formatter): def a(self): "'a.m.' or 'p.m.'" if self.data.hour > 11: - return 'p.m.' - return 'a.m.' + return _('p.m.') + return _('a.m.') def A(self): "'AM' or 'PM'" if self.data.hour > 11: - return 'PM' - return 'AM' + return _('PM') + return _('AM') def B(self): "Swatch Internet time" @@ -91,9 +92,9 @@ class TimeFormat(Formatter): Proprietary extension. """ if self.data.minute == 0 and self.data.hour == 0: - return 'midnight' + return _('midnight') if self.data.minute == 0 and self.data.hour == 12: - return 'noon' + return _('noon') return '%s %s' % (self.f(), self.a()) def s(self):