Ticket #2182: trac-patch-2182.diff
File trac-patch-2182.diff, 14.6 KB (added by , 18 years ago) |
---|
-
trac/attachment.py
200 200 'author': util.escape(attachment.author), 201 201 'ipnr': attachment.ipnr, 202 202 'size': util.pretty_size(attachment.size), 203 'time': util.format_datetime(attachment.time ),203 'time': util.format_datetime(attachment.time, env.config.get('i18n', 'datetime_format')), 204 204 'href': attachment.href() 205 205 } 206 206 return hdf -
trac/db_default.py
434 434 ('timeline', 'ticket_show_details', 'false'), 435 435 ('browser', 'hide_properties', 'svk:merge'), 436 436 ('wiki', 'ignore_missing_pages', 'false'), 437 ('i18n', 'date_format', '%x'), 438 ('i18n', 'time_format', '%X'), 439 ('i18n', 'datetime_format', '%x %X'), 437 440 ) 438 441 439 442 default_components = ('trac.About', 'trac.attachment', -
trac/ticket/web_ui.py
389 389 req.hdf['ticket.description.formatted'] = wiki_to_html(ticket['description'], 390 390 self.env, req, db) 391 391 392 req.hdf['ticket.opened'] = util.format_datetime(ticket.time_created )392 req.hdf['ticket.opened'] = util.format_datetime(ticket.time_created, self.env.config.get('i18n', 'datetime_format')) 393 393 req.hdf['ticket.opened_delta'] = util.pretty_timedelta(ticket.time_created) 394 394 if ticket.time_changed != ticket.time_created: 395 req.hdf['ticket.lastmod'] = util.format_datetime(ticket.time_changed )395 req.hdf['ticket.lastmod'] = util.format_datetime(ticket.time_changed, self.env.config.get('i18n', 'datetime_format')) 396 396 req.hdf['ticket.lastmod_delta'] = util.pretty_timedelta(ticket.time_changed) 397 397 398 398 changelog = ticket.get_changelog(db=db) … … 402 402 for date, author, field, old, new in changelog: 403 403 if date != curr_date or author != curr_author: 404 404 changes.append({ 405 'date': util.format_datetime(date ),405 'date': util.format_datetime(date, self.env.config.get('i18n', 'datetime_format')), 406 406 'author': util.escape(author), 407 407 'fields': {} 408 408 }) -
trac/ticket/report.py
351 351 elif column == 'report': 352 352 value['report_href'] = self.env.href.report(cell) 353 353 elif column in ['time', 'date','changetime', 'created', 'modified']: 354 value['date'] = util.format_date(cell )355 value['time'] = util.format_time(cell )356 value['datetime'] = util.format_datetime(cell )354 value['date'] = util.format_date(cell, self.env.config.get('i18n', 'date_format')) 355 value['time'] = util.format_time(cell, self.env.config.get('i18n', 'time_format')) 356 value['datetime'] = util.format_datetime(cell, self.env.config.get('i18n', 'datetime_format')) 357 357 value['gmt'] = util.http_date(cell) 358 358 prefix = 'report.items.%d.%s' % (row_idx, str(column)) 359 359 req.hdf[prefix] = util.escape(str(cell)) -
trac/ticket/roadmap.py
94 94 hdf['description'] = wiki_to_html(milestone.description, env, req, db) 95 95 if milestone.due: 96 96 hdf['due'] = milestone.due 97 hdf['due_date'] = format_date(milestone.due )97 hdf['due_date'] = format_date(milestone.due, env.config.get('i18n', 'date_format')) 98 98 hdf['due_delta'] = pretty_timedelta(milestone.due) 99 99 hdf['late'] = milestone.is_late 100 100 if milestone.completed: 101 101 hdf['completed'] = milestone.completed 102 hdf['completed_date'] = format_datetime(milestone.completed )102 hdf['completed_date'] = format_datetime(milestone.completed, env.config.get('i18n', 'datetime_format')) 103 103 hdf['completed_delta'] = pretty_timedelta(milestone.completed) 104 104 return hdf 105 105 … … 388 388 389 389 due = req.args.get('duedate', '') 390 390 try: 391 milestone.due = due and parse_date(due ) or 0391 milestone.due = due and parse_date(due, self.env.config.get('i18n', 'date_format')) or 0 392 392 except ValueError, e: 393 393 raise TracError(e, 'Invalid Date Format') 394 394 if req.args.has_key('completed'): 395 395 completed = req.args.get('completeddate', '') 396 396 try: 397 milestone.completed = completed and parse_date(completed ) or 0397 milestone.completed = completed and parse_date(completed, self.env.config.get('i18n', 'datetime_format')) or 0 398 398 except ValueError, e: 399 399 raise TracError(e, 'Invalid Date Format') 400 400 if milestone.completed > time(): … … 438 438 439 439 from trac.util import get_date_format_hint, get_datetime_format_hint 440 440 req.hdf['milestone'] = milestone_to_hdf(self.env, db, req, milestone) 441 req.hdf['milestone.date_hint'] = get_date_format_hint( )442 req.hdf['milestone.datetime_hint'] = get_datetime_format_hint( )443 req.hdf['milestone.datetime_now'] = format_datetime( )441 req.hdf['milestone.date_hint'] = get_date_format_hint(self.env.config.get('i18n', 'date_format')) 442 req.hdf['milestone.datetime_hint'] = get_datetime_format_hint(self.env.config.get('i18n', 'datetime_format')) 443 req.hdf['milestone.datetime_now'] = format_datetime(None, self.env.config.get('i18n', 'datetime_format')) 444 444 445 445 def _render_view(self, req, db, milestone): 446 446 req.hdf['title'] = 'Milestone %s' % milestone.name -
trac/ticket/query.py
534 534 ticket['changed'] = True 535 535 for field, value in ticket.items(): 536 536 if field == 'time': 537 ticket[field] = escape(format_datetime(value ))537 ticket[field] = escape(format_datetime(value, self.env.config.get('i18n', 'datetime_format'))) 538 538 elif field == 'description': 539 539 ticket[field] = wiki_to_html(value or '', self.env, req, db) 540 540 else: -
trac/versioncontrol/web_ui/util.py
45 45 message = '--' 46 46 changes[rev] = { 47 47 'date_seconds': changeset.date, 48 'date': format_datetime(changeset.date ),48 'date': format_datetime(changeset.date, env.config.get('i18n', 'datetime_format')), 49 49 'age': pretty_timedelta(changeset.date), 50 50 'author': changeset.author or 'anonymous', 51 51 'message': message, -
trac/versioncontrol/web_ui/changeset.py
153 153 req.hdf['title'] = '[%s]' % chgset.rev 154 154 req.hdf['changeset'] = { 155 155 'revision': chgset.rev, 156 'time': util.format_datetime(chgset.date ),156 'time': util.format_datetime(chgset.date, self.env.config.get('i18n', 'datetime_format')), 157 157 'author': util.escape(chgset.author or 'anonymous'), 158 158 'message': wiki_to_html(chgset.message or '--', self.env, req, 159 159 escape_newlines=True) -
trac/versioncontrol/web_ui/browser.py
170 170 req.hdf['file'] = { 171 171 'rev': node.rev, 172 172 'changeset_href': util.escape(self.env.href.changeset(node.rev)), 173 'date': util.format_datetime(changeset.date ),173 'date': util.format_datetime(changeset.date, self.env.config.get('i18n', 'datetime_format')), 174 174 'age': util.pretty_timedelta(changeset.date), 175 175 'author': changeset.author or 'anonymous', 176 176 'message': wiki_to_html(changeset.message or '--', self.env, req, -
trac/Search.py
183 183 req.hdf['search.result'] = [ 184 184 { 'href': escape(result[0]), 185 185 'title': result[1], 186 'date': format_datetime(result[2] ),186 'date': format_datetime(result[2], self.env.config.get('i18n', 'datetime_format')), 187 187 'author': escape(result[3]), 188 188 'excerpt': result[4] 189 189 } for result in results] -
trac/Timeline.py
94 94 t = time.localtime() 95 95 if req.args.has_key('from'): 96 96 try: 97 t = time.strptime(req.args.get('from'), '%x')97 t = time.strptime(req.args.get('from'), self.env.config.get('i18n', 'date_format')) 98 98 except: 99 99 pass 100 100 … … 103 103 daysback = max(0, int(req.args.get('daysback', ''))) 104 104 except ValueError: 105 105 daysback = int(self.config.get('timeline', 'default_daysback')) 106 req.hdf['timeline.from'] = format_date(fromdate )106 req.hdf['timeline.from'] = format_date(fromdate, self.env.config.get('i18n', 'date_format')) 107 107 req.hdf['timeline.daysback'] = daysback 108 108 109 109 available_filters = [] … … 152 152 for kind, href, title, date, author, message in events: 153 153 event = {'kind': kind, 'title': title, 'href': escape(href), 154 154 'author': escape(author or 'anonymous'), 155 'date': format_date(date ),155 'date': format_date(date, self.env.config.get('i18n', 'date_format')), 156 156 'time': format_time(date, '%H:%M'), 157 157 'message': message} 158 158 -
trac/wiki/web_ui.py
241 241 for version,t,author,comment,ipnr in page.get_history(): 242 242 if version == page.version: 243 243 if t: 244 info['time'] = format_datetime(t )244 info['time'] = format_datetime(t, self.env.config.get('i18n', 'datetime_format')) 245 245 info['time_delta'] = pretty_timedelta(t) 246 246 info['author'] = escape(author or 'anonymous') 247 247 info['comment'] = escape(comment or '--') … … 333 333 version=version, 334 334 action='diff')), 335 335 'version': version, 336 'time': format_datetime(t ),336 'time': format_datetime(t, self.env.config.get('i18n', 'datetime_format')), 337 337 'time_delta': pretty_timedelta(t), 338 338 'author': escape(author), 339 339 'comment': wiki_to_oneliner(comment or '', self.env, db), -
trac/wiki/macros.py
113 113 prevdate = None 114 114 115 115 for name, time in cursor: 116 date = format_date(time )116 date = format_date(time, self.env.config.get('i18n', 'date_format')) 117 117 if date != prevdate: 118 118 if prevdate: 119 119 buf.write('</ul>') -
trac/util.py
204 204 def format_time(t=None, format='%X', gmt=False): 205 205 return format_datetime(t, format, gmt) 206 206 207 def get_date_format_hint( ):207 def get_date_format_hint(format='%x'): 208 208 t = time.localtime(0) 209 209 t = (1999, 10, 29, t[3], t[4], t[5], t[6], t[7], t[8]) 210 tmpl = time.strftime( '%x', t)210 tmpl = time.strftime(format, t) 211 211 return tmpl.replace('1999', 'YYYY', 1).replace('99', 'YY', 1) \ 212 212 .replace('10', 'MM', 1).replace('29', 'DD', 1) 213 213 214 def get_datetime_format_hint( ):214 def get_datetime_format_hint(format='%x %X'): 215 215 t = time.localtime(0) 216 216 t = (1999, 10, 29, 23, 59, 58, t[6], t[7], t[8]) 217 tmpl = time.strftime( '%x %X', t)217 tmpl = time.strftime(format, t) 218 218 return tmpl.replace('1999', 'YYYY', 1).replace('99', 'YY', 1) \ 219 219 .replace('10', 'MM', 1).replace('29', 'DD', 1) \ 220 220 .replace('23', 'hh', 1).replace('59', 'mm', 1) \ … … 233 233 weekdays[t.tm_wday], t.tm_mday, months[t.tm_mon - 1], t.tm_year, 234 234 t.tm_hour, t.tm_min, t.tm_sec) 235 235 236 def parse_date(text ):236 def parse_date(text, default_format='%x %X'): 237 237 seconds = None 238 238 text = text.strip() 239 for format in [ '%x %X', '%x, %X', '%X %x', '%X, %x', '%x', '%c',239 for format in [default_format, '%x %X', '%x, %X', '%X %x', '%X, %x', '%x', '%c', 240 240 '%b %d, %Y']: 241 241 try: 242 242 date = time.strptime(text, format) -
trac/web/main.py
149 149 from trac import __version__ 150 150 hdf['trac'] = { 151 151 'version': __version__, 152 'time': format_datetime( ),152 'time': format_datetime(None, env.config.get('i18n', 'datetime_format')), 153 153 'time.gmt': http_date() 154 154 } 155 155 hdf['trac.href'] = {