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 #2709 from techAPJ/patch-2 

FIX: allow localization in timestamp
This commit is contained in:
Robin Ward 2014-08-27 11:46:21 -04:00
parent 009dc7ded3 3a76f9e79f
commit 443f3812ab
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/lib/formatter.js
View File

@ -80,9 +80,9 @@ longDateNoYear = function(dt) {
if (!dt) return;
if ((new Date()).getFullYear() !== dt.getFullYear()) {
return moment(dt).format("MMM D, 'YY LT");
return moment(dt).format(I18n.t("dates.long_date_with_year"));
} else {
return moment(dt).format("MMM D, LT");
return moment(dt).format(I18n.t("dates.long_date_without_year"));
}
};

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

@ -35,6 +35,8 @@ en:
long_no_year_no_time: "MMM D"
long_with_year: "MMM D, YYYY h:mm a"
long_with_year_no_time: "MMM D, YYYY"
long_date_with_year: "MMM D, 'YY LT"
long_date_without_year: "MMM D, LT"
tiny:
half_a_minute: "< 1m"
less_than_x_seconds: