From b5f92b10f92059a4cc15c816491f13637baed457 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 11 Oct 2023 14:57:53 -0500 Subject: [PATCH] i18n: resolve duplicate message identifiers in code --- src/components/sidebar-menu.tsx | 8 ++++---- src/components/status-action-bar.tsx | 2 +- src/features/account/components/header.tsx | 6 +++--- .../components/chat-page/components/chat-page-sidebar.tsx | 2 +- src/features/chats/components/chat-pane/blankslate.tsx | 6 +++--- src/features/filters/index.tsx | 2 +- src/features/group/components/group-options-button.tsx | 2 +- src/features/group/manage-group.tsx | 2 +- src/features/list-adder/index.tsx | 2 +- src/features/ui/components/floating-action-button.tsx | 2 +- src/features/ui/components/modals/actions-modal.tsx | 2 +- src/features/ui/components/navbar.tsx | 2 +- src/features/ui/components/panels/sign-up-panel.tsx | 2 +- src/toast.tsx | 2 +- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/components/sidebar-menu.tsx b/src/components/sidebar-menu.tsx index 8b1d43f1a..baab149a2 100644 --- a/src/components/sidebar-menu.tsx +++ b/src/components/sidebar-menu.tsx @@ -22,10 +22,10 @@ const messages = defineMessages({ follows: { id: 'account.follows', defaultMessage: 'Follows' }, 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' }, diff --git a/src/components/status-action-bar.tsx b/src/components/status-action-bar.tsx index 8b2009b82..f0c6d4313 100644 --- a/src/components/status-action-bar.tsx +++ b/src/components/status-action-bar.tsx @@ -55,7 +55,7 @@ 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' }, diff --git a/src/features/account/components/header.tsx b/src/features/account/components/header.tsx index 8cf23eaa8..99321cb40 100644 --- a/src/features/account/components/header.tsx +++ b/src/features/account/components/header.tsx @@ -53,9 +53,9 @@ const messages = defineMessages({ showReblogs: { id: 'account.show_reblogs', defaultMessage: 'Show reposts from @{name}' }, preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' }, follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' }, - blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' }, - domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Hidden domains' }, - mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' }, + blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocks' }, + domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Domain blocks' }, + mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Mutes' }, endorse: { id: 'account.endorse', defaultMessage: 'Feature on profile' }, unendorse: { id: 'account.unendorse', defaultMessage: 'Don\'t feature on profile' }, removeFromFollowers: { id: 'account.remove_from_followers', defaultMessage: 'Remove this follower' }, diff --git a/src/features/chats/components/chat-page/components/chat-page-sidebar.tsx b/src/features/chats/components/chat-page/components/chat-page-sidebar.tsx index ad3a2ef3a..6691acf5f 100644 --- a/src/features/chats/components/chat-page/components/chat-page-sidebar.tsx +++ b/src/features/chats/components/chat-page/components/chat-page-sidebar.tsx @@ -10,7 +10,7 @@ import ChatList from '../../chat-list'; import ChatSearchInput from '../../chat-search-input'; const messages = defineMessages({ - title: { id: 'column.chats', defaultMessage: 'Messages' }, + title: { id: 'column.chats', defaultMessage: 'Chats' }, }); const ChatPageSidebar = () => { diff --git a/src/features/chats/components/chat-pane/blankslate.tsx b/src/features/chats/components/chat-pane/blankslate.tsx index 40aa19278..d718ff376 100644 --- a/src/features/chats/components/chat-pane/blankslate.tsx +++ b/src/features/chats/components/chat-pane/blankslate.tsx @@ -4,9 +4,9 @@ import { defineMessages, useIntl } from 'react-intl'; import { Button, Stack, Text } from 'soapbox/components/ui'; const messages = defineMessages({ - title: { id: 'chat_search.empty_results_blankslate.title', defaultMessage: 'No messages yet' }, - body: { id: 'chat_search.empty_results_blankslate.body', defaultMessage: 'Search for someone to chat with.' }, - action: { id: 'chat_search.empty_results_blankslate.action', defaultMessage: 'Message someone' }, + title: { id: 'chat_pane.blankslate.title', defaultMessage: 'No messages yet' }, + body: { id: 'chat_pane.blankslate.body', defaultMessage: 'Search for someone to chat with.' }, + action: { id: 'chat_pane.blankslate.action', defaultMessage: 'Message someone' }, }); interface IBlankslate { diff --git a/src/features/filters/index.tsx b/src/features/filters/index.tsx index 5aadf1795..41001c396 100644 --- a/src/features/filters/index.tsx +++ b/src/features/filters/index.tsx @@ -17,7 +17,7 @@ const messages = defineMessages({ conversations: { id: 'column.filters.conversations', defaultMessage: 'Conversations' }, accounts: { id: 'column.filters.accounts', defaultMessage: 'Accounts' }, delete_error: { id: 'column.filters.delete_error', defaultMessage: 'Error deleting filter' }, - edit: { id: 'column.filters.edit', defaultMessage: 'Edit' }, + edit: { id: 'column.filters.edit', defaultMessage: 'Edit Filter' }, delete: { id: 'column.filters.delete', defaultMessage: 'Delete' }, }); diff --git a/src/features/group/components/group-options-button.tsx b/src/features/group/components/group-options-button.tsx index c8f378f87..6b35d03d7 100644 --- a/src/features/group/components/group-options-button.tsx +++ b/src/features/group/components/group-options-button.tsx @@ -14,7 +14,7 @@ import type { Account, Group } from 'soapbox/types/entities'; const messages = defineMessages({ confirmationConfirm: { id: 'confirmations.leave_group.confirm', defaultMessage: 'Leave' }, - confirmationHeading: { id: 'confirmations.leave_group.heading', defaultMessage: 'Leave Group' }, + confirmationHeading: { id: 'confirmations.leave_group.heading', defaultMessage: 'Leave group' }, confirmationMessage: { id: 'confirmations.leave_group.message', defaultMessage: 'You are about to leave the group. Do you want to continue?' }, muteConfirm: { id: 'confirmations.mute_group.confirm', defaultMessage: 'Mute' }, muteHeading: { id: 'confirmations.mute_group.heading', defaultMessage: 'Mute Group' }, diff --git a/src/features/group/manage-group.tsx b/src/features/group/manage-group.tsx index c669c026f..ed9eea111 100644 --- a/src/features/group/manage-group.tsx +++ b/src/features/group/manage-group.tsx @@ -25,7 +25,7 @@ const messages = defineMessages({ deleteHeading: { id: 'confirmations.delete_group.heading', defaultMessage: 'Delete Group' }, deleteMessage: { id: 'confirmations.delete_group.message', defaultMessage: 'Are you sure you want to delete this group? This is a permanent action that cannot be undone.' }, members: { id: 'group.tabs.members', defaultMessage: 'Members' }, - other: { id: 'settings.other', defaultMessage: 'Other Options' }, + other: { id: 'settings.other', defaultMessage: 'Other options' }, deleteSuccess: { id: 'group.delete.success', defaultMessage: 'Group successfully deleted' }, }); diff --git a/src/features/list-adder/index.tsx b/src/features/list-adder/index.tsx index f13c3279c..821298208 100644 --- a/src/features/list-adder/index.tsx +++ b/src/features/list-adder/index.tsx @@ -18,7 +18,7 @@ import type { List as ListEntity } from 'soapbox/types/entities'; const messages = defineMessages({ close: { id: 'lightbox.close', defaultMessage: 'Close' }, subheading: { id: 'lists.subheading', defaultMessage: 'Your lists' }, - add: { id: 'lists.new.create', defaultMessage: 'Add List' }, + add: { id: 'lists.new.create', defaultMessage: 'Add list' }, }); // hack diff --git a/src/features/ui/components/floating-action-button.tsx b/src/features/ui/components/floating-action-button.tsx index ea6bd64ee..11032641f 100644 --- a/src/features/ui/components/floating-action-button.tsx +++ b/src/features/ui/components/floating-action-button.tsx @@ -10,7 +10,7 @@ import { Avatar, HStack, Icon } from 'soapbox/components/ui'; import { useAppDispatch } from 'soapbox/hooks'; const messages = defineMessages({ - publish: { id: 'compose_form.publish', defaultMessage: 'Publish' }, + publish: { id: 'compose_form.publish', defaultMessage: 'Post' }, }); /** FloatingActionButton (aka FAB), a composer button that floats in the corner on mobile. */ diff --git a/src/features/ui/components/modals/actions-modal.tsx b/src/features/ui/components/modals/actions-modal.tsx index b7a6e3d76..5fd37bab7 100644 --- a/src/features/ui/components/modals/actions-modal.tsx +++ b/src/features/ui/components/modals/actions-modal.tsx @@ -64,7 +64,7 @@ const ActionsModal: React.FC = ({ status, actions, onClick, onClo
    • diff --git a/src/features/ui/components/navbar.tsx b/src/features/ui/components/navbar.tsx index feb9ff701..a9a1d520c 100644 --- a/src/features/ui/components/navbar.tsx +++ b/src/features/ui/components/navbar.tsx @@ -170,7 +170,7 @@ const Navbar = () => { size='sm' {...(features.nostrSignup ? { onClick: handleNostrLogin } : { to: '/login' })} > - + {(isOpen) && ( diff --git a/src/features/ui/components/panels/sign-up-panel.tsx b/src/features/ui/components/panels/sign-up-panel.tsx index f5e6c9222..e12ae02c4 100644 --- a/src/features/ui/components/panels/sign-up-panel.tsx +++ b/src/features/ui/components/panels/sign-up-panel.tsx @@ -19,7 +19,7 @@ const SignUpPanel = () => { - + diff --git a/src/toast.tsx b/src/toast.tsx index 7dd703596..49791b0fa 100644 --- a/src/toast.tsx +++ b/src/toast.tsx @@ -40,7 +40,7 @@ function error(message: ToastText, opts?: IToastOptions) { } const messages = defineMessages({ - unexpectedMessage: { id: 'alert.unexpected.message', defaultMessage: 'An unexpected error occurred.' }, + unexpectedMessage: { id: 'alert.unexpected.message', defaultMessage: 'Something went wrong.' }, }); function showAlertForError(networkError: AxiosError) {