gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-11-29 19:03:41 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Revert "Fix duplicated counters (fix #32614) (#36785)"

Browse Source 
This reverts commit 84cdb6cc66.
This commit is contained in:
Echo 2025-11-11 18:48:07 +01:00 committed by GitHub
parent 11b75d616a
commit b89e8086cf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
app/javascript/mastodon/features/status/components/detailed_status.tsx
View File

@ -271,17 +271,13 @@ export const DetailedStatus: React.FC<{
to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/reblogs`} to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/reblogs`}
className='detailed-status__link' className='detailed-status__link'
> >
<span className='detailed-status__reblogs'>
<AnimatedNumber value={status.get('reblogs_count')} />
</span>
<FormattedMessage <FormattedMessage
id='status.reblogs' id='status.reblogs'
defaultMessage='{count, plural, one {{counter} boost} other {{counter} boosts}}' defaultMessage='{count, plural, one {boost} other {boosts}}'
values={{ values={{ count: status.get('reblogs_count') }}
count: status.get('reblogs_count'),
counter: (
<span className='detailed-status__reblogs'>
<AnimatedNumber value={status.get('reblogs_count')} />
</span>
),
}}
/> />
</Link> </Link>
); );
@ -295,34 +291,26 @@ export const DetailedStatus: React.FC<{
to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/quotes`} to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/quotes`}
className='detailed-status__link' className='detailed-status__link'
> >
<span className='detailed-status__quotes'>
<AnimatedNumber value={status.get('quotes_count')} />
</span>
<FormattedMessage <FormattedMessage
id='status.quotes' id='status.quotes'
defaultMessage='{count, plural, one {{counter} quote} other {{counter} quotes}}' defaultMessage='{count, plural, one {quote} other {quotes}}'
values={{ values={{ count: status.get('quotes_count') }}
count: status.get('quotes_count'),
counter: (
<span className='detailed-status__quotes'>
<AnimatedNumber value={status.get('quotes_count')} />
</span>
),
}}
/> />
</Link> </Link>
); );
} else { } else {
quotesLink = ( quotesLink = (
<span className='detailed-status__link'> <span className='detailed-status__link'>
<span className='detailed-status__quotes'>
<AnimatedNumber value={status.get('quotes_count')} />
</span>
<FormattedMessage <FormattedMessage
id='status.quotes' id='status.quotes'
defaultMessage='{count, plural, one {{counter} quote} other {{counter} quotes}}' defaultMessage='{count, plural, one {quote} other {quotes}}'
values={{ values={{ count: status.get('quotes_count') }}
count: status.get('quotes_count'),
counter: (
<span className='detailed-status__quotes'>
<AnimatedNumber value={status.get('quotes_count')} />
</span>
),
}}
/> />
</span> </span>
); );
@ -333,17 +321,13 @@ export const DetailedStatus: React.FC<{
to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/favourites`} to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/favourites`}
className='detailed-status__link' className='detailed-status__link'
> >
<span className='detailed-status__favorites'>
<AnimatedNumber value={status.get('favourites_count')} />
</span>
<FormattedMessage <FormattedMessage
id='status.favourites' id='status.favourites'
defaultMessage='{count, plural, one {{counter} favorite} other {{counter} favorites}}' defaultMessage='{count, plural, one {favorite} other {favorites}}'
values={{ values={{ count: status.get('favourites_count') }}
count: status.get('favourites_count'),
counter: (
<span className='detailed-status__favorites'>
<AnimatedNumber value={status.get('favourites_count')} />
</span>
),
}}
/> />
</Link> </Link>
); );