gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-09-05 17:31:12 +00:00
Code Issues Actions 34 Packages Projects Releases Wiki Activity

Consolidate labels for quote policy settings (#35893)
Some checks failed
Check i18n / check-i18n (push) Waiting to run
Details
Chromatic / Run Chromatic (push) Waiting to run
Details
CodeQL / Analyze (javascript) (push) Waiting to run
Details
CodeQL / Analyze (ruby) (push) Waiting to run
Details
Crowdin / Upload translations / upload-translations (push) Waiting to run
Details
Check formatting / lint (push) Waiting to run
Details
Haml Linting / 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
CSS Linting / lint (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Claire 2025-08-25 14:30:37 +02:00 committed by GitHub
parent d8c07be021
commit 012450e87d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/mastodon/features/ui/components/visibility_modal.tsx
View File

@ -39,7 +39,7 @@ const messages = defineMessages({
}, },
quoteNobody: { quoteNobody: {
id: 'visibility_modal.quote_nobody', id: 'visibility_modal.quote_nobody',
defaultMessage: 'No one', defaultMessage: 'Just me',
}, },
}); });
@ -302,7 +302,7 @@ const QuotePolicyHelper: FC<{
<p className='visibility-dropdown__helper'> <p className='visibility-dropdown__helper'>
<FormattedMessage <FormattedMessage
id='visibility_modal.helper.private_quoting' id='visibility_modal.helper.private_quoting'
defaultMessage="Follower-only posts can't be quoted." defaultMessage="Follower-only posts authored on Mastodon can't be quoted by others."
/> />
</p> </p>
); );
@ -313,7 +313,7 @@ const QuotePolicyHelper: FC<{
<p className='visibility-dropdown__helper'> <p className='visibility-dropdown__helper'>
<FormattedMessage <FormattedMessage
id='visibility_modal.helper.direct_quoting' id='visibility_modal.helper.direct_quoting'
defaultMessage="Private mentions can't be quoted." defaultMessage="Private mentions authored on Mastodon can't be quoted by others."
/> />
</p> </p>
); );

6
app/javascript/mastodon/locales/en.json
View File

@ -979,15 +979,15 @@
"video.volume_up": "Volume up", "video.volume_up": "Volume up",
"visibility_modal.button_title": "Set visibility", "visibility_modal.button_title": "Set visibility",
"visibility_modal.header": "Visibility and interaction", "visibility_modal.header": "Visibility and interaction",
"visibility_modal.helper.direct_quoting": "Private mentions can't be quoted.", "visibility_modal.helper.direct_quoting": "Private mentions authored on Mastodon can't be quoted by others.",
"visibility_modal.helper.privacy_editing": "Published posts cannot change their visibility.", "visibility_modal.helper.privacy_editing": "Published posts cannot change their visibility.",
"visibility_modal.helper.private_quoting": "Follower-only posts can't be quoted.", "visibility_modal.helper.private_quoting": "Follower-only posts authored on Mastodon can't be quoted by others.",
"visibility_modal.helper.unlisted_quoting": "When people quote you, their post will also be hidden from trending timelines.", "visibility_modal.helper.unlisted_quoting": "When people quote you, their post will also be hidden from trending timelines.",
"visibility_modal.instructions": "Control who can interact with this post. Global settings can be found under <link>Preferences > Other</link>.", "visibility_modal.instructions": "Control who can interact with this post. Global settings can be found under <link>Preferences > Other</link>.",
"visibility_modal.privacy_label": "Privacy", "visibility_modal.privacy_label": "Privacy",
"visibility_modal.quote_followers": "Followers only", "visibility_modal.quote_followers": "Followers only",
"visibility_modal.quote_label": "Change who can quote", "visibility_modal.quote_label": "Change who can quote",
"visibility_modal.quote_nobody": "No one", "visibility_modal.quote_nobody": "Just me",
"visibility_modal.quote_public": "Anyone", "visibility_modal.quote_public": "Anyone",
"visibility_modal.save": "Save" "visibility_modal.save": "Save"
} }

6
config/locales/en.yml
View File

@ -1910,9 +1910,9 @@ en:
ownership: Someone else's post cannot be pinned ownership: Someone else's post cannot be pinned
reblog: A boost cannot be pinned reblog: A boost cannot be pinned
quote_policies: quote_policies:
followers: Only your followers followers: Followers only
nobody: Nobody nobody: Just me
public: Everyone public: Anyone
title: '%{name}: "%{quote}"' title: '%{name}: "%{quote}"'
visibilities: visibilities:
direct: Private mention direct: Private mention