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

UX: display zones without prefix to reduce noise (#9383)

This commit is contained in:
Joffrey JAFFEUX 2020-04-08 11:02:00 +02:00 committed by GitHub
parent 25f95af418
commit 66d375cb1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
View File

@ -87,7 +87,7 @@ export default class LocalDateBuilder {
);
previewedTimezones.push({
timezone: this.localTimezone,
timezone: this._zoneWithoutPrefix(this.localTimezone),
current: true,
formated: this._createDateTimeRange(localDate, this.time)
});
@ -111,7 +111,7 @@ export default class LocalDateBuilder {
}
previewedTimezones.push({
timezone,
timezone: this._zoneWithoutPrefix(timezone),
formated: this._createDateTimeRange(
localDate.datetimeWithZone(timezone),
this.time
@ -121,7 +121,7 @@ export default class LocalDateBuilder {
if (!previewedTimezones.length) {
previewedTimezones.push({
timezone: "Etc/UTC",
timezone: "UTC",
formated: this._createDateTimeRange(
localDate.datetimeWithZone("Etc/UTC"),
this.time

20
plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
View File

@ -309,7 +309,7 @@ QUnit.test("previews", assert => {
{
current: true,
formated: "March 22, 2020 → March 23, 2020",
timezone: "Europe/Paris"
timezone: "Paris"
}
]
}
@ -324,11 +324,11 @@ QUnit.test("previews", assert => {
{
current: true,
formated: "March 22, 2020 → March 23, 2020",
timezone: "Europe/Paris"
timezone: "Paris"
},
{
formated: "March 23, 2020 → March 23, 2020",
timezone: "Australia/Sydney"
timezone: "Sydney"
}
]
}
@ -343,7 +343,7 @@ QUnit.test("previews", assert => {
{
current: true,
formated: "March 22, 2020 → March 23, 2020",
timezone: "Europe/Paris"
timezone: "Paris"
}
]
}
@ -358,7 +358,7 @@ QUnit.test("previews", assert => {
{
current: true,
formated: "March 22, 2020 → March 23, 2020",
timezone: "Europe/Paris"
timezone: "Paris"
}
]
}
@ -373,7 +373,7 @@ QUnit.test("previews", assert => {
{
current: true,
formated: "March 22, 2020 → March 23, 2020",
timezone: "Europe/Paris"
timezone: "Paris"
}
]
}
@ -388,7 +388,7 @@ QUnit.test("previews", assert => {
{
current: true,
formated: "March 22, 2020 11:34 AM",
timezone: "Europe/Paris"
timezone: "Paris"
}
]
}
@ -403,15 +403,15 @@ QUnit.test("previews", assert => {
{
current: true,
formated: "April 7, 2020 → April 8, 2020",
timezone: "Europe/Paris"
timezone: "Paris"
},
{
formated: "April 7, 2020 → April 7, 2020",
timezone: "Europe/London"
timezone: "London"
},
{
formated: "April 7, 2020 → April 7, 2020",
timezone: "Africa/Lagos"
timezone: "Lagos"
}
]
}