From 67fb5c55dd07dc0df54ccef61552fb1e5864f7fb Mon Sep 17 00:00:00 2001
From: Jason Todd <Jason.Todd@addepar.com>
Date: Wed, 9 Jan 2019 20:51:48 -0500
Subject: [PATCH 1/2] Add submodule

---
 .gitmodules                           | 3 +++
 libs/iana-tz-data-2018.5/iana-tz-data | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 .gitmodules
 create mode 160000 libs/iana-tz-data-2018.5/iana-tz-data

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..11a82adb
--- /dev/null
+++ b/.gitmodules
@@ -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
diff --git a/libs/iana-tz-data-2018.5/iana-tz-data b/libs/iana-tz-data-2018.5/iana-tz-data
new file mode 160000
index 00000000..e53a3fc9
--- /dev/null
+++ b/libs/iana-tz-data-2018.5/iana-tz-data
@@ -0,0 +1 @@
+Subproject commit e53a3fc986fc230281e0002014f41dca27fc26e9

From 75d1b5b145c3ae8184abf3dcbf2ac6052d5c98ec Mon Sep 17 00:00:00 2001
From: Jason Todd <Jason.Todd@addepar.com>
Date: Thu, 10 Jan 2019 00:29:44 -0500
Subject: [PATCH 2/2] js changes to load the tz data

---
 config/filemanager.config.default.json |  3 ++-
 src/js/filemanager.js                  | 11 ++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/config/filemanager.config.default.json b/config/filemanager.config.default.json
index 39d588bd..1f205d6e 100644
--- a/config/filemanager.config.default.json
+++ b/config/filemanager.config.default.json
@@ -29,7 +29,8 @@
     },
     "formatter": {
         "datetime": {
-            "skeleton": "yMMMdHm"
+            "raw": "MMM dd, y, HH:mm:ss z",
+            "timeZone": "America/New_York"
         }
     },
     "filetree": {
diff --git a/src/js/filemanager.js b/src/js/filemanager.js
index bdf1561d..42f5239f 100644
--- a/src/js/filemanager.js
+++ b/src/js/filemanager.js
@@ -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 () {
@@ -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);
+                    });
                 });
             });
 	};