i18n: resolve duplicate message identifiers in code
This commit is contained in:
parent
8bd18f66bc
commit
b5f92b10f9
14 changed files with 21 additions and 21 deletions
|
@ -22,10 +22,10 @@ const messages = defineMessages({
|
||||||
follows: { id: 'account.follows', defaultMessage: 'Follows' },
|
follows: { id: 'account.follows', defaultMessage: 'Follows' },
|
||||||
profile: { id: 'account.profile', defaultMessage: 'Profile' },
|
profile: { id: 'account.profile', defaultMessage: 'Profile' },
|
||||||
preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
|
preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
|
||||||
blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
|
blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocks' },
|
||||||
domainBlocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Hidden domains' },
|
domainBlocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Domain blocks' },
|
||||||
mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
|
mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Mutes' },
|
||||||
filters: { id: 'navigation_bar.filters', defaultMessage: 'Muted words' },
|
filters: { id: 'navigation_bar.filters', defaultMessage: 'Filters' },
|
||||||
followedTags: { id: 'navigation_bar.followed_tags', defaultMessage: 'Followed hashtags' },
|
followedTags: { id: 'navigation_bar.followed_tags', defaultMessage: 'Followed hashtags' },
|
||||||
soapboxConfig: { id: 'navigation_bar.soapbox_config', defaultMessage: 'Soapbox config' },
|
soapboxConfig: { id: 'navigation_bar.soapbox_config', defaultMessage: 'Soapbox config' },
|
||||||
accountMigration: { id: 'navigation_bar.account_migration', defaultMessage: 'Move account' },
|
accountMigration: { id: 'navigation_bar.account_migration', defaultMessage: 'Move account' },
|
||||||
|
|
|
@ -55,7 +55,7 @@ const messages = defineMessages({
|
||||||
direct: { id: 'status.direct', defaultMessage: 'Direct message @{name}' },
|
direct: { id: 'status.direct', defaultMessage: 'Direct message @{name}' },
|
||||||
disfavourite: { id: 'status.disfavourite', defaultMessage: 'Disike' },
|
disfavourite: { id: 'status.disfavourite', defaultMessage: 'Disike' },
|
||||||
edit: { id: 'status.edit', defaultMessage: 'Edit' },
|
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}' },
|
external: { id: 'status.external', defaultMessage: 'View post on {domain}' },
|
||||||
favourite: { id: 'status.favourite', defaultMessage: 'Like' },
|
favourite: { id: 'status.favourite', defaultMessage: 'Like' },
|
||||||
groupBlockConfirm: { id: 'confirmations.block_from_group.confirm', defaultMessage: 'Ban' },
|
groupBlockConfirm: { id: 'confirmations.block_from_group.confirm', defaultMessage: 'Ban' },
|
||||||
|
|
|
@ -53,9 +53,9 @@ const messages = defineMessages({
|
||||||
showReblogs: { id: 'account.show_reblogs', defaultMessage: 'Show reposts from @{name}' },
|
showReblogs: { id: 'account.show_reblogs', defaultMessage: 'Show reposts from @{name}' },
|
||||||
preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
|
preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
|
||||||
follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
|
follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
|
||||||
blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
|
blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocks' },
|
||||||
domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Hidden domains' },
|
domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Domain blocks' },
|
||||||
mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
|
mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Mutes' },
|
||||||
endorse: { id: 'account.endorse', defaultMessage: 'Feature on profile' },
|
endorse: { id: 'account.endorse', defaultMessage: 'Feature on profile' },
|
||||||
unendorse: { id: 'account.unendorse', defaultMessage: 'Don\'t feature on profile' },
|
unendorse: { id: 'account.unendorse', defaultMessage: 'Don\'t feature on profile' },
|
||||||
removeFromFollowers: { id: 'account.remove_from_followers', defaultMessage: 'Remove this follower' },
|
removeFromFollowers: { id: 'account.remove_from_followers', defaultMessage: 'Remove this follower' },
|
||||||
|
|
|
@ -10,7 +10,7 @@ import ChatList from '../../chat-list';
|
||||||
import ChatSearchInput from '../../chat-search-input';
|
import ChatSearchInput from '../../chat-search-input';
|
||||||
|
|
||||||
const messages = defineMessages({
|
const messages = defineMessages({
|
||||||
title: { id: 'column.chats', defaultMessage: 'Messages' },
|
title: { id: 'column.chats', defaultMessage: 'Chats' },
|
||||||
});
|
});
|
||||||
|
|
||||||
const ChatPageSidebar = () => {
|
const ChatPageSidebar = () => {
|
||||||
|
|
|
@ -4,9 +4,9 @@ import { defineMessages, useIntl } from 'react-intl';
|
||||||
import { Button, Stack, Text } from 'soapbox/components/ui';
|
import { Button, Stack, Text } from 'soapbox/components/ui';
|
||||||
|
|
||||||
const messages = defineMessages({
|
const messages = defineMessages({
|
||||||
title: { id: 'chat_search.empty_results_blankslate.title', defaultMessage: 'No messages yet' },
|
title: { id: 'chat_pane.blankslate.title', defaultMessage: 'No messages yet' },
|
||||||
body: { id: 'chat_search.empty_results_blankslate.body', defaultMessage: 'Search for someone to chat with.' },
|
body: { id: 'chat_pane.blankslate.body', defaultMessage: 'Search for someone to chat with.' },
|
||||||
action: { id: 'chat_search.empty_results_blankslate.action', defaultMessage: 'Message someone' },
|
action: { id: 'chat_pane.blankslate.action', defaultMessage: 'Message someone' },
|
||||||
});
|
});
|
||||||
|
|
||||||
interface IBlankslate {
|
interface IBlankslate {
|
||||||
|
|
|
@ -17,7 +17,7 @@ const messages = defineMessages({
|
||||||
conversations: { id: 'column.filters.conversations', defaultMessage: 'Conversations' },
|
conversations: { id: 'column.filters.conversations', defaultMessage: 'Conversations' },
|
||||||
accounts: { id: 'column.filters.accounts', defaultMessage: 'Accounts' },
|
accounts: { id: 'column.filters.accounts', defaultMessage: 'Accounts' },
|
||||||
delete_error: { id: 'column.filters.delete_error', defaultMessage: 'Error deleting filter' },
|
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' },
|
delete: { id: 'column.filters.delete', defaultMessage: 'Delete' },
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ import type { Account, Group } from 'soapbox/types/entities';
|
||||||
|
|
||||||
const messages = defineMessages({
|
const messages = defineMessages({
|
||||||
confirmationConfirm: { id: 'confirmations.leave_group.confirm', defaultMessage: 'Leave' },
|
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?' },
|
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' },
|
muteConfirm: { id: 'confirmations.mute_group.confirm', defaultMessage: 'Mute' },
|
||||||
muteHeading: { id: 'confirmations.mute_group.heading', defaultMessage: 'Mute Group' },
|
muteHeading: { id: 'confirmations.mute_group.heading', defaultMessage: 'Mute Group' },
|
||||||
|
|
|
@ -25,7 +25,7 @@ const messages = defineMessages({
|
||||||
deleteHeading: { id: 'confirmations.delete_group.heading', defaultMessage: 'Delete Group' },
|
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.' },
|
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' },
|
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' },
|
deleteSuccess: { id: 'group.delete.success', defaultMessage: 'Group successfully deleted' },
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ import type { List as ListEntity } from 'soapbox/types/entities';
|
||||||
const messages = defineMessages({
|
const messages = defineMessages({
|
||||||
close: { id: 'lightbox.close', defaultMessage: 'Close' },
|
close: { id: 'lightbox.close', defaultMessage: 'Close' },
|
||||||
subheading: { id: 'lists.subheading', defaultMessage: 'Your lists' },
|
subheading: { id: 'lists.subheading', defaultMessage: 'Your lists' },
|
||||||
add: { id: 'lists.new.create', defaultMessage: 'Add List' },
|
add: { id: 'lists.new.create', defaultMessage: 'Add list' },
|
||||||
});
|
});
|
||||||
|
|
||||||
// hack
|
// hack
|
||||||
|
|
|
@ -10,7 +10,7 @@ import { Avatar, HStack, Icon } from 'soapbox/components/ui';
|
||||||
import { useAppDispatch } from 'soapbox/hooks';
|
import { useAppDispatch } from 'soapbox/hooks';
|
||||||
|
|
||||||
const messages = defineMessages({
|
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. */
|
/** FloatingActionButton (aka FAB), a composer button that floats in the corner on mobile. */
|
||||||
|
|
|
@ -64,7 +64,7 @@ const ActionsModal: React.FC<IActionsModal> = ({ status, actions, onClick, onClo
|
||||||
|
|
||||||
<li>
|
<li>
|
||||||
<button type='button' onClick={onClose}>
|
<button type='button' onClick={onClose}>
|
||||||
<FormattedMessage id='lightbox.close' defaultMessage='Cancel' />
|
<FormattedMessage id='lightbox.close' defaultMessage='Close' />
|
||||||
</button>
|
</button>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
@ -170,7 +170,7 @@ const Navbar = () => {
|
||||||
size='sm'
|
size='sm'
|
||||||
{...(features.nostrSignup ? { onClick: handleNostrLogin } : { to: '/login' })}
|
{...(features.nostrSignup ? { onClick: handleNostrLogin } : { to: '/login' })}
|
||||||
>
|
>
|
||||||
<FormattedMessage id='account.login' defaultMessage='Log In' />
|
<FormattedMessage id='account.login' defaultMessage='Log in' />
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
{(isOpen) && (
|
{(isOpen) && (
|
||||||
|
|
|
@ -19,7 +19,7 @@ const SignUpPanel = () => {
|
||||||
</Text>
|
</Text>
|
||||||
|
|
||||||
<Text theme='muted' size='sm'>
|
<Text theme='muted' size='sm'>
|
||||||
<FormattedMessage id='signup_panel.subtitle' defaultMessage='Sign up now to discuss.' />
|
<FormattedMessage id='signup_panel.subtitle' defaultMessage="Sign up now to discuss what's happening." />
|
||||||
</Text>
|
</Text>
|
||||||
</Stack>
|
</Stack>
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@ function error(message: ToastText, opts?: IToastOptions) {
|
||||||
}
|
}
|
||||||
|
|
||||||
const messages = defineMessages({
|
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<any>) {
|
function showAlertForError(networkError: AxiosError<any>) {
|
||||||
|
|
Loading…
Reference in a new issue