IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: English and US date/time formats

Browse Source
This commit is contained in:
Gerhard Schlager 2019-12-24 12:17:25 +01:00
parent 49c124a12e
commit 52a59b5811
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/controllers/bookmark.js.es6
View File

@ -90,7 +90,7 @@ export default Controller.extend(ModalFunctionality, {
nextWeekFormatted() { nextWeekFormatted() {
return htmlSafe( return htmlSafe(
I18n.t("bookmarks.reminders.next_week", { I18n.t("bookmarks.reminders.next_week", {
date: this.nextWeek().format(I18n.t("dates.month_day_time")) date: this.nextWeek().format(I18n.t("dates.long_no_year"))
}) })
); );
}, },
@ -99,7 +99,7 @@ export default Controller.extend(ModalFunctionality, {
nextMonthFormatted() { nextMonthFormatted() {
return htmlSafe( return htmlSafe(
I18n.t("bookmarks.reminders.next_month", { I18n.t("bookmarks.reminders.next_month", {
date: this.nextMonth().format(I18n.t("dates.month_day_time")) date: this.nextMonth().format(I18n.t("dates.long_no_year"))
}) })
); );
}, },

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

@ -40,9 +40,7 @@ en:
# Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/ # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
time: "HH:mm" time: "HH:mm"
# Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/ # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
time_short_day: "ddd HH:mm a" time_short_day: "ddd, HH:mm"
# Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
month_day_time: "MMM D, HH:mm a"
# Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/ # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
timeline_date: "MMM YYYY" timeline_date: "MMM YYYY"
# Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/ # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
@ -311,7 +309,7 @@ en:
remove: "Remove Bookmark" remove: "Remove Bookmark"
confirm_clear: "Are you sure you want to clear all your bookmarks from this topic?" confirm_clear: "Are you sure you want to clear all your bookmarks from this topic?"
save: "Save" save: "Save"
no_timezone: "You have not set a timezone yet. You will not be able to set reminders. Set one up <a href=\"%{basePath}/my/preferences/profile\">in your profile</a>." no_timezone: 'You have not set a timezone yet. You will not be able to set reminders. Set one up <a href="%{basePath}/my/preferences/profile">in your profile</a>.'
reminders: reminders:
at_desktop: "Next time I'm at my desktop" at_desktop: "Next time I'm at my desktop"
later_today: "Later today <br/>{{date}}" later_today: "Later today <br/>{{date}}"

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

@ -4,6 +4,8 @@ en_US:
# Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/ # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
time: "h:mm a" time: "h:mm a"
# Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/ # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
time_short_day: "ddd, h:mm a"
# Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
timeline_date: "MMM YYYY" timeline_date: "MMM YYYY"
# Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/ # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
long_no_year: "MMM D h:mm a" long_no_year: "MMM D h:mm a"