diff options
| author | enahum <nahumhbl@gmail.com> | 2016-05-27 09:25:37 -0300 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-05-27 08:25:37 -0400 |
| commit | a2c183f401bdf8e9abddd35d4561d42034325046 (patch) | |
| tree | 66565a9e21ad6b47b4dca18113ad9be48bd98492 /utils/config.go | |
| parent | 15e427e806716b372f7fbef12d922f847ccc71b5 (diff) | |
| download | chat-a2c183f401bdf8e9abddd35d4561d42034325046.tar.gz chat-a2c183f401bdf8e9abddd35d4561d42034325046.tar.bz2 chat-a2c183f401bdf8e9abddd35d4561d42034325046.zip | |
PLT-1800 Load server side locale from the config.json (#3092)
* PLT-1800 Load server side locale from the config.json
* Add support for locales with country specifics
* Fix localization on served locale file as plain/text
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 { |