scratchfoundation/jquery-timeago
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'Akral/master' into natural_rounding

Browse source 
* Akral/master:
  Natural rounding for days, months and years.
This commit is contained in:
Ryan McGeary 2012-03-07 11:45:49 -05:00
commit a56c87db01
2 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
jquery.timeago.js
View file

@ -77,12 +77,12 @@
minutes < 45 && substitute($l.minutes, Math.round(minutes)) ||
minutes < 90 && substitute($l.hour, 1) ||
hours < 24 && substitute($l.hours, Math.round(hours)) ||
hours < 48 && substitute($l.day, 1) ||
days < 30 && substitute($l.days, Math.floor(days)) ||
days < 60 && substitute($l.month, 1) ||
days < 365 && substitute($l.months, Math.floor(days / 30)) ||
years < 2 && substitute($l.year, 1) ||
substitute($l.years, Math.floor(years));
hours < 42 && substitute($l.day, 1) ||
days < 30 && substitute($l.days, Math.round(days)) ||
days < 45 && substitute($l.month, 1) ||
days < 365 && substitute($l.months, Math.round(days / 30)) ||
years < 1.5 && substitute($l.year, 1) ||
substitute($l.years, Math.round(years));
return $.trim([prefix, words, suffix].join($l.wordSeparator));
},