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 #2727 from techAPJ/patch-4 

FIX: use short date format for topic summary
This commit is contained in:
Jeff Atwood 2014-08-29 23:41:16 -07:00
parent 7a50ba600a 289d9e4fe1
commit fb33081c36
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,7 +67,7 @@ en:
almost_x_years:
one: "1y"
other: "%{count}y"
date_month: "D MMM"
date_month: "MMM D"
date_year: "MMM 'YY"
medium:
x_minutes:
@ -79,7 +79,7 @@ en:
x_days:
one: "1 day"
other: "%{count} days"
date_year: "D MMM YYYY"
date_year: "MMM D, 'YY"
medium_with_ago:
x_minutes:
one: "1 min ago"

4
test/javascripts/lib/formatter-test.js.es6
View File

@ -29,7 +29,7 @@ var formatDays = function(days) {
};
var shortDate = function(days){
return moment().subtract(days, 'days').format('D MMM');
return moment().subtract(days, 'days').format('MMM D');
};
test("formating medium length dates", function() {
@ -40,7 +40,7 @@ test("formating medium length dates", function() {
};
var shortDateYear = function(days){
return moment().subtract(days, 'days').format('D MMM YYYY');
return moment().subtract(days, 'days').format("MMM D, 'YY");
};
leaveAgo = true;