summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
Diffstat (limited to 'utils')
-rw-r--r--utils/config_test.go9
-rw-r--r--utils/timezone.go25
2 files changed, 34 insertions, 0 deletions
diff --git a/utils/config_test.go b/utils/config_test.go
index 5809422f1..6d6181a3d 100644
--- a/utils/config_test.go
+++ b/utils/config_test.go
@@ -21,6 +21,15 @@ func TestConfig(t *testing.T) {
InitTranslations(cfg.LocalizationSettings)
}
+func TestTimezoneConfig(t *testing.T) {
+ TranslationsPreInit()
+ supportedTimezones := LoadTimezones("timezones.json")
+ assert.Equal(t, len(supportedTimezones) > 0, true)
+
+ supportedTimezones2 := LoadTimezones("timezones_file_does_not_exists.json")
+ assert.Equal(t, len(supportedTimezones2) > 0, true)
+}
+
func TestFindConfigFile(t *testing.T) {
dir, err := ioutil.TempDir("", "")
require.NoError(t, err)
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
+ }
+}