From 34beaa569bfb32f1607375f1d5a22859322060d2 Mon Sep 17 00:00:00 2001 From: enahum Date: Tue, 24 May 2016 09:36:27 -0300 Subject: 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 --- utils/config.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'utils/config.go') 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 { -- cgit v1.2.3-1-g7c22