summaryrefslogtreecommitdiffstats
path: root/utils/config.go
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-06-01 11:56:27 -0400
committerChristopher Speller <crspeller@gmail.com>2016-06-01 11:56:27 -0400
commit786e4dce7d520f79b8cf76939d84678d72941420 (patch)
tree5bb520880d200cba90c5ada250c63144e18c3333 /utils/config.go
parentb00a60ab71b2bd4640c8608d71805ba9caae97d9 (diff)
downloadchat-786e4dce7d520f79b8cf76939d84678d72941420.tar.gz
chat-786e4dce7d520f79b8cf76939d84678d72941420.tar.bz2
chat-786e4dce7d520f79b8cf76939d84678d72941420.zip
Revert "PLT-1800 Load server side locale from the config.json" (#3201)
Diffstat (limited to 'utils/config.go')
-rw-r--r--utils/config.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/utils/config.go b/utils/config.go
index a3969fc40..313b4e29c 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -246,8 +246,7 @@ func getClientConfig(c *model.Config) map[string]string {
props["WebsocketPort"] = fmt.Sprintf("%v", *c.ServiceSettings.WebsocketPort)
props["WebsocketSecurePort"] = fmt.Sprintf("%v", *c.ServiceSettings.WebsocketSecurePort)
- props["DefaultClientLocale"] = *c.LocalizationSettings.DefaultClientLocale
- props["AvailableLocales"] = *c.LocalizationSettings.AvailableLocales
+ props["AllowCorsFrom"] = *c.ServiceSettings.AllowCorsFrom
if IsLicensed {
if *License.Features.CustomBrand {