Merge pull request #1950 from mattermost/PLT-7-client-infra-fix

PLT-7 fixing dist build

Makefile

@@ -118,6 +118,8 @@ package:
 	mkdir -p $(DIST_PATH)/web/static/js
 	cp -L web/static/js/*.min.js $(DIST_PATH)/web/static/js/
 	cp -L web/static/js/*.min.js.map $(DIST_PATH)/web/static/js/
+	cp -RL web/static/js/react-intl-2.0.0-beta-2 $(DIST_PATH)/web/static/js/	
+	cp -RL web/static/i18n $(DIST_PATH)/web/static
 	cp -RL web/static/config $(DIST_PATH)/web/static
 	cp -RL web/static/css $(DIST_PATH)/web/static
 	cp -RL web/static/fonts $(DIST_PATH)/web/static

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() {

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 }};

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 {