diff --git a/app/assets/javascripts/discourse/app/components/edit-topic-timer-form.js b/app/assets/javascripts/discourse/app/components/edit-topic-timer-form.js index f7a726d8484..f3d984bcd56 100644 --- a/app/assets/javascripts/discourse/app/components/edit-topic-timer-form.js +++ b/app/assets/javascripts/discourse/app/components/edit-topic-timer-form.js @@ -82,19 +82,20 @@ export default Component.extend({ @discourseComputed() customTimeShortcutOptions() { + const timezone = this.currentUser.resolvedTimezone(this.currentUser); return [ { icon: "far-clock", id: "two_weeks", label: "time_shortcut.two_weeks", - time: startOfDay(now().add(2, "weeks").day(MOMENT_MONDAY)), + time: startOfDay(now(timezone).add(2, "weeks").day(MOMENT_MONDAY)), timeFormatKey: "dates.long_no_year", }, { icon: "far-calendar-plus", id: "six_months", label: "time_shortcut.six_months", - time: startOfDay(now().add(6, "months").startOf("month")), + time: startOfDay(now(timezone).add(6, "months").startOf("month")), timeFormatKey: "dates.long_no_year", }, ];