Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improved pretty date (just now).

Browse source
This commit is contained in:
Martin Edenhofer 2015-10-15 13:26:52 +02:00
parent b4e2548150
commit cd69cba3f0
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/app/lib/app_post/pretty_date.coffee
View file

@ -26,6 +26,9 @@ class App.PrettyDate
diff = diff.toString().replace('-', '') diff = diff.toString().replace('-', '')
diff = parseFloat(diff) diff = parseFloat(diff)
if diff < 60
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 * 14 )
return App.i18n.translateDate(time) return App.i18n.translateDate(time)

10
public/assets/tests/ui.js
View file

@ -5,7 +5,10 @@ test( "check pretty date", function() {
// past // past
var result = App.PrettyDate.humanTime( current ); var result = App.PrettyDate.humanTime( current );
equal( result, '0 minutes ago', 'right now') equal( result, 'just now', 'just now')
result = App.PrettyDate.humanTime( current - 15000 );
equal( result, 'just now', 'just now')
result = App.PrettyDate.humanTime( current - 60000 ); result = App.PrettyDate.humanTime( current - 60000 );
equal( result, '1 minute ago', '1 min ago') equal( result, '1 minute ago', '1 min ago')
@ -60,7 +63,10 @@ test( "check pretty date", function() {
// future // future
current = new Date() current = new Date()
result = App.PrettyDate.humanTime( current ); result = App.PrettyDate.humanTime( current );
equal( result, '0 minutes ago', 'right now') equal( result, 'just now', 'just now')
result = App.PrettyDate.humanTime( current.getTime() + 55000 );
equal( result, 'just now', 'just now')
result = App.PrettyDate.humanTime( current.getTime() + 65000 ); result = App.PrettyDate.humanTime( current.getTime() + 65000 );
equal( result, 'in 1 minute', 'in 1 min') equal( result, 'in 1 minute', 'in 1 min')