Move custom loader to main.jsx

So that it's only done once.
This commit is contained in:
Matthew Taylor 2015-12-16 10:43:37 -05:00
parent 6ff652e788
commit 8c374e096d
3 changed files with 6 additions and 6 deletions

View file

@ -2,17 +2,11 @@ var ReactDOM = require('react-dom');
var ReactIntl = require('react-intl'); var ReactIntl = require('react-intl');
var IntlProvider = ReactIntl.IntlProvider; var IntlProvider = ReactIntl.IntlProvider;
var customLanguages = require('./custom-locales.json');
var render = function (jsx, element) { var render = function (jsx, element) {
// Get locale and messages from global namespace (see "init.js") // Get locale and messages from global namespace (see "init.js")
var locale = window._locale; var locale = window._locale;
var messages = window._translations[locale]; var messages = window._translations[locale];
if (customLanguages[locale] !== undefined) {
ReactIntl.addLocaleData(customLanguages[locale]);
}
// Render component // Render component
var component = ReactDOM.render( var component = ReactDOM.render(
<IntlProvider locale={locale} messages={messages}> <IntlProvider locale={locale} messages={messages}>

View file

@ -1,3 +1,6 @@
var ReactIntl = require('react-intl');
var customLanguages = require('../custom-locales.json');
var render = require('./lib/render.jsx'); var render = require('./lib/render.jsx');
require('./main.scss'); require('./main.scss');
@ -5,5 +8,8 @@ require('./main.scss');
var Navigation = require('./components/navigation/navigation.jsx'); var Navigation = require('./components/navigation/navigation.jsx');
var Footer = require('./components/footer/footer.jsx'); var Footer = require('./components/footer/footer.jsx');
for (var locale in customLanguages) {
ReactIntl.addLocaleData(customLanguages[locale]);
}
render(<Navigation />, document.getElementById('navigation')); render(<Navigation />, document.getElementById('navigation'));
render(<Footer />, document.getElementById('footer')); render(<Footer />, document.getElementById('footer'));