mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge pull request #1029 from ferferga/globalize-cm

Browse source 
Globalize shouldn't require ConnectionManager
This commit is contained in:
dkanada 2020-04-07 02:41:51 +09:00 • committed by GitHub
commit e0c798acf6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/scripts/globalize.js
View file

@ -1,4 +1,4 @@
define(['connectionManager', 'userSettings', 'events'], function (connectionManager, userSettings, events) { define(['userSettings', 'events'], function (userSettings, events) {
'use strict'; 'use strict';
var fallbackCulture = 'en-us'; var fallbackCulture = 'en-us';
@ -253,7 +253,6 @@ define(['connectionManager', 'userSettings', 'events'], function (connectionMana
updateCurrentCulture(); updateCurrentCulture();
events.on(connectionManager, 'localusersignedin', updateCurrentCulture);
events.on(userSettings, 'change', function (e, name) { events.on(userSettings, 'change', function (e, name) {
if (name === 'language' || name === 'datetimelocale') { if (name === 'language' || name === 'datetimelocale') {
updateCurrentCulture(); updateCurrentCulture();
@ -269,6 +268,7 @@ define(['connectionManager', 'userSettings', 'events'], function (connectionMana
defaultModule: defaultModule, defaultModule: defaultModule,
getCurrentLocale: getCurrentLocale, getCurrentLocale: getCurrentLocale,
getCurrentDateTimeLocale: getCurrentDateTimeLocale, getCurrentDateTimeLocale: getCurrentDateTimeLocale,
register: register register: register,
updateCurrentCulture: updateCurrentCulture
}; };
}); });

3
src/scripts/site.js
View file

@ -452,6 +452,9 @@ var AppInfo = {};
require(["autoFocuser"], function(autoFocuser) { require(["autoFocuser"], function(autoFocuser) {
autoFocuser.enable(); autoFocuser.enable();
}); });
require(['globalize', 'connectionManager', 'events'], function (globalize, connectionManager, events) {
events.on(connectionManager, 'localusersignedin', globalize.updateCurrentCulture);
});
}); });
}); });
} }