Changeset 10583
- Timestamp:
- Feb 22, 2011, 11:16:09 AM (13 years ago)
- Location:
- trunk/trac
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/trac/ticket/tests/functional.py
r10571 r10583 455 455 tc.formvalue('modifymilestone', 'completed', True) 456 456 cdate = datetime.now(tz=utc) + timedelta(days=1) 457 cdate_string = format_date(cdate, tzinfo=localtz )457 cdate_string = format_date(cdate, tzinfo=localtz, locale=locale_en) 458 458 tc.formvalue('modifymilestone', 'completeddate', cdate_string) 459 459 tc.submit('save') -
trunk/trac/util/datefmt.py
r10571 r10583 488 488 values.setdefault('s', 0) 489 489 490 if values['h'] < 12 and period == 'pm': 491 values['h'] += 12 490 if period and values['h'] <= 12: 491 if period == 'am': 492 values['h'] %= 12 493 elif period == 'pm': 494 values['h'] = values['h'] % 12 + 12 492 495 493 496 return tzinfo.localize(datetime(values['y'], values['M'], values['d'], -
trunk/trac/util/tests/datefmt.py
r10571 r10583 381 381 self.assertEqual(expected_minute, 382 382 datefmt.parse_date(u'2010-8-28 01:45下午', tz, 383 zh_CN)) 384 385 def test_i18n_parse_date_datetime_meridiem(self): 386 tz = datefmt.timezone('GMT +2:00') 387 expected_am = datetime.datetime(2011, 2, 22, 0, 45, 56, 0, tz) 388 expected_pm = datetime.datetime(2011, 2, 22, 12, 45, 56, 0, tz) 389 en_US = Locale.parse('en_US') 390 zh_CN = Locale.parse('zh_CN') 391 392 self.assertEqual(expected_am, 393 datefmt.parse_date('Feb 22, 2011 0:45:56 AM', tz, 394 en_US)) 395 self.assertEqual(expected_am, 396 datefmt.parse_date('Feb 22, 2011 12:45:56 AM', tz, 397 en_US)) 398 self.assertEqual(expected_am, 399 datefmt.parse_date(u'2011-2-22 上午0:45:56', tz, 400 zh_CN)) 401 self.assertEqual(expected_am, 402 datefmt.parse_date(u'2011-2-22 上午12:45:56', tz, 403 zh_CN)) 404 405 self.assertEqual(expected_pm, 406 datefmt.parse_date('Feb 22, 2011 0:45:56 PM', tz, 407 en_US)) 408 self.assertEqual(expected_pm, 409 datefmt.parse_date('Feb 22, 2011 12:45:56 PM', tz, 410 en_US)) 411 self.assertEqual(expected_pm, 412 datefmt.parse_date(u'2011-2-22 下午0:45:56', tz, 413 zh_CN)) 414 self.assertEqual(expected_pm, 415 datefmt.parse_date(u'2011-2-22 下午12:45:56', tz, 383 416 zh_CN)) 384 417 … … 457 490 tz = datefmt.timezone('GMT +2:00') 458 491 t = datetime.datetime(2010, 8, 28, 11, 45, 56, 123456, datefmt.utc) 492 tz_t = datetime.datetime(2010, 8, 28, 13, 45, 56, 123456, tz) 459 493 en_US = Locale.parse('en_US') 460 494 … … 472 506 473 507 # Converting babel's format to strftime format 474 self.assertEqual( '08/28/10 13:45:56',508 self.assertEqual(tz_t.strftime('%x %X').decode('utf-8'), 475 509 datefmt.format_datetime(t, 'medium', tz)) 476 self.assertEqual('08/28/10', datefmt.format_date(t, 'medium', tz)) 477 self.assertEqual('13:45:56', datefmt.format_time(t, 'medium', tz)) 510 self.assertEqual(tz_t.strftime('%x').decode('utf-8'), 511 datefmt.format_date(t, 'medium', tz)) 512 self.assertEqual(tz_t.strftime('%X').decode('utf-8'), 513 datefmt.format_time(t, 'medium', tz)) 478 514 479 515
Note:
See TracChangeset
for help on using the changeset viewer.