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

FIX: improves code, tests and utc handling of local-dates (#6644)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2018-11-22 17:19:24 +01:00
committed by GitHub
parent 56478166e5
commit 3ff3bb6e2a
8 changed files with 435 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,12 +12,16 @@
}
var relativeTime;
var dateAndTime = options.date;
if (options.time) {
dateAndTime = dateAndTime + " " + options.time;
}
if (options.timezone) {
relativeTime = moment
.tz(options.date + " " + options.time, options.timezone)
.utc();
relativeTime = moment.tz(dateAndTime, options.timezone).utc();
} else {
relativeTime = moment.utc(options.date + " " + options.time);
relativeTime = moment.utc(dateAndTime);
}
if (relativeTime < moment().utc()) {
@ -35,9 +39,7 @@
}
var previews = options.timezones.split("|").map(function(timezone) {
var dateTime = relativeTime
.tz(timezone)
.format(options.format || "LLL");
var dateTime = relativeTime.tz(timezone).format(options.format);
var timezoneParts = _formatTimezone(timezone);
@ -53,20 +55,23 @@
}
});
var displayTimezone = moment.tz.guess();
var relativeTime = relativeTime.tz(displayTimezone);
var relativeTime = relativeTime.tz(options.displayedZone);
var d = function(key) {
var translated = I18n.t("discourse_local_dates.relative_dates." + key, {
time: "LT"
});
translated = translated
.split("LT")
.map(function(w) {
return "[" + w + "]";
})
.join("LT");
return translated;
if (options.time) {
return translated
.split("LT")
.map(function(w) {
return "[" + w + "]";
})
.join("LT");
} else {
return "[" + translated.replace(" LT", "") + "]";
}
};
var relativeFormat = {
@ -77,7 +82,7 @@
};
if (
options.format !== "YYYY-MM-DD HH:mm:ss" &&
options.calendar &&
relativeTime.isBetween(
moment().subtract(1, "day"),
moment().add(2, "day")
@ -97,7 +102,7 @@
var displayedTime = relativeTime.replace(
"TZ",
_formatTimezone(displayTimezone).join(": ")
_formatTimezone(options.displayedZone).join(": ")
);
$element
@ -119,12 +124,16 @@
var $this = $(this);
var options = {};
options.format = $this.attr("data-format");
options.time = $this.attr("data-time");
options.format =
$this.attr("data-format") || (options.time ? "LLL" : "LL");
options.date = $this.attr("data-date");
options.time = $this.attr("data-time") || "00:00:00";
options.recurring = $this.attr("data-recurring");
options.timezones = $this.attr("data-timezones");
options.timezones = $this.attr("data-timezones") || "Etc/UTC";
options.timezone = $this.attr("data-timezone");
options.calendar = ($this.attr("data-calendar") || "on") === "on";
options.displayedZone =
$this.attr("data-displayed-zone") || moment.tz.guess();
processElement($this, options);
});