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: allowes forcing timezone displayed in local-dates

Browse Source 
Use case being you might want to always display a specific timezone, but still have the possibility to show the tooltip with various timezones.
This commit is contained in:
Joffrey JAFFEUX
2018-09-12 15:54:36 +02:00
committed by Guo Xiang Tan
parent 33541c4096
commit 4b3c2490c3
4 changed files with 57 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,10 @@
}
});
var relativeTime = relativeTime.tz(moment.tz.guess());
var relativeTime = relativeTime.tz(
options.forceTimezone || moment.tz.guess()
);
if (
options.format !== "YYYY-MM-DD HH:mm:ss" &&
relativeTime.isBetween(
@ -65,18 +68,18 @@
var joinedPreviews = previews.join("\n");
var displayedTime = relativeTime.replace(
"TZ",
_formatTimezone(options.forceTimezone || moment.tz.guess()).join(": ")
);
$element
.html(html)
.attr("title", joinedPreviews)
.attr("data-tooltip", joinedPreviews)
.addClass("cooked")
.find(".relative-time")
.text(
relativeTime.replace(
"TZ",
_formatTimezone(moment.tz.guess()).join(": ")
)
);
.text(displayedTime);
if (repeat) {
this.timeout = setTimeout(function() {
@ -94,6 +97,7 @@
options.time = $this.attr("data-time");
options.recurring = $this.attr("data-recurring");
options.timezones = $this.attr("data-timezones") || "Etc/UTC";
options.forceTimezone = $this.attr("data-force-timezone");
processElement($this, options);
});

9
plugins/discourse-local-dates/assets/javascripts/lib/discourse-markdown/discourse-local-dates.js.es6
View File

@ -18,6 +18,7 @@ function addLocalDate(buffer, matches, state) {
config.date = parsed.attrs.date;
config.time = parsed.attrs.time;
config.forceTimezone = parsed.attrs.forceTimezone;
config.recurring = parsed.attrs.recurring;
config.format = parsed.attrs.format || config.format;
config.timezones = parsed.attrs.timezones || config.timezones;
@ -28,9 +29,15 @@ function addLocalDate(buffer, matches, state) {
["data-date", state.md.utils.escapeHtml(config.date)],
["data-time", state.md.utils.escapeHtml(config.time)],
["data-format", state.md.utils.escapeHtml(config.format)],
["data-timezones", state.md.utils.escapeHtml(config.timezones)]
["data-timezones", state.md.utils.escapeHtml(config.timezones)],
];
if (config.forceTimezone) {
token.attrs.push(
["data-force-timezone", state.md.utils.escapeHtml(config.forceTimezone)]
);
}
if (config.recurring) {
token.attrs.push([
"data-recurring",