diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js.es6 b/app/assets/javascripts/discourse/controllers/bookmark.js.es6 index e46cf63c200..fd61ec759dd 100644 --- a/app/assets/javascripts/discourse/controllers/bookmark.js.es6 +++ b/app/assets/javascripts/discourse/controllers/bookmark.js.es6 @@ -90,7 +90,7 @@ export default Controller.extend(ModalFunctionality, { nextWeekFormatted() { return htmlSafe( 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() { return htmlSafe( 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")) }) ); }, diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 75e9a2f7044..46ac61fbe16 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -40,9 +40,7 @@ en: # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/ time: "HH:mm" # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/ - time_short_day: "ddd HH:mm a" - # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/ - month_day_time: "MMM D, HH:mm a" + time_short_day: "ddd, HH:mm" # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/ timeline_date: "MMM YYYY" # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/ @@ -311,7 +309,7 @@ en: remove: "Remove Bookmark" confirm_clear: "Are you sure you want to clear all your bookmarks from this topic?" save: "Save" - no_timezone: "You have not set a timezone yet. You will not be able to set reminders. Set one up in your profile." + no_timezone: 'You have not set a timezone yet. You will not be able to set reminders. Set one up in your profile.' reminders: at_desktop: "Next time I'm at my desktop" later_today: "Later today
{{date}}" diff --git a/config/locales/client.en_US.yml b/config/locales/client.en_US.yml index 683baf554dd..1f75f5f43e3 100644 --- a/config/locales/client.en_US.yml +++ b/config/locales/client.en_US.yml @@ -4,6 +4,8 @@ en_US: # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/ time: "h:mm a" # 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" # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/ long_no_year: "MMM D h:mm a"