diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-05-24 10:39:56 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-05-24 10:39:56 -0400 |
| commit | 4ae7128ecb66cdddeb9d40a24970c6552814c18b (patch) | |
| tree | b979b83b3c25be0c817b3b4f4dc4d17735801048 /utils/config.go | |
| parent | 3b5a5110c72d7eb2c94d9f428145383b15bd0e4e (diff) | |
| download | chat-4ae7128ecb66cdddeb9d40a24970c6552814c18b.tar.gz chat-4ae7128ecb66cdddeb9d40a24970c6552814c18b.tar.bz2 chat-4ae7128ecb66cdddeb9d40a24970c6552814c18b.zip | |
Revert "PLT-1800 Load server side locale from the config.json (#3076)"
This reverts commit 34beaa569bfb32f1607375f1d5a22859322060d2.
Diffstat (limited to 'utils/config.go')
| -rw-r--r-- | utils/config.go | 3 |
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 { |