MCorange/wings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply timezone cleaning to final result, closes #2546

Browse Source
This commit is contained in:
Dane Everitt 2020-10-19 16:13:59 -07:00
parent 13058ad64b
commit 560c832cc6
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/config_system.go
View File

@ -211,12 +211,14 @@ func (sc *SystemConfiguration) ConfigureTimezone() error {
return nil return nil
} }
sc.Timezone = regexp.MustCompile(`\s+$`).ReplaceAllString(string(matches[1]), "") sc.Timezone = string(matches[1])
} else { } else {
sc.Timezone = string(b) sc.Timezone = string(b)
} }
} }
sc.Timezone = regexp.MustCompile(`[^a-z_/]+/i`).ReplaceAllString(sc.Timezone, "")
_, err := time.LoadLocation(sc.Timezone) _, err := time.LoadLocation(sc.Timezone)
return errors.Wrap(err, fmt.Sprintf("the supplied timezone %s is invalid", sc.Timezone)) return errors.Wrap(err, fmt.Sprintf("the supplied timezone %s is invalid", sc.Timezone))