diff options
author | ThibG <thib@sitedethib.com> | 2019-01-16 16:28:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-16 16:28:38 +0100 |
commit | 530d29148ca0c5bf29f6fa516b1ef4f91d95894b (patch) | |
tree | e074e7b778e973b12e754d939cc5e2805eb012d6 /app/javascript/flavours/glitch/components/hashtag.js | |
parent | 077639c27409f897e87522dd18a51801b6cbc40d (diff) | |
parent | 5684cd090caec27729d78c204911348a0cf62cbf (diff) |
Merge pull request #887 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/components/hashtag.js')
-rw-r--r-- | app/javascript/flavours/glitch/components/hashtag.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/components/hashtag.js b/app/javascript/flavours/glitch/components/hashtag.js index 88689cc6c..d75edd994 100644 --- a/app/javascript/flavours/glitch/components/hashtag.js +++ b/app/javascript/flavours/glitch/components/hashtag.js @@ -1,16 +1,16 @@ import React from 'react'; import { Sparklines, SparklinesCurve } from 'react-sparklines'; -import { Link } from 'react-router-dom'; import { FormattedMessage } from 'react-intl'; import ImmutablePropTypes from 'react-immutable-proptypes'; +import Permalink from './permalink'; import { shortNumberFormat } from 'flavours/glitch/util/numbers'; const Hashtag = ({ hashtag }) => ( <div className='trends__item'> <div className='trends__item__name'> - <Link to={`/timelines/tag/${hashtag.get('name')}`}> + <Permalink href={hashtag.get('url')} to={`/timelines/tag/${hashtag.get('name')}`}> #<span>{hashtag.get('name')}</span> - </Link> + </Permalink> <FormattedMessage id='trends.count_by_accounts' defaultMessage='{count} {rawCount, plural, one {person} other {people}} talking' values={{ rawCount: hashtag.getIn(['history', 0, 'accounts']), count: <strong>{shortNumberFormat(hashtag.getIn(['history', 0, 'accounts']))}</strong> }} /> </div> |