codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-30 19:08:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2709 from techAPJ/patch-2

Browse source 
FIX: allow localization in timestamp
This commit is contained in:
Robin Ward 2014-08-27 11:46:21 -04:00
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 (!dt) return;
if ((new Date()).getFullYear() !== dt.getFullYear()) { 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 { } 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_no_year_no_time: "MMM D"
long_with_year: "MMM D, YYYY h:mm a" long_with_year: "MMM D, YYYY h:mm a"
long_with_year_no_time: "MMM D, YYYY" long_with_year_no_time: "MMM D, YYYY"
long_date_with_year: "MMM D, 'YY LT"
long_date_without_year: "MMM D, LT"
tiny: tiny:
half_a_minute: "< 1m" half_a_minute: "< 1m"
less_than_x_seconds: less_than_x_seconds: