diff --git a/app/assets/javascripts/discourse/helpers/period-title.js.es6 b/app/assets/javascripts/discourse/helpers/period-title.js.es6 index 36ca2a69205..3753f0c167c 100644 --- a/app/assets/javascripts/discourse/helpers/period-title.js.es6 +++ b/app/assets/javascripts/discourse/helpers/period-title.js.es6 @@ -1,5 +1,3 @@ -import { iconHTML } from 'discourse/helpers/fa-icon'; - const TITLE_SUBS = { all: 'all_time', yearly: 'this_year', @@ -7,7 +5,26 @@ const TITLE_SUBS = { daily: 'today', }; -export default Ember.Handlebars.makeBoundHelper(function (period) { +export default Ember.Handlebars.makeBoundHelper(function (period, options) { const title = I18n.t('filters.top.' + (TITLE_SUBS[period] || 'this_week')); - return new Handlebars.SafeString(iconHTML('calendar-o') + " " + title); + if (options.hash.showDateRange) { + var dateString = ""; + switch(period) { + case 'yearly': + dateString = moment().subtract(1, 'year').format(I18n.t('dates.full_with_year_no_time')); + break; + case 'weekly': + dateString = moment().subtract(1, 'week').format(I18n.t('dates.full_no_year_no_time')) + " - " + moment().format(I18n.t('dates.full_no_year_no_time')); + break; + case 'monthly': + dateString = moment().subtract(1, 'month').format(I18n.t('dates.full_no_year_no_time')) + " - " + moment().format(I18n.t('dates.full_no_year_no_time')); + break; + case 'daily': + dateString = moment().format(I18n.t('dates.full_no_year_no_time')); + break; + } + return new Handlebars.SafeString(title + " " + dateString + ""); + } else { + return new Handlebars.SafeString(title); + } }); diff --git a/app/assets/javascripts/discourse/templates/components/period-chooser.hbs b/app/assets/javascripts/discourse/templates/components/period-chooser.hbs index 8f7fddc94f6..570d7034e7a 100644 --- a/app/assets/javascripts/discourse/templates/components/period-chooser.hbs +++ b/app/assets/javascripts/discourse/templates/components/period-chooser.hbs @@ -1,4 +1,4 @@ -