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

UX: remove "at" word from relative dates in local dates

Browse Source 
Previously we would render "Today at 2:42 PM"
Now we render "Today 2:42 PM"

This also introduces new strings so it can be properly translated

Finally it introduces tests so we can make sure this keeps working
This commit is contained in:
Sam
2018-10-31 11:55:31 +11:00
parent d6f89a85ef
commit df62b48d51
3 changed files with 52 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,6 +56,26 @@
var displayTimezone = moment.tz.guess();
var relativeTime = relativeTime.tz(displayTimezone);
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;
};
var relativeFormat = {
sameDay: d("today"),
nextDay: d("tomorrow"),
lastDay: d("yesterday"),
sameElse: "L"
};
if (
options.format !== "YYYY-MM-DD HH:mm:ss" &&
relativeTime.isBetween(
@ -63,7 +83,7 @@
moment().add(2, "day")
)
) {
relativeTime = relativeTime.calendar();
relativeTime = relativeTime.calendar(null, relativeFormat);
} else {
relativeTime = relativeTime.format(options.format);
}