Merge branch 'master' into advanced-permissions-phase-1

1 files changed, 25 insertions, 0 deletions

diff --git a/utils/timezone.go b/utils/timezone.go
new file mode 100644
index 000000000..ea5f15140
--- /dev/null
+++ b/utils/timezone.go
@@ -0,0 +1,25 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+package utils
+
+import (
+	"encoding/json"
+	"io/ioutil"
+
+	"github.com/mattermost/mattermost-server/model"
+)
+
+func LoadTimezones(fileName string) model.SupportedTimezones {
+	var supportedTimezones model.SupportedTimezones
+
+	if timezoneFile := FindConfigFile(fileName); timezoneFile == "" {
+		return model.DefaultSupportedTimezones
+	} else if raw, err := ioutil.ReadFile(timezoneFile); err != nil {
+		return model.DefaultSupportedTimezones
+	} else if err := json.Unmarshal(raw, &supportedTimezones); err != nil {
+		return model.DefaultSupportedTimezones
+	} else {
+		return supportedTimezones
+	}
+}