diff options
author | Corey Hulen <corey@hulen.com> | 2016-01-21 16:56:33 -0600 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-01-21 16:56:33 -0600 |
commit | a9860a0ce8f1ce08dab9aaff0ec0c996de4f0e4c (patch) | |
tree | 08bd3966bae4b7dd0d54c12fd2046193fa1b0212 /web | |
parent | 6c86bae5d54a2f24733512e6c9eee78a832a45e3 (diff) | |
parent | ec5b278fca848172cb505793628aaf8a27406292 (diff) | |
download | chat-a9860a0ce8f1ce08dab9aaff0ec0c996de4f0e4c.tar.gz chat-a9860a0ce8f1ce08dab9aaff0ec0c996de4f0e4c.tar.bz2 chat-a9860a0ce8f1ce08dab9aaff0ec0c996de4f0e4c.zip |
Merge pull request #1950 from mattermost/PLT-7-client-infra-fix
PLT-7 fixing dist build
Diffstat (limited to 'web')
-rw-r--r-- | web/react/pages/login.jsx | 2 | ||||
-rw-r--r-- | web/templates/head.html | 3 | ||||
-rw-r--r-- | web/web.go | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/web/react/pages/login.jsx b/web/react/pages/login.jsx index e0957a65b..38852ad7c 100644 --- a/web/react/pages/login.jsx +++ b/web/react/pages/login.jsx @@ -5,8 +5,6 @@ import * as Client from '../utils/client.jsx'; import Login from '../components/login.jsx'; var IntlProvider = ReactIntl.IntlProvider; -ReactIntl.addLocaleData(ReactIntlLocaleData.en); -ReactIntl.addLocaleData(ReactIntlLocaleData.es); class Root extends React.Component { constructor() { diff --git a/web/templates/head.html b/web/templates/head.html index 89d0dc92b..feff908ce 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -58,6 +58,9 @@ <style id="antiClickjack">body{display:none !important;}</style> <script> + ReactIntl.addLocaleData(ReactIntlLocaleData.en); + ReactIntl.addLocaleData(ReactIntlLocaleData.es); + window.mm_config = {{ .ClientCfg }}; window.mm_license = {{ .ClientLicense }}; window.mm_team = {{ .Team }}; diff --git a/web/web.go b/web/web.go index 391b268cd..f73860b67 100644 --- a/web/web.go +++ b/web/web.go @@ -51,6 +51,7 @@ func (me *HtmlTemplatePage) Render(c *api.Context, w http.ResponseWriter) { me.Locale = me.User.Locale } + me.Props["Locale"] = me.Locale me.SessionTokenIndex = c.SessionTokenIndex if err := Templates.ExecuteTemplate(w, me.TemplateName, me); err != nil { |