UX: Ensures timezone is used over localTimezone when displaying dates

UX: Ensures timezone is used over localTimezone when displaying dates

diff --git a/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6 b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
index 578bd7a..b424d38 100644
--- a/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
@@ -32,7 +32,7 @@ export default class LocalDateBuilder {
       displayedTimezone = this.displayedTimezone || this.localTimezone;
     } else {
       displayedTimezone =
-        this.displayedTimezone || this.localTimezone || this.timezone;
+        this.displayedTimezone || this.timezone || this.localTimezone;
     }
 
     let localDate = new DateWithZoneHelper({
diff --git a/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6 b/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
index a27d319..b18e636 100644
--- a/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
+++ b/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
@@ -81,7 +81,7 @@ QUnit.test("option[format]", assert => {
   freezeTime({ date: "2020-03-11" }, () => {
     assert.buildsCorrectDate(
       { format: "YYYY" },
-      { formated: "2020" },
+      { formated: "2020 (UTC)" },
       "it uses custom format"
     );
   });

GitHub sha: 6d0ba74b

This commit appears in #9385 which was merged by jjaffeux.