diff options
| author | enahum <nahumhbl@gmail.com> | 2016-05-24 09:36:27 -0300 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-05-24 08:36:27 -0400 |
| commit | 34beaa569bfb32f1607375f1d5a22859322060d2 (patch) | |
| tree | c5d264e383890c88263db071a555201e4bc8e159 /utils/config.go | |
| parent | 79c0b206895ce6c5ffa498cdc80edbd821ff5469 (diff) | |
| download | chat-34beaa569bfb32f1607375f1d5a22859322060d2.tar.gz chat-34beaa569bfb32f1607375f1d5a22859322060d2.tar.bz2 chat-34beaa569bfb32f1607375f1d5a22859322060d2.zip | |
PLT-1800 Load server side locale from the config.json (#3076)
* PLT-1800 Load server side locale from the config.json
* Add support for locales with country specifics
Diffstat (limited to 'utils/config.go')
| -rw-r--r-- | utils/config.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/utils/config.go b/utils/config.go index 313b4e29c..a3969fc40 100644 --- a/utils/config.go +++ b/utils/config.go @@ -246,7 +246,8 @@ 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["AllowCorsFrom"] = *c.ServiceSettings.AllowCorsFrom + props["DefaultClientLocale"] = *c.LocalizationSettings.DefaultClientLocale + props["AvailableLocales"] = *c.LocalizationSettings.AvailableLocales if IsLicensed { if *License.Features.CustomBrand { |