Skip to content

Commit 75d1b5b

Browse files
Jason ToddJason Todd
authored andcommitted
js changes to load the tz data
1 parent 67fb5c5 commit 75d1b5b

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

config/filemanager.config.default.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
},
3030
"formatter": {
3131
"datetime": {
32-
"skeleton": "yMMMdHm"
32+
"raw": "MMM dd, y, HH:mm:ss z",
33+
"timeZone": "America/New_York"
3334
}
3435
},
3536
"filetree": {

src/js/filemanager.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,9 @@ $.richFilemanagerPlugin = function(element, pluginOptions)
362362
$.get(baseUrl + '/libs/cldrjs/cldr-numbers/' + lang + '/numbers.json'),
363363
$.get(baseUrl + '/libs/cldrjs/cldr-core/supplemental/likelySubtags.json'),
364364
$.get(baseUrl + '/libs/cldrjs/cldr-core/supplemental/timeData.json'),
365-
$.get(baseUrl + '/libs/cldrjs/cldr-core/supplemental/weekData.json')
365+
$.get(baseUrl + '/libs/cldrjs/cldr-core/supplemental/weekData.json'),
366+
$.get(baseUrl + '/libs/cldrjs/cldr-core/supplemental/metaZones.json'),
367+
$.get(baseUrl + '/libs/cldrjs/cldr-dates/' + lang + '/timeZoneNames.json')
366368
).fail(function () {
367369
fm.error('CLDR files for "' + lang + '" language do not exist!');
368370
}).then(function () {
@@ -372,6 +374,13 @@ $.richFilemanagerPlugin = function(element, pluginOptions)
372374
});
373375
}).then(Globalize.load).then(function () {
374376
globalize = Globalize(lang);
377+
}).then(function() {
378+
return $.when($.get(baseUrl + '/libs/iana-tz-data-2018.5/iana-tz-data/iana-tz-data.json')
379+
).fail(function () {
380+
fm.error('Failed to load IANA timeZone data!');
381+
}).then(function (tz_data) {
382+
Globalize.loadTimeZone(tz_data);
383+
});
375384
});
376385
});
377386
};

0 commit comments

Comments
 (0)