Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Do not use force timezone value in display timezone

This commit is contained in:
Vinoth Kannan 2018-10-11 19:49:40 +05:30
parent 7a41a783a4
commit b54d940182
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js
View File

@ -53,9 +53,8 @@
}
});
var relativeTime = relativeTime.tz(
options.forceTimezone || moment.tz.guess()
);
var displayTimezone = moment.tz.guess();
var relativeTime = relativeTime.tz(displayTimezone);
if (
options.format !== "YYYY-MM-DD HH:mm:ss" &&
@ -78,7 +77,7 @@
var displayedTime = relativeTime.replace(
"TZ",
_formatTimezone(options.forceTimezone || moment.tz.guess()).join(": ")
_formatTimezone(displayTimezone).join(": ")
);
$element