equal
deleted
inserted
replaced
13 # |
13 # |
14 ############################################################################## |
14 ############################################################################## |
15 |
15 |
16 |
16 |
17 # import standard packages |
17 # import standard packages |
18 from datetime import datetime |
18 from datetime import date, datetime, time |
19 |
19 |
20 # import Zope3 interfaces |
20 # import Zope3 interfaces |
21 |
21 |
22 # import local interfaces |
22 # import local interfaces |
23 |
23 |
85 |
85 |
86 def formatDate(value, format=EXT_DATE_FORMAT, request=None): |
86 def formatDate(value, format=EXT_DATE_FORMAT, request=None): |
87 if request is None: |
87 if request is None: |
88 request = queryRequest() |
88 request = queryRequest() |
89 if value.year >= 1900: |
89 if value.year >= 1900: |
90 return datetime.strftime(tztime(value), translate(format, context=request).encode('utf-8')).decode('utf-8') |
90 if isinstance(value, date): |
|
91 value = datetime.combine(value, time()) |
|
92 return datetime.strftime(tztime(value), |
|
93 translate(format, context=request).encode('utf-8')).decode('utf-8') |
91 else: |
94 else: |
92 return format.replace('%d', str(value.day)) \ |
95 return format.replace('%d', str(value.day)) \ |
93 .replace('%m', str(value.month)) \ |
96 .replace('%m', str(value.month)) \ |
94 .replace('%Y', str(value.year)) |
97 .replace('%Y', str(value.year)) |
95 |
98 |