github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-21 18:12:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: compares timezones on utc offset and not name (#6672)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2018-11-27 12:36:19 +01:00
committed by GitHub
parent 54c599c7a3
commit 75dac31323
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.no-module.es6
View File

@ -121,7 +121,9 @@
};
const _applyFormatting = (dateTime, displayedTimezone, options) => {
const sameTimezone = displayedTimezone === moment.tz.guess();
const sameTimezone =
moment.tz(displayedTimezone).utcOffset() ===
moment.tz(moment.tz.guess()).utcOffset();
const inCalendarRange = dateTime.isBetween(
moment().subtract(2, "days"),
moment().add(2, "days")