diff options
author | Chris Duarte <csduarte@users.noreply.github.com> | 2018-07-13 11:10:34 -0700 |
---|---|---|
committer | Jesse Hallam <jesse.hallam@gmail.com> | 2018-07-13 14:10:34 -0400 |
commit | 62c64594ccaa0e634023b358758f2a6bf04164ad (patch) | |
tree | da4b1bc0fad6d7091d337676721a01d4f1fa3fc8 /model/user.go | |
parent | 17f211c393772f30922bac595592e3fe60c2ef25 (diff) | |
download | chat-62c64594ccaa0e634023b358758f2a6bf04164ad.tar.gz chat-62c64594ccaa0e634023b358758f2a6bf04164ad.tar.bz2 chat-62c64594ccaa0e634023b358758f2a6bf04164ad.zip |
Add localized timestamp support for email notification (#8674)
* Add localized timestamp support for email notification
* Move localTime logic over to getFormattedPostTime
Diffstat (limited to 'model/user.go')
-rw-r--r-- | model/user.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/model/user.go b/model/user.go index f02b5afa1..3e99c6fa4 100644 --- a/model/user.go +++ b/model/user.go @@ -497,6 +497,14 @@ func (u *User) IsSAMLUser() bool { return u.AuthService == USER_AUTH_SERVICE_SAML } +func (u *User) GetPreferredTimezone() string { + if u.Timezone["useAutomaticTimezone"] == "true" { + return u.Timezone["automaticTimezone"] + } + + return u.Timezone["manualTimezone"] +} + // UserFromJson will decode the input and return a User func UserFromJson(data io.Reader) *User { var user *User |