gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-11-28 18:40:47 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Revert "Fix duplicated counters (fix #32614)" (#36834)
Some checks failed
Check i18n / check-i18n (push) Waiting to run
Details
Chromatic / Run Chromatic (push) Waiting to run
Details
CodeQL / Analyze (actions) (push) Waiting to run
Details
CodeQL / Analyze (javascript) (push) Waiting to run
Details
CodeQL / Analyze (ruby) (push) Waiting to run
Details
Check formatting / lint (push) Waiting to run
Details
JavaScript Linting / lint (push) Waiting to run
Details
Ruby Linting / lint (push) Waiting to run
Details
JavaScript Testing / test (push) Waiting to run
Details
Historical data migration test / test (14-alpine) (push) Waiting to run
Details
Historical data migration test / test (15-alpine) (push) Waiting to run
Details
Historical data migration test / test (16-alpine) (push) Waiting to run
Details
Historical data migration test / test (17-alpine) (push) Waiting to run
Details
Ruby Testing / build (production) (push) Waiting to run
Details
Ruby Testing / build (test) (push) Waiting to run
Details
Ruby Testing / test (.ruby-version) (push) Blocked by required conditions
Details
Ruby Testing / test (3.2) (push) Blocked by required conditions
Details
Ruby Testing / test (3.3) (push) Blocked by required conditions
Details
Ruby Testing / ImageMagick tests (.ruby-version) (push) Blocked by required conditions
Details
Ruby Testing / ImageMagick tests (3.2) (push) Blocked by required conditions
Details
Ruby Testing / ImageMagick tests (3.3) (push) Blocked by required conditions
Details
Ruby Testing / End to End testing (.ruby-version) (push) Blocked by required conditions
Details
Ruby Testing / End to End testing (3.2) (push) Blocked by required conditions
Details
Ruby Testing / End to End testing (3.3) (push) Blocked by required conditions
Details
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions
Details
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Blocked by required conditions
Details
Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Blocked by required conditions
Details
Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions
Details
Ruby Testing / Elastic Search integration testing (3.3, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions
Details
Bundler Audit / security (push) Has been cancelled
Details
CSS Linting / lint (push) Has been cancelled
Details
Haml Linting / lint (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Echo 2025-11-11 19:05:44 +01:00 committed by GitHub
parent 11b75d616a
commit b5a2fe715d
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>
); );