diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-05-27 09:01:35 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-05-27 09:01:35 -0400 |
| commit | ec7a273550a1aaf31e80abc90c99d06a94664b5d (patch) | |
| tree | bd0d1080a5ef66b9e7985682919b1c2bd21d4bf1 /utils/config.go | |
| parent | a2c183f401bdf8e9abddd35d4561d42034325046 (diff) | |
| download | chat-ec7a273550a1aaf31e80abc90c99d06a94664b5d.tar.gz chat-ec7a273550a1aaf31e80abc90c99d06a94664b5d.tar.bz2 chat-ec7a273550a1aaf31e80abc90c99d06a94664b5d.zip | |
Revert "PLT-1800 Load server side locale from the config.json" (#3133)
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 { |