Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.4, 2.0.5, and 2.1

stable i18n: avoid splitting 'ago' on ages

Changeset c3c972425438…

Parent f1cc89a9e939…

by Wagner Bruna

Changes to one file · Browse files at c3c972425438 Showing diff from parent f1cc89a9e939 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​util/​hglib.py Stacked
 
500
501
502
503
504
505
506
507
508
509
 
 
 
 
 
 
 
 
 
510
511
512
 
526
527
528
529
 
530
531
532
 
500
501
502
 
 
 
 
 
 
 
503
504
505
506
507
508
509
510
511
512
513
514
 
528
529
530
 
531
532
533
534
@@ -500,13 +500,15 @@
 def utctime(date):   return time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(date[0]))   -agescales = [((lambda n: ngettext("%d year", "%d years", n)), 3600 * 24 * 365), - ((lambda n: ngettext("%d month", "%d months", n)), 3600 * 24 * 30), - ((lambda n: ngettext("%d week", "%d weeks", n)), 3600 * 24 * 7), - ((lambda n: ngettext("%d day", "%d days", n)), 3600 * 24), - ((lambda n: ngettext("%d hour", "%d hours", n)), 3600), - ((lambda n: ngettext("%d minute", "%d minutes", n)), 60), - ((lambda n: ngettext("%d second", "%d seconds", n)), 1)] +agescales = [ + ((lambda n: ngettext("%d year ago", "%d years ago", n)), 3600 * 24 * 365), + ((lambda n: ngettext("%d month ago", "%d months ago", n)), 3600 * 24 * 30), + ((lambda n: ngettext("%d week ago", "%d weeks ago", n)), 3600 * 24 * 7), + ((lambda n: ngettext("%d day ago", "%d days ago", n)), 3600 * 24), + ((lambda n: ngettext("%d hour ago", "%d hours ago", n)), 3600), + ((lambda n: ngettext("%d minute ago", "%d minutes ago", n)), 60), + ((lambda n: ngettext("%d second ago", "%d seconds ago", n)), 1), + ]    def age(date):   '''turn a (timestamp, tzoff) tuple into an age string.''' @@ -526,7 +528,7 @@
  for t, s in agescales:   n = delta // s   if n >= 2 or s == 1: - return _('%s ago') % (t(n) % n) + return t(n) % n    def username(user):   author = templatefilters.person(user)