From 786e4dce7d520f79b8cf76939d84678d72941420 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Wed, 1 Jun 2016 11:56:27 -0400 Subject: Revert "PLT-1800 Load server side locale from the config.json" (#3201) --- utils/config.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'utils/config.go') 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 { -- cgit v1.2.3-1-g7c22