From 3c005557e67bb88f9786d4a2e3dc9cef74efa477 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Sat, 30 Aug 2014 11:34:33 +0530 Subject: [PATCH] FIX: use short date format for post navigator --- .../javascripts/discourse/controllers/topic-entrance.js.es6 | 4 ++-- config/locales/client.en.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/topic-entrance.js.es6 b/app/assets/javascripts/discourse/controllers/topic-entrance.js.es6 index 074d856b95e..8e47064411c 100644 --- a/app/assets/javascripts/discourse/controllers/topic-entrance.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic-entrance.js.es6 @@ -8,12 +8,12 @@ function entranceDate(dt, showTime) { if (dt.getYear() === today.getYear()) { // No year return moment(dt).format( - showTime ? I18n.t("dates.long_no_year") : I18n.t("dates.long_no_year_no_time") + showTime ? I18n.t("dates.long_date_without_year") : I18n.t("dates.long_no_year_no_time") ); } return moment(dt).format( - showTime ? I18n.t('dates.long_with_year') : I18n.t('dates.long_with_year_no_time') + showTime ? I18n.t('dates.long_date_with_year') : I18n.t('dates.long_date_with_year_without_time') ); } diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index d4bc9579c1e..18bbbb6cbff 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -37,6 +37,7 @@ en: long_with_year_no_time: "MMM D, YYYY" long_date_with_year: "MMM D, 'YY LT" long_date_without_year: "MMM D, LT" + long_date_with_year_without_time: "MMM D, 'YY" tiny: half_a_minute: "< 1m" less_than_x_seconds: