discourse/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-06 11:19:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

UX: clarify old dates with YYYY instead of 'YY (#25661)

Browse Source 
* UX: clarify old dates with YYYY instead of 'YY

* update formatter test
This commit is contained in:
Kris 2024-02-13 18:32:50 -05:00 committed by GitHub
parent 4f75cee6d2
commit 037def8624
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/tests/unit/lib/formatter-test.js
View File

@ -56,7 +56,7 @@ module("Unit | Utility | formatter", function (hooks) {
});
test("formatting medium length dates", function (assert) {
const shortDateYear = shortDateTester("MMM D, 'YY");
const shortDateYear = shortDateTester("MMM D, YYYY");
assert.strictEqual(
strip(formatMins(1.4, { format: "medium", leaveAgo: true })),
@ -152,7 +152,7 @@ module("Unit | Utility | formatter", function (hooks) {
test("formatting tiny dates", function (assert) {
const siteSettings = getOwner(this).lookup("service:site-settings");
const shortDateYear = shortDateTester("MMM 'YY");
const shortDateYear = shortDateTester("MMM YYYY");
siteSettings.relative_date_duration = 14;
assert.strictEqual(formatMins(0), "1m");

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

@ -42,15 +42,15 @@ en:
# Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
full_with_year_no_time: "MMMM Do, YYYY"
# Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
long_date_with_year: "MMM D, 'YY LT"
long_date_with_year: "MMM D, YYYY LT"
# Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
long_date_without_year: "MMM D, LT"
# Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
long_date_with_year_without_time: "MMM D, 'YY"
long_date_with_year_without_time: "MMM D, YYYY"
# Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
long_date_without_year_with_linebreak: "MMM D <br/>LT"
# Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
long_date_with_year_with_linebreak: "MMM D, 'YY <br/>LT"
long_date_with_year_with_linebreak: "MMM D, YYYY <br/>LT"
wrap_ago: "%{date} ago"
wrap_on: "on %{date}"
@ -90,7 +90,7 @@ en:
# Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
date_month: "MMM D"
# Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
date_year: "MMM 'YY"
date_year: "MMM YYYY"
medium:
less_than_x_minutes:
one: "less than %{count} min"
@ -120,7 +120,7 @@ en:
one: "almost %{count} year"
other: "almost %{count} years"
# Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
date_year: "MMM D, 'YY"
date_year: "MMM D, YYYY"
medium_with_ago:
x_minutes:
one: "%{count} min ago"