diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-05-03 12:05:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-03 12:05:24 +0200 |
| commit | 58ac5ae643dc57ffd20017c54e7be523deaef156 (patch) | |
| tree | 491e4afab8ab269096f6f68a3dfab08433954cda /app/javascript/flavours/glitch/components | |
| parent | cb9a919ff28294a2f1cf3642a165ad433cbf856b (diff) | |
| parent | fa22b8ed229f93de1236a74d4df4a0b5fa57dddd (diff) | |
Merge pull request #1761 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/components')
3 files changed, 3 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/components/common_counter.js b/app/javascript/flavours/glitch/components/common_counter.js index e10cd9b76..dd9b62de9 100644 --- a/app/javascript/flavours/glitch/components/common_counter.js +++ b/app/javascript/flavours/glitch/components/common_counter.js @@ -25,7 +25,7 @@ export function counterRenderer(counterType, isBold = true) { return (displayNumber, pluralReady) => ( <FormattedMessage id='account.statuses_counter' - defaultMessage='{count, plural, one {{counter} Toot} other {{counter} Toots}}' + defaultMessage='{count, plural, one {{counter} Post} other {{counter} Posts}}' values={{ count: pluralReady, counter: renderCounter(displayNumber), diff --git a/app/javascript/flavours/glitch/components/status_prepend.js b/app/javascript/flavours/glitch/components/status_prepend.js index 1661ca8f5..d85009362 100644 --- a/app/javascript/flavours/glitch/components/status_prepend.js +++ b/app/javascript/flavours/glitch/components/status_prepend.js @@ -38,7 +38,7 @@ export default class StatusPrepend extends React.PureComponent { switch (type) { case 'featured': return ( - <FormattedMessage id='status.pinned' defaultMessage='Pinned toot' /> + <FormattedMessage id='status.pinned' defaultMessage='Pinned post' /> ); case 'reblogged_by': return ( diff --git a/app/javascript/flavours/glitch/components/status_visibility_icon.js b/app/javascript/flavours/glitch/components/status_visibility_icon.js index e2e0f30b8..07d56c7a8 100644 --- a/app/javascript/flavours/glitch/components/status_visibility_icon.js +++ b/app/javascript/flavours/glitch/components/status_visibility_icon.js @@ -9,7 +9,7 @@ const messages = defineMessages({ public: { id: 'privacy.public.short', defaultMessage: 'Public' }, unlisted: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' }, private: { id: 'privacy.private.short', defaultMessage: 'Followers-only' }, - direct: { id: 'privacy.direct.short', defaultMessage: 'Direct' }, + direct: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' }, }); export default @injectIntl |