diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-09-03 06:35:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-03 06:35:44 +0200 |
| commit | d19d86fe2b26fb00577d600234c32d726fb199a4 (patch) | |
| tree | d60234de488eb7e4f42dd0c63ec056016edbf6b6 /app | |
| parent | 92a6fa6c90fda809554ae2cac10036202723f5c9 (diff) | |
Change hashtag component in web UI to show numbers for 2 last days (#11742)
To deal with the midnight problem
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/mastodon/components/hashtag.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/components/hashtag.js b/app/javascript/mastodon/components/hashtag.js index f091d7893..2456eac9e 100644 --- a/app/javascript/mastodon/components/hashtag.js +++ b/app/javascript/mastodon/components/hashtag.js @@ -12,11 +12,11 @@ const Hashtag = ({ hashtag }) => ( #<span>{hashtag.get('name')}</span> </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> }} /> + <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']) + hashtag.getIn(['history', 1, 'accounts']))}</strong> }} /> </div> <div className='trends__item__current'> - {shortNumberFormat(hashtag.getIn(['history', 0, 'uses']))} + {shortNumberFormat(hashtag.getIn(['history', 0, 'uses']) + hashtag.getIn(['history', 1, 'uses']))} </div> <div className='trends__item__sparkline'> |