Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2726 from techAPJ/patch-4 

FIX: use short date format for post navigator
This commit is contained in:
Jeff Atwood 2014-08-29 23:11:31 -07:00
parent 70dbad16dc 3c005557e6
commit 7a50ba600a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/controllers/topic-entrance.js.es6
View File

@ -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')
);
}

1
config/locales/client.en.yml
View File

@ -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: