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

Topic list dates formatting changes: use Dec '12 and Jan 21

Browse source
This commit is contained in:
Neil Lalonde 2014-01-29 15:45:06 -05:00
parent 946e837542
commit b5d0031105
18 changed files with 35 additions and 16 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

@ -96,7 +96,7 @@ Discourse.Formatter = (function(){
};
shortDateNoYear = function(date) {
return moment(date).shortDateNoYear();
return moment(date).format(I18n.t("dates.tiny.date_month"));
};
tinyDateYear = function(date) {
@ -261,7 +261,7 @@ Discourse.Formatter = (function(){
if ((new Date()).getFullYear() !== date.getFullYear()) {
displayDate = shortDate(date);
} else {
displayDate = moment(date).shortDateNoYear();
displayDate = shortDateNoYear(date);
}
} else {
displayDate = relativeAgeMediumSpan(distance, leaveAgo);

3
config/locales/client.cs.yml
View file

@ -59,7 +59,8 @@ cs:
one: "1r"
few: "%{count}r"
other: "%{count}let"
date_year: "D MMM 'YY"
date_month: "MMM D"
date_year: "MMM 'YY"
medium:
x_minutes:
one: "1 minuta"

2
config/locales/client.da.yml
View file

@ -49,6 +49,8 @@ da:
almost_x_years:
one: "1å"
other: "%{count}å"
date_month: "MMM D"
date_year: "MMM 'YY"
medium:
x_minutes:
one: "1 min"

3
config/locales/client.de.yml
View file

@ -49,7 +49,8 @@ de:
almost_x_years:
one: "1J"
other: "%{count}J"
date_year: "D MMM 'YY"
date_month: "MMM D"
date_year: "MMM 'YY"
medium:
x_minutes:
one: "1 Minute"

3
config/locales/client.en.yml
View file

@ -49,7 +49,8 @@ en:
almost_x_years:
one: "1y"
other: "%{count}y"
date_year: "D MMM 'YY"
date_month: "MMM D"
date_year: "MMM 'YY"
medium:
x_minutes:
one: "1 min"

3
config/locales/client.es.yml
View file

@ -51,7 +51,8 @@ es:
almost_x_years:
one: "1a"
other: "%{count}a"
date_year: "D MMM 'YY"
date_month: "MMM D"
date_year: "MMM 'YY"
medium:
x_minutes:
one: "1 minuto"

3
config/locales/client.fr.yml
View file

@ -53,7 +53,8 @@ fr:
almost_x_years:
one: "1y"
other: "%{count}a"
date_year: "D MMM 'YY"
date_month: "MMM D"
date_year: "MMM 'YY"
medium:
x_minutes:
one: "1 min"

3
config/locales/client.it.yml
View file

@ -49,7 +49,8 @@ it:
almost_x_years:
one: "1a"
other: "%{count}a"
date_year: "D MMM 'YY"
date_month: "MMM D"
date_year: "MMM 'YY"
medium:
x_minutes:
one: "1 minuto"

3
config/locales/client.ja.yml
View file

@ -49,7 +49,8 @@ ja:
almost_x_years:
one: "1y"
other: "%{count}y"
date_year: "D MMM 'YY"
date_month: "MMM D"
date_year: "MMM 'YY"
medium:
x_minutes:
one: "1分"

1
config/locales/client.ko.yml
View file

@ -50,6 +50,7 @@ ko:
one: "거의 1년"
other: "거의 %{count}년"
date_year: "'YY M/D"
date_month: "MMM D"
medium:
x_minutes:
one: "1분"

3
config/locales/client.nl.yml
View file

@ -53,7 +53,8 @@ nl:
almost_x_years:
one: 1j
other: "%{count}j"
date_year: "D MMM 'YY"
date_month: "MMM D"
date_year: "MMM 'YY"
medium:
x_minutes:
one: 1 min

2
config/locales/client.pseudo.yml
View file

@ -43,6 +43,8 @@ pseudo:
almost_x_years:
one: '[[ 1ý ]]'
other: '[[ %{count}ý ]]'
date_month: "MMM D"
date_year: "MMM 'YY"
medium:
x_minutes:
one: '[[ 1 ɱíɳ ]]'

3
config/locales/client.pt_BR.yml
View file

@ -49,7 +49,8 @@ pt_BR:
almost_x_years:
one: "1y"
other: "%{count}y"
date_year: "D MMM 'YY"
date_month: "MMM D"
date_year: "MMM 'YY"
medium:
x_minutes:
one: "1 minuto"

3
config/locales/client.ru.yml
View file

@ -72,7 +72,8 @@ ru:
other: '%{count}лет'
few: '%{count}лет'
many: '%{count}лет'
date_year: "D MMM 'YY"
date_month: "MMM D"
date_year: "MMM 'YY"
medium:
x_minutes:
one: '1 минута'

3
config/locales/client.sv.yml
View file

@ -49,7 +49,8 @@ sv:
almost_x_years:
one: "1y"
other: "%{count}y"
date_year: "D MMM 'YY"
date_month: "MMM D"
date_year: "MMM 'YY"
medium:
x_minutes:
one: "1 min"

1
config/locales/client.zh_CN.yml
View file

@ -49,6 +49,7 @@ zh_CN:
almost_x_years:
one: "1年"
other: "%{count}年"
date_month: "MMM-D"
date_year: "YY-MM-D"
medium:
x_minutes:

2
config/locales/client.zh_TW.yml
View file

@ -49,6 +49,8 @@ zh_TW:
almost_x_years:
one: "1 年"
other: "%{count} 年"
date_month: "MMM D"
date_year: "MMM 'YY"
medium:
x_minutes:
one: "1 分鐘"

6
test/javascripts/lib/formatter_test.js
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() {
@ -65,7 +65,7 @@ test("formating medium length dates", function() {
equal(strip(formatDays(4.85)), "4 days");
equal(strip(formatDays(6)), shortDate(6));
equal(strip(formatDays(100)), shortDate(100)); // eg: 23 Jan
equal(strip(formatDays(100)), shortDate(100)); // eg: Jan 23
equal(strip(formatDays(500)), shortDateYear(500));
equal($(formatDays(0)).attr("title"), moment().format('MMMM D, YYYY h:mma'));
@ -81,7 +81,7 @@ test("formating medium length dates", function() {
test("formating tiny dates", function() {
var shortDateYear = function(days){
return moment().subtract('days', days).format("D MMM 'YY");
return moment().subtract('days', days).format("MMM 'YY");
};
format = "tiny";