Skip to content

Commit 3cda299

Browse files
author
Alexander Smishlajev
committed
use client instance to translate Date and Interval objects
1 parent 767aaf2 commit 3cda299

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

roundup/cgi/templating.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -939,14 +939,16 @@ def history(self, direction='descending', dre=re.compile('^\d+$')):
939939
current[k] = old
940940

941941
elif isinstance(prop, hyperdb.Date) and args[k]:
942-
d = date.Date(args[k]).local(timezone)
942+
d = date.Date(args[k],
943+
translator=self._client).local(timezone)
943944
cell.append('%s: %s'%(k, str(d)))
944945
if current.has_key(k):
945946
cell[-1] += ' -> %s' % current[k]
946947
current[k] = str(d)
947948

948949
elif isinstance(prop, hyperdb.Interval) and args[k]:
949-
val = str(date.Interval(args[k]))
950+
val = str(date.Interval(args[k],
951+
translator=self._client))
950952
cell.append('%s: %s'%(k, val))
951953
if current.has_key(k):
952954
cell[-1] += ' -> %s'%current[k]
@@ -1407,14 +1409,14 @@ def now(self, str_interval = None):
14071409
'''
14081410
self.view_check()
14091411

1410-
ret = date.Date('.')
1412+
ret = date.Date('.', translator=self._client)
14111413

14121414
if isinstance(str_interval, basestring):
14131415
sign = 1
14141416
if str_interval[0] == '-':
14151417
sign = -1
14161418
str_interval = str_interval[1:]
1417-
interval = date.Interval(str_interval)
1419+
interval = date.Interval(str_interval, translator=self._client)
14181420
if sign > 0:
14191421
ret = ret + interval
14201422
else:
@@ -1435,7 +1437,7 @@ def field(self, size = 30, default = None):
14351437
raw_value = None
14361438
else:
14371439
if isinstance(default, basestring):
1438-
raw_value = Date(default)
1440+
raw_value = Date(default, translator=self._client)
14391441
elif isinstance(default, date.Date):
14401442
raw_value = default
14411443
elif isinstance(default, DateHTMLProperty):
@@ -1470,7 +1472,7 @@ def reldate(self, pretty=1):
14701472
return ''
14711473

14721474
# figure the interval
1473-
interval = self._value - date.Date('.')
1475+
interval = self._value - date.Date('.', translator=self._client)
14741476
if pretty:
14751477
return interval.pretty()
14761478
return str(interval)

0 commit comments

Comments
 (0)