diff --git a/app/assets/javascripts/darkswarm/filters/dates.js.coffee b/app/assets/javascripts/darkswarm/filters/dates.js.coffee index 91efe89d1e..8793ddefd8 100644 --- a/app/assets/javascripts/darkswarm/filters/dates.js.coffee +++ b/app/assets/javascripts/darkswarm/filters/dates.js.coffee @@ -1,10 +1,15 @@ +@API_DATETIME_FORMAT = "YYYY-MM-DD HH:mm:SS Z" + Darkswarm.filter "date_in_words", -> - (date) -> - moment(date).fromNow() + (date, dateFormat) -> + dateFormat ?= @API_DATETIME_FORMAT + moment(date, dateFormat).fromNow() Darkswarm.filter "sensible_timeframe", (date_in_wordsFilter)-> - (date) -> - if moment().add(2, 'days') < moment(date) + (date, dateFormat) -> + dateFormat ?= @API_DATETIME_FORMAT + + if moment().add(2, 'days') < moment(date, dateFormat) t 'orders_open' else t('closing') + date_in_wordsFilter(date)