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_item.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_item.jsx')
| -rw-r--r-- | web/react/components/search_results_item.jsx | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/web/react/components/search_results_item.jsx b/web/react/components/search_results_item.jsx index f235cac0a..0ad091d5b 100644 --- a/web/react/components/search_results_item.jsx +++ b/web/react/components/search_results_item.jsx @@ -10,6 +10,8 @@ import * as TextFormatting from '../utils/text_formatting.jsx'; import Constants from '../utils/constants.jsx'; +import {FormattedMessage, FormattedDate} from 'mm-intl'; + export default class SearchResultsItem extends React.Component { constructor(props) { super(props); @@ -42,7 +44,12 @@ export default class SearchResultsItem extends React.Component { if (channel) { channelName = channel.display_name; if (channel.type === 'D') { - channelName = 'Direct Message'; + channelName = ( + <FormattedMessage + id='search_item.direct' + defaultMessage='Direct Message' + /> + ); } } @@ -69,7 +76,15 @@ export default class SearchResultsItem extends React.Component { <li className='col__name'><strong><UserProfile userId={this.props.post.user_id} /></strong></li> <li className='col'> <time className='search-item-time'> - {utils.displayDate(this.props.post.create_at) + ' ' + utils.displayTime(this.props.post.create_at)} + <FormattedDate + value={this.props.post.create_at} + day='numeric' + month='long' + year='numeric' + hour12={true} + hour='2-digit' + minute='2-digit' + /> </time> </li> <li> @@ -78,7 +93,10 @@ export default class SearchResultsItem extends React.Component { className='search-item__jump' onClick={this.handleClick} > - {'Jump'} + <FormattedMessage + id='search_item.jump' + defaultMessage='Jump' + /> </a> </li> <li> @@ -89,7 +107,7 @@ export default class SearchResultsItem extends React.Component { > <span className='comment-icon' - dangerouslySetInnerHTML={{__html: Constants.COMMENT_ICON}} + dangerouslySetInnerHTML={{__html: Constants.REPLY_ICON}} /> </a> </li> |