diff options
| author | enahum <nahumhbl@gmail.com> | 2016-06-01 09:56:13 -0300 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-06-01 08:56:13 -0400 |
| commit | b00a60ab71b2bd4640c8608d71805ba9caae97d9 (patch) | |
| tree | 02137b19bc56e5041530e710955f039682da43c7 /utils/config.go | |
| parent | 7be2a05cf58c22d1edfab12a2b55569c5e48ab2f (diff) | |
| download | chat-b00a60ab71b2bd4640c8608d71805ba9caae97d9.tar.gz chat-b00a60ab71b2bd4640c8608d71805ba9caae97d9.tar.bz2 chat-b00a60ab71b2bd4640c8608d71805ba9caae97d9.zip | |
PLT-1800 Load server side locale from the config.json (#3135)
* 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
* Remove github.com/cloudfoundry/jibber_jabber as vendor dependency
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 { |