diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-02-01 14:44:17 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-02-01 14:44:17 -0800 |
| commit | b4ec6900510077253290e361d1a706e5368a45de (patch) | |
| tree | 6fc7c131fa7aa5f32e3aba8102416aa23c65963d /web/react/components/search_results_header.jsx | |
| parent | ea71731f838fc010cfc7511c09875184d1b2396b (diff) | |
| parent | f28486c4553f7f4bccf7bf69153c2f12699705f9 (diff) | |
| download | chat-b4ec6900510077253290e361d1a706e5368a45de.tar.gz chat-b4ec6900510077253290e361d1a706e5368a45de.tar.bz2 chat-b4ec6900510077253290e361d1a706e5368a45de.zip | |
Fixing merge
Diffstat (limited to 'web/react/components/search_results_header.jsx')
| -rw-r--r-- | web/react/components/search_results_header.jsx | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/web/react/components/search_results_header.jsx b/web/react/components/search_results_header.jsx index 581976494..45f56f65a 100644 --- a/web/react/components/search_results_header.jsx +++ b/web/react/components/search_results_header.jsx @@ -3,6 +3,9 @@ import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; import Constants from '../utils/constants.jsx'; + +import {FormattedMessage} from 'mm-intl'; + var ActionTypes = Constants.ActionTypes; export default class SearchResultsHeader extends React.Component { @@ -34,10 +37,20 @@ export default class SearchResultsHeader extends React.Component { } render() { - var title = 'Search Results'; + var title = ( + <FormattedMessage + id='search_header.results' + defaultMessage='Search Results' + /> + ); if (this.props.isMentionSearch) { - title = 'Recent Mentions'; + title = ( + <FormattedMessage + id='search_header.title2' + defaultMessage='Recent Mentions' + /> + ); } return ( |