diff options
| author | Samy Pesse <samypesse@gmail.com> | 2016-10-01 23:11:48 +0200 |
|---|---|---|
| committer | Samy Pesse <samypesse@gmail.com> | 2016-10-01 23:11:50 +0200 |
| commit | 9aaf561c4195dd363e66667b3d697694ae134337 (patch) | |
| tree | afdbff0555e7df154788e7cf9eaba8413cfb6aec /packages | |
| parent | 8be4cbc8875e708b1a62035fb91652b891e540ac (diff) | |
| download | gitbook-9aaf561c4195dd363e66667b3d697694ae134337.zip gitbook-9aaf561c4195dd363e66667b3d697694ae134337.tar.gz gitbook-9aaf561c4195dd363e66667b3d697694ae134337.tar.bz2 | |
Complete i18n for search plugin
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/gitbook-core/src/components/I18nProvider.js | 7 | ||||
| -rw-r--r-- | packages/gitbook-core/src/reducers/i18n.js | 4 | ||||
| -rw-r--r-- | packages/gitbook-plugin-theme-default/src/i18n/en.json | 3 |
3 files changed, 8 insertions, 6 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: diff --git a/packages/gitbook-plugin-theme-default/src/i18n/en.json b/packages/gitbook-plugin-theme-default/src/i18n/en.json index cec4b76..b6504d3 100644 --- a/packages/gitbook-plugin-theme-default/src/i18n/en.json +++ b/packages/gitbook-plugin-theme-default/src/i18n/en.json @@ -9,8 +9,7 @@ "SUMMARY_TOGGLE": "Table of Contents", "SEARCH_TOGGLE": "Search", "SEARCH_PLACEHOLDER": "Type to search", - "SEARCH_RESULTS_TITLE": "<span class='search-results-count'></span> results matching \"<span class='search-query'></span>\"", - "SEARCH_NO_RESULTS_TITLE": "No results matching \"<span class='search-query'></span>\"", + "SEARCH_RESULTS_TITLE": "{count, plural, =0 {No results} one {1 result} other {{count} results}} matching \"{query}\"", "FONTSETTINGS_TOGGLE": "Font Settings", "SHARE_TOGGLE": "Share", "SHARE_ON": "Share on {{platform}}", |