From 0ec02aaace993c6862b22c3a9f3cb880c2a9dcd4 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Thu, 10 Dec 2015 10:32:52 +0100 Subject: [PATCH] Show date after 7 days, not 14 days. --- .../app/lib/app_post/pretty_date.coffee | 2 +- public/assets/tests/ui.js | 129 ++++++++++-------- 2 files changed, 71 insertions(+), 60 deletions(-) diff --git a/app/assets/javascripts/app/lib/app_post/pretty_date.coffee b/app/assets/javascripts/app/lib/app_post/pretty_date.coffee index 99661ef11..e654a4e6b 100644 --- a/app/assets/javascripts/app/lib/app_post/pretty_date.coffee +++ b/app/assets/javascripts/app/lib/app_post/pretty_date.coffee @@ -29,7 +29,7 @@ class App.PrettyDate 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 * 7 ) return App.i18n.translateDate(time) # days diff --git a/public/assets/tests/ui.js b/public/assets/tests/ui.js index ae225d4d0..10277383d 100644 --- a/public/assets/tests/ui.js +++ b/public/assets/tests/ui.js @@ -1,101 +1,112 @@ // pretty date -test( "check pretty date", function() { +test("check pretty date", function() { var current = new Date() // past - var result = App.PrettyDate.humanTime( current ); - equal( result, 'just now', 'just now') + var result = App.PrettyDate.humanTime(current); + equal(result, 'just now', 'just now') - result = App.PrettyDate.humanTime( current - 15000 ); - equal( result, 'just now', 'just now') + result = App.PrettyDate.humanTime(current - 15000); + equal(result, 'just now', 'just now') - result = App.PrettyDate.humanTime( current - 60000 ); - equal( result, '1 minute ago', '1 min ago') + result = App.PrettyDate.humanTime(current - 60000); + equal(result, '1 minute ago', '1 min ago') - result = App.PrettyDate.humanTime( current - ( 2 * 60000 ) ); - equal( result, '2 minutes ago', '2 min ago') + result = App.PrettyDate.humanTime(current - (2 * 60000)); + equal(result, '2 minutes ago', '2 min ago') - result = App.PrettyDate.humanTime( current - ( 60000 * 60 ) ) ; - equal( result, '1 hour ago', '1 hour') + result = App.PrettyDate.humanTime(current - (60000 * 60)) ; + equal(result, '1 hour ago', '1 hour') - result = App.PrettyDate.humanTime( current - ( 60000 * 60 * 2 ) ); - equal( result, '2 hours ago', '2 hours') + result = App.PrettyDate.humanTime(current - (60000 * 60 * 2)); + equal(result, '2 hours ago', '2 hours') - result = App.PrettyDate.humanTime( current - ( 60000 * 60 * 2.5 ) ); - equal( result, '2 hours 30 minutes ago', '2.5 hours') + result = App.PrettyDate.humanTime(current - (60000 * 60 * 2.5)); + equal(result, '2 hours 30 minutes ago', '2.5 hours') - result = App.PrettyDate.humanTime( current - ( 60000 * 60 * 12.5 ) ); - equal( result, '12 hours ago', '12.5 hours') + result = App.PrettyDate.humanTime(current - (60000 * 60 * 12.5)); + equal(result, '12 hours ago', '12.5 hours') - result = App.PrettyDate.humanTime( current - ( 60000 * 60 * 24 ) ) ; - equal( result, '1 day ago', '1 day') + result = App.PrettyDate.humanTime(current - (60000 * 60 * 24)) ; + equal(result, '1 day ago', '1 day') - result = App.PrettyDate.humanTime( current - ( 60000 * 60 * 24 * 2 ) ); - equal( result, '2 days ago', '2 days') + result = App.PrettyDate.humanTime(current - (60000 * 60 * 24 * 2)); + equal(result, '2 days ago', '2 days') - result = App.PrettyDate.humanTime( current - ( 60000 * 60 * 24 * 2 ) - ( 60000 * 5 ) ); - equal( result, '2 days ago', '2 days') + result = App.PrettyDate.humanTime(current - (60000 * 60 * 24 * 2) - (60000 * 5)); + equal(result, '2 days ago', '2 days') - result = App.PrettyDate.humanTime( current - ( 60000 * 60 * 24 * 2.5 ) ); - equal( result, '2 days 12 hours ago', '2.5 days') + result = App.PrettyDate.humanTime(current - (60000 * 60 * 24 * 2.5)); + equal(result, '2 days 12 hours ago', '2.5 days') - result = App.PrettyDate.humanTime( current - ( 60000 * 60 * 24 * 2.5 ) - ( 60000 * 5 ) ); - equal( result, '2 days 12 hours ago', '2.5 days') + result = App.PrettyDate.humanTime(current - (60000 * 60 * 24 * 2.5) - (60000 * 5)); + equal(result, '2 days 12 hours ago', '2.5 days') - result = App.PrettyDate.humanTime( current - ( 60000 * 60 * 24 * 10.5 ) ); - equal( result, '10 days ago', '10.5 days') - - result = App.PrettyDate.humanTime( current - ( 60000 * 60 * 24 * 30 ) ); - var pastDate = new Date(current - ( 60000 * 60 * 24 * 30 )) + result = App.PrettyDate.humanTime(current - (60000 * 60 * 24 * 10.5)); + var pastDate = new Date(current - (60000 * 60 * 24 * 10.5)) var dd = pastDate.getDate(); - if( dd<10 ) { + if(dd<10) { dd = '0' + dd } var mm = pastDate.getMonth() + 1; - if( mm<10 ) { + if(mm<10) { mm = '0' + mm } var yyyy = pastDate.getFullYear(); // mm/dd/yyyy - equal( result, mm+'/'+dd+'/'+yyyy, '30 days') + equal(result, mm+'/'+dd+'/'+yyyy, '10.5 days') + + result = App.PrettyDate.humanTime(current - (60000 * 60 * 24 * 30)); + var pastDate = new Date(current - (60000 * 60 * 24 * 30)) + 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, '30 days') // future current = new Date() - result = App.PrettyDate.humanTime( current ); - equal( result, 'just now', 'just now') + result = App.PrettyDate.humanTime(current); + 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() + 55000); + equal(result, 'just now', 'just now') - result = App.PrettyDate.humanTime( current.getTime() + 65000 ); - equal( result, 'in 1 minute', 'in 1 min') + result = App.PrettyDate.humanTime(current.getTime() + 65000); + equal(result, 'in 1 minute', 'in 1 min') - result = App.PrettyDate.humanTime( current.getTime() + ( 2 * 65000 ) ); - equal( result, 'in 2 minutes', 'in 2 min') + result = App.PrettyDate.humanTime(current.getTime() + (2 * 65000)); + equal(result, 'in 2 minutes', 'in 2 min') - result = App.PrettyDate.humanTime( current.getTime() + ( 60500 * 60 ) ) ; - equal( result, 'in 1 hour', 'in 1 hour') + result = App.PrettyDate.humanTime(current.getTime() + (60500 * 60)) ; + equal(result, 'in 1 hour', 'in 1 hour') - result = App.PrettyDate.humanTime( current.getTime() + ( 60050 * 60 * 2 ) ); - equal( result, 'in 2 hours', 'in 2 hours') + result = App.PrettyDate.humanTime(current.getTime() + (60050 * 60 * 2)); + equal(result, 'in 2 hours', 'in 2 hours') - result = App.PrettyDate.humanTime( current.getTime() + ( 60050 * 60 * 2.5 ) ); - equal( result, 'in 2 hours 30 minutes', 'in 2.5 hours') + result = App.PrettyDate.humanTime(current.getTime() + (60050 * 60 * 2.5)); + equal(result, 'in 2 hours 30 minutes', 'in 2.5 hours') - result = App.PrettyDate.humanTime( current.getTime() + ( 60050 * 60 * 24 ) ) ; - equal( result, 'in 1 day', 'in 1 day') + result = App.PrettyDate.humanTime(current.getTime() + (60050 * 60 * 24)) ; + equal(result, 'in 1 day', 'in 1 day') - result = App.PrettyDate.humanTime( current.getTime() + ( 60050 * 60 * 24 * 2 ) ); - equal( result, 'in 2 days', 'in 2 days') + result = App.PrettyDate.humanTime(current.getTime() + (60050 * 60 * 24 * 2)); + equal(result, 'in 2 days', 'in 2 days') - result = App.PrettyDate.humanTime( current.getTime() + ( 60050 * 60 * 24 * 2.5 ) ); - equal( result, 'in 2 days 12 hours', 'in 2.5 days') + result = App.PrettyDate.humanTime(current.getTime() + (60050 * 60 * 24 * 2.5)); + equal(result, 'in 2 days 12 hours', 'in 2.5 days') - result = App.PrettyDate.humanTime( current.getTime() + ( 60050 * 60 * 24 * 5.5 ) ); - equal( result, 'in 5 days 12 hours', 'in 30.5 days') + result = App.PrettyDate.humanTime(current.getTime() + (60050 * 60 * 24 * 5.5)); + equal(result, 'in 5 days 12 hours', 'in 30.5 days') - result = App.PrettyDate.humanTime( current.getTime() + ( 60050 * 60 * 24 * 30.5 ) ); - equal( result, 'in 30 days', 'in 30.5 days') + result = App.PrettyDate.humanTime(current.getTime() + (60050 * 60 * 24 * 30.5)); + equal(result, 'in 30 days', 'in 30.5 days') });