Show date after 7 days, not 14 days.
This commit is contained in:
parent
0e0ce4b6b1
commit
0ec02aaace
|
@ -29,7 +29,7 @@ class App.PrettyDate
|
||||||
if diff < 60
|
if diff < 60
|
||||||
return App.i18n.translateInline('just now')
|
return App.i18n.translateInline('just now')
|
||||||
|
|
||||||
if direction is 'past' && !escalation && diff > ( 60 * 60 * 24 * 14 )
|
if direction is 'past' && !escalation && diff > ( 60 * 60 * 24 * 7 )
|
||||||
return App.i18n.translateDate(time)
|
return App.i18n.translateDate(time)
|
||||||
|
|
||||||
# days
|
# days
|
||||||
|
|
|
@ -44,7 +44,18 @@ test( "check pretty date", function() {
|
||||||
equal(result, '2 days 12 hours ago', '2.5 days')
|
equal(result, '2 days 12 hours ago', '2.5 days')
|
||||||
|
|
||||||
result = App.PrettyDate.humanTime(current - (60000 * 60 * 24 * 10.5));
|
result = App.PrettyDate.humanTime(current - (60000 * 60 * 24 * 10.5));
|
||||||
equal( result, '10 days ago', '10.5 days')
|
var pastDate = new Date(current - (60000 * 60 * 24 * 10.5))
|
||||||
|
var dd = pastDate.getDate();
|
||||||
|
if(dd<10) {
|
||||||
|
dd = '0' + dd
|
||||||
|
}
|
||||||
|
var mm = pastDate.getMonth() + 1;
|
||||||
|
if(mm<10) {
|
||||||
|
mm = '0' + mm
|
||||||
|
}
|
||||||
|
var yyyy = pastDate.getFullYear();
|
||||||
|
// mm/dd/yyyy
|
||||||
|
equal(result, mm+'/'+dd+'/'+yyyy, '10.5 days')
|
||||||
|
|
||||||
result = App.PrettyDate.humanTime(current - (60000 * 60 * 24 * 30));
|
result = App.PrettyDate.humanTime(current - (60000 * 60 * 24 * 30));
|
||||||
var pastDate = new Date(current - (60000 * 60 * 24 * 30))
|
var pastDate = new Date(current - (60000 * 60 * 24 * 30))
|
||||||
|
|
Loading…
Reference in a new issue