From 0577860f3ac344fcd5477eea2a19c659f88cf076 Mon Sep 17 00:00:00 2001
From: Matthew Taylor <mewtaylor@gmail.com>
Date: Thu, 15 Oct 2015 23:11:09 -0400
Subject: [PATCH] Rename `renderer` to `render`

and make it a method that returns a component, rather than an object with a render method
---
 src/lib/render.jsx                  | 23 +++++++++++++++++++++++
 src/lib/renderer.jsx                | 13 -------------
 src/main.jsx                        |  6 +++---
 src/views/about/about.jsx           |  4 ++--
 src/views/components/components.jsx |  4 ++--
 src/views/hoc/hoc.jsx               |  4 ++--
 src/views/splash/splash.jsx         |  4 ++--
 7 files changed, 34 insertions(+), 24 deletions(-)
 create mode 100644 src/lib/render.jsx
 delete mode 100644 src/lib/renderer.jsx

diff --git a/src/lib/render.jsx b/src/lib/render.jsx
new file mode 100644
index 000000000..ed62ebe41
--- /dev/null
+++ b/src/lib/render.jsx
@@ -0,0 +1,23 @@
+var ReactDOM = require('react-dom');
+var ReactIntl = require('react-intl');
+var IntlProvider = ReactIntl.IntlProvider;
+
+module.exports = function (jsx, element) {
+    // Get locale and messages from global namespace (see "init.js")
+    var locale = window._locale;
+    var messages = window._translations[locale];
+
+    // Render component
+    var component = ReactDOM.render(
+        <IntlProvider locale={locale} messages={messages}>
+            {jsx}
+        </IntlProvider>,
+        element
+    );
+
+    // If in production, provide list of rendered components
+    if (process.env.NODE_ENV != 'production') {
+        window._renderedComponents = window._renderedComponents || [];
+        window._renderedComponents.push(component);
+    }
+};
diff --git a/src/lib/renderer.jsx b/src/lib/renderer.jsx
deleted file mode 100644
index 9a470cd21..000000000
--- a/src/lib/renderer.jsx
+++ /dev/null
@@ -1,13 +0,0 @@
-var ReactDOM = require('react-dom');
-
-var Renderer = {
-    render: function (jsx, toElement) {
-        var rendered = ReactDOM.render(jsx, toElement);
-        if (process.env.NODE_ENV != 'production') {
-            window.renderedComponents = window.renderedComponents || [];
-            window.renderedComponents.push(rendered);
-        }
-    }
-};
-
-module.exports = Renderer;
diff --git a/src/main.jsx b/src/main.jsx
index 8372f839a..575115c7f 100644
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -1,9 +1,9 @@
-var Renderer = require('./lib/renderer.jsx');
+var Render = require('./lib/render.jsx');
 
 require('./main.scss');
 
 var Navigation = require('./components/navigation/navigation.jsx');
 var Footer = require('./components/footer/footer.jsx');
 
-Renderer.render(<Navigation />, document.getElementById('navigation'));
-Renderer.render(<Footer />, document.getElementById('footer'));
+Render(<Navigation />, document.getElementById('navigation'));
+Render(<Footer />, document.getElementById('footer'));
diff --git a/src/views/about/about.jsx b/src/views/about/about.jsx
index 47f7289e7..80d690f11 100644
--- a/src/views/about/about.jsx
+++ b/src/views/about/about.jsx
@@ -1,5 +1,5 @@
 var React = require('react');
-var Renderer = require('../../lib/renderer.jsx');
+var Render = require('../../lib/render.jsx');
 
 require('./about.scss');
 
@@ -14,4 +14,4 @@ var About = React.createClass({
     }
 });
 
-Renderer.render(<About />, document.getElementById('view'));
+Render(<About />, document.getElementById('view'));
diff --git a/src/views/components/components.jsx b/src/views/components/components.jsx
index 63c3b8554..aa6d1577d 100644
--- a/src/views/components/components.jsx
+++ b/src/views/components/components.jsx
@@ -1,5 +1,5 @@
 var React = require('react');
-var Renderer = require('../../lib/renderer.jsx');
+var Render = require('../../lib/render.jsx');
 
 var Box = require('../../components/box/box.jsx');
 var Button = require('../../components/forms/button.jsx');
@@ -37,4 +37,4 @@ var Components = React.createClass({
     }
 });
 
-Renderer.render(<Components />, document.getElementById('view'));
+Render(<Components />, document.getElementById('view'));
diff --git a/src/views/hoc/hoc.jsx b/src/views/hoc/hoc.jsx
index b46b9678f..0326b7b17 100644
--- a/src/views/hoc/hoc.jsx
+++ b/src/views/hoc/hoc.jsx
@@ -1,5 +1,5 @@
 var React = require('react');
-var Renderer = require('../../lib/renderer.jsx');
+var Render = require('../../lib/render.jsx');
 
 require('./hoc.scss');
 
@@ -133,4 +133,4 @@ var Hoc = React.createClass({
     }
 });
 
-Renderer.render(<Hoc />, document.getElementById('view'));
+Render(<Hoc />, document.getElementById('view'));
diff --git a/src/views/splash/splash.jsx b/src/views/splash/splash.jsx
index 09aeafe6a..ef5c90111 100644
--- a/src/views/splash/splash.jsx
+++ b/src/views/splash/splash.jsx
@@ -1,5 +1,5 @@
 var React = require('react');
-var Renderer = require('../../lib/renderer.jsx');
+var Render = require('../../lib/render.jsx');
 
 var Api = require('../../mixins/api.jsx');
 var Session = require('../../mixins/session.jsx');
@@ -73,4 +73,4 @@ var Splash = React.createClass({
     }
 });
 
-Renderer.render(<Splash />, document.getElementById('view'));
+Render(<Splash />, document.getElementById('view'));