Skip to content

add timezone support #371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add timezone support #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67fb5c5
Add submodule
Jan 10, 2019
75d1b5b
js changes to load the tz data
Jan 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "libs/iana-tz-data-2018.5/iana-tz-data"]
path = libs/iana-tz-data-2018.5/iana-tz-data
url = https://github.com/rxaviers/iana-tz-data.git
3 changes: 2 additions & 1 deletion config/filemanager.config.default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
},
"formatter": {
"datetime": {
"skeleton": "yMMMdHm"
"raw": "MMM dd, y, HH:mm:ss z",
"timeZone": "America/New_York"
}
},
"filetree": {
Expand Down
1 change: 1 addition & 0 deletions libs/iana-tz-data-2018.5/iana-tz-data
Open in desktop
Submodule iana-tz-data added at e53a3f
11 changes: 10 additions & 1 deletion src/js/filemanager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,9 @@ $.richFilemanagerPlugin = function(element, pluginOptions)
$.get(baseUrl + '/libs/cldrjs/cldr-numbers/' + lang + '/numbers.json'),
$.get(baseUrl + '/libs/cldrjs/cldr-core/supplemental/likelySubtags.json'),
$.get(baseUrl + '/libs/cldrjs/cldr-core/supplemental/timeData.json'),
$.get(baseUrl + '/libs/cldrjs/cldr-core/supplemental/weekData.json')
$.get(baseUrl + '/libs/cldrjs/cldr-core/supplemental/weekData.json'),
$.get(baseUrl + '/libs/cldrjs/cldr-core/supplemental/metaZones.json'),
$.get(baseUrl + '/libs/cldrjs/cldr-dates/' + lang + '/timeZoneNames.json')
).fail(function () {
fm.error('CLDR files for "' + lang + '" language do not exist!');
}).then(function () {
Expand All @@ -372,6 +374,13 @@ $.richFilemanagerPlugin = function(element, pluginOptions)
});
}).then(Globalize.load).then(function () {
globalize = Globalize(lang);
}).then(function() {
return $.when($.get(baseUrl + '/libs/iana-tz-data-2018.5/iana-tz-data/iana-tz-data.json')
).fail(function () {
fm.error('Failed to load IANA timeZone data!');
}).then(function (tz_data) {
Globalize.loadTimeZone(tz_data);
});
});
});
};
Expand Down