Merge branch 'upgrade-react-intl' into 'main'

Upgrade react-intl, remove translationRunner, fix `yarn i18n`

Closes #1553

See merge request soapbox-pub/soapbox!2799

src/components/polls/poll-footer.tsx

@@ -49,7 +49,7 @@ const PollFooter: React.FC<IPollFooter> = ({ poll, showResults, selected }): JSX
     <Stack space={4} data-testid='poll-footer'>
       {(!showResults && poll.multiple) && (
         <Button onClick={handleVote} theme='primary' block>
-          <FormattedMessage id='poll.vote' defaultMessage='Vote' />
+          <FormattedMessage id='poll.vote' defaultMessage='Submit Vote' />
         </Button>
       )}
 

src/components/sidebar-menu.tsx

@@ -19,13 +19,13 @@ import type { Account as AccountEntity } from 'soapbox/types/entities';
 
 const messages = defineMessages({
   followers: { id: 'account.followers', defaultMessage: 'Followers' },
-  follows: { id: 'account.follows', defaultMessage: 'Follows' },
+  follows: { id: 'account.follows', defaultMessage: 'Following' },
   profile: { id: 'account.profile', defaultMessage: 'Profile' },
   preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
-  blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
-  domainBlocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Hidden domains' },
-  mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
-  filters: { id: 'navigation_bar.filters', defaultMessage: 'Muted words' },
+  blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocks' },
+  domainBlocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Domain blocks' },
+  mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Mutes' },
+  filters: { id: 'navigation_bar.filters', defaultMessage: 'Filters' },
   followedTags: { id: 'navigation_bar.followed_tags', defaultMessage: 'Followed hashtags' },
   soapboxConfig: { id: 'navigation_bar.soapbox_config', defaultMessage: 'Soapbox config' },
   accountMigration: { id: 'navigation_bar.account_migration', defaultMessage: 'Move account' },

src/components/status-action-bar.tsx

@@ -43,7 +43,7 @@ const messages = defineMessages({
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Un-repost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be reposted' },
   chat: { id: 'status.chat', defaultMessage: 'Chat with @{name}' },
-  copy: { id: 'status.copy', defaultMessage: 'Copy link to post' },
+  copy: { id: 'status.copy', defaultMessage: 'Copy Link to Post' },
   deactivateUser: { id: 'admin.users.actions.deactivate_user', defaultMessage: 'Deactivate @{name}' },
   delete: { id: 'status.delete', defaultMessage: 'Delete' },
   deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
@@ -55,10 +55,10 @@ const messages = defineMessages({
   direct: { id: 'status.direct', defaultMessage: 'Direct message @{name}' },
   disfavourite: { id: 'status.disfavourite', defaultMessage: 'Disike' },
   edit: { id: 'status.edit', defaultMessage: 'Edit' },
-  embed: { id: 'status.embed', defaultMessage: 'Embed' },
+  embed: { id: 'status.embed', defaultMessage: 'Embed post' },
   external: { id: 'status.external', defaultMessage: 'View post on {domain}' },
   favourite: { id: 'status.favourite', defaultMessage: 'Like' },
-  groupBlockConfirm: { id: 'confirmations.block_from_group.confirm', defaultMessage: 'Ban' },
+  groupBlockConfirm: { id: 'confirmations.block_from_group.confirm', defaultMessage: 'Ban User' },
   groupBlockFromGroupHeading: { id: 'confirmations.block_from_group.heading', defaultMessage: 'Ban From Group' },
   groupBlockFromGroupMessage: { id: 'confirmations.block_from_group.message', defaultMessage: 'Are you sure you want to ban @{name} from the group?' },
   groupModDelete: { id: 'status.group_mod_delete', defaultMessage: 'Delete post from group' },
@@ -70,12 +70,12 @@ const messages = defineMessages({
   more: { id: 'status.more', defaultMessage: 'More' },
   mute: { id: 'account.mute', defaultMessage: 'Mute @{name}' },
   muteConfirm: { id: 'confirmations.mute_group.confirm', defaultMessage: 'Mute' },
-  muteConversation: { id: 'status.mute_conversation', defaultMessage: 'Mute conversation' },
+  muteConversation: { id: 'status.mute_conversation', defaultMessage: 'Mute Conversation' },
   muteGroup: { id: 'group.mute.long_label', defaultMessage: 'Mute Group' },
   muteHeading: { id: 'confirmations.mute_group.heading', defaultMessage: 'Mute Group' },
   muteMessage: { id: 'confirmations.mute_group.message', defaultMessage: 'You are about to mute the group. Do you want to continue?' },
   muteSuccess: { id: 'group.mute.success', defaultMessage: 'Muted the group' },
-  open: { id: 'status.open', defaultMessage: 'Expand this post' },
+  open: { id: 'status.open', defaultMessage: 'Show Post Details' },
   pin: { id: 'status.pin', defaultMessage: 'Pin on profile' },
   pinToGroup: { id: 'status.pin_to_group', defaultMessage: 'Pin to Group' },
   pinToGroupSuccess: { id: 'status.pin_to_group.success', defaultMessage: 'Pinned to Group!' },
@@ -100,7 +100,7 @@ const messages = defineMessages({
   report: { id: 'status.report', defaultMessage: 'Report @{name}' },
   share: { id: 'status.share', defaultMessage: 'Share' },
   unbookmark: { id: 'status.unbookmark', defaultMessage: 'Remove bookmark' },
-  unmuteConversation: { id: 'status.unmute_conversation', defaultMessage: 'Unmute conversation' },
+  unmuteConversation: { id: 'status.unmute_conversation', defaultMessage: 'Unmute Conversation' },
   unmuteGroup: { id: 'group.unmute.long_label', defaultMessage: 'Unmute Group' },
   unmuteSuccess: { id: 'group.unmute.success', defaultMessage: 'Unmuted the group' },
   unpin: { id: 'status.unpin', defaultMessage: 'Unpin from profile' },

src/components/status-list.tsx

@@ -213,7 +213,7 @@ const StatusList: React.FC<IStatusList> = ({
       <div className='regeneration-indicator'>
         <div>
           <div className='regeneration-indicator__label'>
-            <FormattedMessage id='regeneration_indicator.label' tagName='strong' defaultMessage='Loading&hellip;' />
+            <FormattedMessage id='regeneration_indicator.label' tagName='strong' defaultMessage='Loading…' />
             <FormattedMessage id='regeneration_indicator.sublabel' defaultMessage='Your home feed is being prepared!' />
           </div>
         </div>

src/components/thumb-navigation.tsx

@@ -72,7 +72,7 @@ const ThumbNavigation: React.FC = (): JSX.Element => {
       {account && (
         <ThumbNavigationLink
           src={require('@tabler/icons/bell.svg')}
-          text={<FormattedMessage id='navigation.notifications' defaultMessage='Alerts' />}
+          text={<FormattedMessage id='navigation.notifications' defaultMessage='Notifications' />}
           to='/notifications'
           exact
           count={notificationCount}