2 files changed, 7 insertions, 4 deletions
diff --git a/packages/gitbook-core/src/components/I18nProvider.js b/packages/gitbook-core/src/components/I18nProvider.js
index 32fa4a0..89bf3a0 100644
--- a/packages/gitbook-core/src/components/I18nProvider.js
+++ b/packages/gitbook-core/src/components/I18nProvider.js
@@ -4,12 +4,13 @@ const ReactRedux = require('react-redux');
 
 const I18nProvider = React.createClass({
     propTypes: {
-        children: React.PropTypes.node
+        children: React.PropTypes.node,
+        messages: React.PropTypes.object
     },
 
     render() {
-        // TODO
-        const messages = {};
+        let { messages } = this.props;
+        messages = messages.get('en').toJS();
 
         return (
             <intl.IntlProvider locale={'en'} messages={messages}>
diff --git a/packages/gitbook-core/src/reducers/i18n.js b/packages/gitbook-core/src/reducers/i18n.js
index 46df8fc..4ffd129 100644
--- a/packages/gitbook-core/src/reducers/i18n.js
+++ b/packages/gitbook-core/src/reducers/i18n.js
@@ -13,7 +13,9 @@ function reduceI18n(state, action) {
 
     case ACTION_TYPES.I18N_REGISTER_LOCALE:
         return state.merge({
-            messages: state.messages.set(action.locale, Map(action.messages))
+            messages: state.messages.set(action.locale,
+                state.messages.get(action.locale, Map()).merge(action.messages)
+            )
         });
 
     default: