Ticket #2182: trac-i18n-datetime.patch

trac/Search.py

@@ -186 +186 @@
             req.hdf['search.result'] = [
                 { 'href': result[0],
                   'title': result[1],
-                  'date': format_datetime(result[2]),
+                  'date': format_datetime(result[2], self.env.config.get('i18n', 'datetime_format')),
                   'author': result[3],
                   'excerpt': result[4]
                 } for result in results]

trac/Timeline.py

@@ -96 +96 @@
         t = time.localtime()
         if req.args.has_key('from'):
             try:
-                t = time.strptime(req.args.get('from'), '%x')
+                t = time.strptime(req.args.get('from'), self.env.config.get('i18n', 'date_format'))
             except:
                 pass
 
@@ -105 +105 @@
             daysback = max(0, int(req.args.get('daysback', '')))
         except ValueError:
             daysback = int(self.config.get('timeline', 'default_daysback'))
-        req.hdf['timeline.from'] = format_date(fromdate)
+        req.hdf['timeline.from'] = format_date(fromdate, self.env.config.get('i18n', 'date_format'))
         req.hdf['timeline.daysback'] = daysback
 
         available_filters = []
@@ -154 +154 @@
         for kind, href, title, date, author, message in events:
             event = {'kind': kind, 'title': title, 'href': href,
                      'author': author or 'anonymous',
-                     'date': format_date(date),
+                     'date': format_date(date, self.env.config.get('i18n', 'date_format')),
                      'time': format_time(date, '%H:%M'),
                      'message': message}
 

trac/attachment.py

@@ -200 +200 @@
         'author': attachment.author,
         'ipnr': attachment.ipnr,
         'size': util.pretty_size(attachment.size),
-        'time': util.format_datetime(attachment.time),
+        'time': util.format_datetime(attachment.time, env.config.get('i18n', 'datetime_format')),
         'href': attachment.href()
     }
     return hdf

trac/db_default.py

@@ -435 +435 @@
   ('timeline', 'ticket_show_details', 'false'),
   ('browser', 'hide_properties', 'svk:merge'),
   ('wiki', 'ignore_missing_pages', 'false'),
+  ('i18n', 'date_format', '%x'),
+  ('i18n', 'time_format', '%X'),
+  ('i18n', 'datetime_format', '%x %X'),
 )
 
 default_components = ('trac.About', 'trac.attachment', 

trac/ticket/query.py

@@ -559 +559 @@
                     ticket['changed'] = True
             for field, value in ticket.items():
                 if field == 'time':
-                    ticket[field] = format_datetime(value)
+                    ticket[field] = format_datetime(value, self.env.config.get('i18n', 'datetime_format'))
                 elif field == 'description':
                     ticket[field] = wiki_to_html(value or '', self.env, req, db)
                 else:

trac/ticket/report.py

@@ -351 +351 @@
                 elif column == 'report':
                     value['report_href'] = self.env.href.report(cell)
                 elif column in ('time', 'date','changetime', 'created', 'modified'):
-                    value['date'] = util.format_date(cell)
-                    value['time'] = util.format_time(cell)
-                    value['datetime'] = util.format_datetime(cell)
+                    value['date'] = util.format_date(cell, self.env.config.get('i18n', 'date_format'))
+                    value['time'] = util.format_time(cell, self.env.config.get('i18n', 'date_format'))
+                    value['datetime'] = util.format_datetime(cell, self.env.config.get('i18n', 'date_format'))
                     value['gmt'] = util.http_date(cell)
                 prefix = 'report.items.%d.%s' % (row_idx, str(column))
                 req.hdf[prefix] = str(cell)

trac/ticket/roadmap.py

@@ -96 +96 @@
         hdf['description'] = wiki_to_html(milestone.description, env, req, db)
     if milestone.due:
         hdf['due'] = milestone.due
-        hdf['due_date'] = format_date(milestone.due)
+        hdf['due_date'] = format_date(milestone.due, env.config.get('i18n', 'date_format'))
         hdf['due_delta'] = pretty_timedelta(milestone.due + 86400)
         hdf['late'] = milestone.is_late
     if milestone.completed:
         hdf['completed'] = milestone.completed
-        hdf['completed_date'] = format_datetime(milestone.completed)
+        hdf['completed_date'] = format_datetime(milestone.completed, env.config.get('i18n', 'datetime_format'))
         hdf['completed_delta'] = pretty_timedelta(milestone.completed)
     return hdf
 
@@ -390 +390 @@
 
         due = req.args.get('duedate', '')
         try:
-            milestone.due = due and parse_date(due) or 0
+            milestone.due = due and parse_date(due, self.env.config.get('i18n', 'date_format')) or 0
         except ValueError, e:
             raise TracError(e, 'Invalid Date Format')
         if req.args.has_key('completed'):
             completed = req.args.get('completeddate', '')
             try:
-                milestone.completed = completed and parse_date(completed) or 0
+                milestone.completed = completed and parse_date(completed, self.env.config.get('i18n', 'datetime_format')) or 0
             except ValueError, e:
                 raise TracError(e, 'Invalid Date Format')
             if milestone.completed > time():
@@ -440 +440 @@
 
         from trac.util import get_date_format_hint, get_datetime_format_hint
         req.hdf['milestone'] = milestone_to_hdf(self.env, db, req, milestone)
-        req.hdf['milestone.date_hint'] = get_date_format_hint()
-        req.hdf['milestone.datetime_hint'] = get_datetime_format_hint()
-        req.hdf['milestone.datetime_now'] = format_datetime()
+        req.hdf['milestone.date_hint'] = get_date_format_hint(self.env.config.get('i18n', 'date_format'))
+        req.hdf['milestone.datetime_hint'] = get_datetime_format_hint(self.env.config.get('i18n', 'datetime_format'))
+        req.hdf['milestone.datetime_now'] = format_datetime(None, self.env.config.get('i18n', 'datetime_format'))
 
     def _render_view(self, req, db, milestone):
         req.hdf['title'] = 'Milestone %s' % milestone.name

trac/ticket/web_ui.py

@@ -383 +383 @@
         req.hdf['ticket.description.formatted'] = wiki_to_html(ticket['description'],
                                                                self.env, req, db)
 
-        req.hdf['ticket.opened'] = util.format_datetime(ticket.time_created)
+        req.hdf['ticket.opened'] = util.format_datetime(ticket.time_created, self.env.config.get('i18n', 'datetime_format'))
         req.hdf['ticket.opened_delta'] = util.pretty_timedelta(ticket.time_created)
         if ticket.time_changed != ticket.time_created:
-            req.hdf['ticket.lastmod'] = util.format_datetime(ticket.time_changed)
+            req.hdf['ticket.lastmod'] = util.format_datetime(ticket.time_changed, self.env.config.get('i18n', 'datetime_format'))
             req.hdf['ticket.lastmod_delta'] = util.pretty_timedelta(ticket.time_changed)
 
         changelog = ticket.get_changelog(db=db)
@@ -396 +396 @@
         for date, author, field, old, new in changelog:
             if date != curr_date or author != curr_author:
                 changes.append({
-                    'date': util.format_datetime(date),
+                    'date': util.format_datetime(date, self.env.config.get('i18n', 'datetime_format')),
                     'author': author,
                     'fields': {}
                 })

trac/util.py

@@ -414 +414 @@
 def format_time(t=None, format='%X', gmt=False):
     return format_datetime(t, format, gmt)
 
-def get_date_format_hint():
+def get_date_format_hint(format='%x'):
     t = time.localtime(0)
     t = (1999, 10, 29, t[3], t[4], t[5], t[6], t[7], t[8])
-    tmpl = time.strftime('%x', t)
+    tmpl = time.strftime(format, t)
     return tmpl.replace('1999', 'YYYY', 1).replace('99', 'YY', 1) \
                .replace('10', 'MM', 1).replace('29', 'DD', 1)
 
-def get_datetime_format_hint():
+def get_datetime_format_hint(format='%x %X'):
     t = time.localtime(0)
     t = (1999, 10, 29, 23, 59, 58, t[6], t[7], t[8])
-    tmpl = time.strftime('%x %X', t)
+    tmpl = time.strftime(format, t)
     return tmpl.replace('1999', 'YYYY', 1).replace('99', 'YY', 1) \
                .replace('10', 'MM', 1).replace('29', 'DD', 1) \
                .replace('23', 'hh', 1).replace('59', 'mm', 1) \
@@ -443 +443 @@
            weekdays[t.tm_wday], t.tm_mday, months[t.tm_mon - 1], t.tm_year,
            t.tm_hour, t.tm_min, t.tm_sec)
 
-def parse_date(text):
+def parse_date(text, default_format='%x %X'):
     seconds = None
     text = text.strip()
-    for format in ['%x %X', '%x, %X', '%X %x', '%X, %x', '%x', '%c',
+    for format in [default_format, '%x %X', '%x, %X', '%X %x', '%X, %x', '%x', '%c',
                    '%b %d, %Y']:
         try:
             date = time.strptime(text, format)

trac/versioncontrol/web_ui/browser.py

@@ -160 +160 @@
         req.hdf['file'] = {  
             'rev': node.rev,  
             'changeset_href': self.env.href.changeset(node.rev),
-            'date': util.format_datetime(changeset.date),
+            'date': util.format_datetime(changeset.date, self.env.config.get('i18n', 'datetime_format')),
             'age': util.pretty_timedelta(changeset.date),
             'author': changeset.author or 'anonymous',
             'message': wiki_to_html(changeset.message or '--', self.env, req,

trac/versioncontrol/web_ui/changeset.py

@@ -152 +152 @@
         req.hdf['title'] = '[%s]' % chgset.rev
         req.hdf['changeset'] = {
             'revision': chgset.rev,
-            'time': util.format_datetime(chgset.date),
+            'time': util.format_datetime(chgset.date, self.env.config.get('i18n', 'datetime_format')),
             'author': chgset.author or 'anonymous',
             'message': wiki_to_html(chgset.message or '--', self.env, req,
                                     escape_newlines=True)

trac/versioncontrol/web_ui/util.py

@@ -48 +48 @@
                 message = str(message)
         changes[rev] = {
             'date_seconds': changeset.date,
-            'date': format_datetime(changeset.date),
+            'date': format_datetime(changeset.date, env.config.get('i18n', 'datetime_format')),
             'age': pretty_timedelta(changeset.date),
             'author': changeset.author or 'anonymous',
             'message': message,

trac/web/main.py

@@ -149 +149 @@
     from trac import __version__
     hdf['trac'] = {
         'version': __version__,
-        'time': format_datetime(),
+        'time': format_datetime(None, env.config.get('i18n', 'datetime_format')),
         'time.gmt': http_date()
     }
     hdf['trac.href'] = {

trac/wiki/macros.py

@@ -114 +114 @@
         prevdate = None
 
         for name, time in cursor:
-            date = format_date(time)
+            date = format_date(time, self.env.config.get('i18n', 'date_format'))
             if date != prevdate:
                 if prevdate:
                     buf.write('</ul>')

trac/wiki/web_ui.py

@@ -241 +241 @@
         for version,t,author,comment,ipnr in page.get_history():
             if version == page.version:
                 if t:
-                    info['time'] = format_datetime(t)
+                    info['time'] = format_datetime(t, self.env.config.get('i18n', 'datetime_format'))
                     info['time_delta'] = pretty_timedelta(t)
                 info['author'] = author or 'anonymous'
                 info['comment'] = comment or '--'
@@ -334 +334 @@
                                                version=version,
                                                action='diff'),
                 'version': version,
-                'time': format_datetime(t),
+                'time': format_datetime(t, self.env.config.get('i18n', 'datetime_format')),
                 'time_delta': pretty_timedelta(t),
                 'author': author,
                 'comment': wiki_to_oneliner(comment or '', self.env, db),