From e9979954a80a72e3ab68ca52935f5a6ffa163502 Mon Sep 17 00:00:00 2001 From: ferferga Date: Fri, 3 Apr 2020 19:26:59 +0200 Subject: [PATCH 1/3] Apply #1004#issuecomment-605708819 suggestions --- src/scripts/globalize.js | 1 - src/scripts/site.js | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/scripts/globalize.js b/src/scripts/globalize.js index 69bb3aee21..286d5d630c 100644 --- a/src/scripts/globalize.js +++ b/src/scripts/globalize.js @@ -253,7 +253,6 @@ define(['connectionManager', 'userSettings', 'events'], function (connectionMana updateCurrentCulture(); - events.on(connectionManager, 'localusersignedin', updateCurrentCulture); events.on(userSettings, 'change', function (e, name) { if (name === 'language' || name === 'datetimelocale') { updateCurrentCulture(); diff --git a/src/scripts/site.js b/src/scripts/site.js index 5eb3c2a346..83b2eaca15 100644 --- a/src/scripts/site.js +++ b/src/scripts/site.js @@ -452,6 +452,9 @@ var AppInfo = {}; require(["autoFocuser"], function(autoFocuser) { autoFocuser.enable(); }); + require(['globalize', 'connectionManager', 'events'], function (globalize, connectionManager, events) { + events.on(connectionManager, 'localusersignedin', globalize.updateCurrentCulture); + }); }); }); } From 100f7cc8f59d66c61b0cdd8d6236b1295098044a Mon Sep 17 00:00:00 2001 From: ferferga Date: Sat, 4 Apr 2020 20:36:14 +0200 Subject: [PATCH 2/3] Don't require connectionManager --- src/scripts/globalize.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/globalize.js b/src/scripts/globalize.js index 286d5d630c..0088e6cb09 100644 --- a/src/scripts/globalize.js +++ b/src/scripts/globalize.js @@ -1,4 +1,4 @@ -define(['connectionManager', 'userSettings', 'events'], function (connectionManager, userSettings, events) { +define(['userSettings', 'events'], function (userSettings, events) { 'use strict'; var fallbackCulture = 'en-us'; From dcde6bfb5eac733500014bd0cbb154730c26d8a5 Mon Sep 17 00:00:00 2001 From: ferferga Date: Sat, 4 Apr 2020 22:17:21 +0200 Subject: [PATCH 3/3] Export updateCurrentCulture function --- src/scripts/globalize.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/scripts/globalize.js b/src/scripts/globalize.js index 0088e6cb09..2d7d725b5d 100644 --- a/src/scripts/globalize.js +++ b/src/scripts/globalize.js @@ -268,6 +268,7 @@ define(['userSettings', 'events'], function (userSettings, events) { defaultModule: defaultModule, getCurrentLocale: getCurrentLocale, getCurrentDateTimeLocale: getCurrentDateTimeLocale, - register: register + register: register, + updateCurrentCulture: updateCurrentCulture }; });