diff --git a/src/components/groups/popover/group-popover.tsx b/src/components/groups/popover/group-popover.tsx index 4e079f430b..c73f254d6d 100644 --- a/src/components/groups/popover/group-popover.tsx +++ b/src/components/groups/popover/group-popover.tsx @@ -19,7 +19,7 @@ interface IGroupPopoverContainer { const messages = defineMessages({ title: { id: 'group.popover.title', defaultMessage: 'Membership required' }, summary: { id: 'group.popover.summary', defaultMessage: 'You must be a member of the group in order to reply to this status.' }, - action: { id: 'group.popover.action', defaultMessage: 'View Group' }, + action: { id: 'group.popover.action', defaultMessage: 'View group' }, }); const GroupPopover = (props: IGroupPopoverContainer) => { diff --git a/src/components/sidebar-menu.tsx b/src/components/sidebar-menu.tsx index eb3c0d9a8c..e606067bf2 100644 --- a/src/components/sidebar-menu.tsx +++ b/src/components/sidebar-menu.tsx @@ -20,12 +20,7 @@ import type { Account as AccountEntity } from 'soapbox/types/entities'; const messages = defineMessages({ profile: { id: 'account.profile', defaultMessage: 'Profile' }, preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' }, - 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' }, logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' }, bookmarks: { id: 'column.bookmarks', defaultMessage: 'Bookmarks' }, lists: { id: 'column.lists', defaultMessage: 'Lists' }, @@ -230,15 +225,6 @@ const SidebarMenu: React.FC = (): JSX.Element | null => { /> )} - {settings.get('isDeveloper') && ( - - )} - {draftCount > 0 && ( { - - - - { onClick={onClose} /> - {features.federating && ( - - )} - - {(features.filters || features.filtersV2) && ( - - )} - {features.followedHashtagsList && ( { /> )} - {account.admin && ( + {settings.get('isDeveloper') && ( )} diff --git a/src/components/status-action-bar.tsx b/src/components/status-action-bar.tsx index 0b12fe68ae..7f01cd87ba 100644 --- a/src/components/status-action-bar.tsx +++ b/src/components/status-action-bar.tsx @@ -35,7 +35,7 @@ const messages = defineMessages({ admin_status: { id: 'status.admin_status', defaultMessage: 'Open this post in the moderation interface' }, block: { id: 'account.block', defaultMessage: 'Block @{name}' }, blocked: { id: 'group.group_mod_block.success', defaultMessage: '@{name} is banned' }, - blockAndReport: { id: 'confirmations.block.block_and_report', defaultMessage: 'Block & Report' }, + blockAndReport: { id: 'confirmations.block.block_and_report', defaultMessage: 'Block and report' }, blockConfirm: { id: 'confirmations.block.confirm', defaultMessage: 'Block' }, bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark' }, bookmarkSetFolder: { id: 'status.bookmark_folder', defaultMessage: 'Set bookmark folder' }, @@ -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' }, @@ -58,8 +58,8 @@ const messages = defineMessages({ 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 User' }, - groupBlockFromGroupHeading: { id: 'confirmations.block_from_group.heading', defaultMessage: 'Ban From Group' }, + 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' }, group_remove_account: { id: 'status.remove_account_from_group', defaultMessage: 'Remove account from group' }, @@ -70,7 +70,7 @@ const messages = defineMessages({ more: { id: 'status.more', defaultMessage: 'More' }, mute: { id: 'account.mute', defaultMessage: 'Mute @{name}' }, muteConversation: { id: 'status.mute_conversation', defaultMessage: 'Mute Conversation' }, - open: { id: 'status.open', defaultMessage: 'Show Post Details' }, + open: { id: 'status.open', defaultMessage: 'Show post details' }, pin: { id: 'status.pin', defaultMessage: 'Pin on profile' }, quotePost: { id: 'status.quote', defaultMessage: 'Quote post' }, reactionCry: { id: 'status.reactions.cry', defaultMessage: 'Sad' }, diff --git a/src/features/account/components/header.tsx b/src/features/account/components/header.tsx index 11fb8efded..d4ac62698e 100644 --- a/src/features/account/components/header.tsx +++ b/src/features/account/components/header.tsx @@ -66,7 +66,7 @@ const messages = defineMessages({ unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' }, blockConfirm: { id: 'confirmations.block.confirm', defaultMessage: 'Block' }, blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Hide entire domain' }, - blockAndReport: { id: 'confirmations.block.block_and_report', defaultMessage: 'Block & Report' }, + blockAndReport: { id: 'confirmations.block.block_and_report', defaultMessage: 'Block and report' }, removeFromFollowersConfirm: { id: 'confirmations.remove_from_followers.confirm', defaultMessage: 'Remove' }, userEndorsed: { id: 'account.endorse.success', defaultMessage: 'You are now featuring @{acct} on your profile' }, userUnendorsed: { id: 'account.unendorse.success', defaultMessage: 'You are no longer featuring @{acct}' }, diff --git a/src/features/admin/moderation-log.tsx b/src/features/admin/moderation-log.tsx index 57a80f83f4..f07423b622 100644 --- a/src/features/admin/moderation-log.tsx +++ b/src/features/admin/moderation-log.tsx @@ -8,7 +8,7 @@ import { Column, Stack, Text } from 'soapbox/components/ui'; import type { ModerationLogEntry } from 'soapbox/schemas'; const messages = defineMessages({ - heading: { id: 'column.admin.moderation_log', defaultMessage: 'Moderation Log' }, + heading: { id: 'column.admin.moderation_log', defaultMessage: 'Moderation log' }, emptyMessage: { id: 'admin.moderation_log.empty_message', defaultMessage: 'You have not performed any moderation actions yet. When you do, a history will be shown here.' }, }); diff --git a/src/features/admin/tabs/dashboard.tsx b/src/features/admin/tabs/dashboard.tsx index bec02694d4..cad4867719 100644 --- a/src/features/admin/tabs/dashboard.tsx +++ b/src/features/admin/tabs/dashboard.tsx @@ -90,7 +90,7 @@ const Dashboard: React.FC = () => { } + label={} /> {features.adminAnnouncements && ( diff --git a/src/features/admin/tabs/reports.tsx b/src/features/admin/tabs/reports.tsx index 99ed6be914..63ea4bd70e 100644 --- a/src/features/admin/tabs/reports.tsx +++ b/src/features/admin/tabs/reports.tsx @@ -9,7 +9,7 @@ import Report from '../components/report'; const messages = defineMessages({ heading: { id: 'column.admin.reports', defaultMessage: 'Reports' }, - modlog: { id: 'column.admin.reports.menu.moderation_log', defaultMessage: 'Moderation Log' }, + modlog: { id: 'column.admin.reports.menu.moderation_log', defaultMessage: 'Moderation log' }, emptyMessage: { id: 'admin.reports.empty_message', defaultMessage: 'There are no open reports. If a user gets reported, they will show up here.' }, }); diff --git a/src/features/auth-login/components/login-page.tsx b/src/features/auth-login/components/login-page.tsx index c0a6c0e3be..c3b09df4a4 100644 --- a/src/features/auth-login/components/login-page.tsx +++ b/src/features/auth-login/components/login-page.tsx @@ -73,7 +73,7 @@ const LoginPage = () => { if (mfaAuthNeeded) return ; return ( - }> + }> diff --git a/src/features/auth-login/components/password-reset.tsx b/src/features/auth-login/components/password-reset.tsx index 8812c5b737..42a8c4bc66 100644 --- a/src/features/auth-login/components/password-reset.tsx +++ b/src/features/auth-login/components/password-reset.tsx @@ -37,7 +37,7 @@ const PasswordReset = () => { if (success) return ; return ( - }> + }>
{ } return ( - }> + }> ); diff --git a/src/features/delete-account/index.tsx b/src/features/delete-account/index.tsx index aaeecc7895..62216d3779 100644 --- a/src/features/delete-account/index.tsx +++ b/src/features/delete-account/index.tsx @@ -8,10 +8,10 @@ import toast from 'soapbox/toast'; const messages = defineMessages({ passwordFieldLabel: { id: 'security.fields.password.label', defaultMessage: 'Password' }, - deleteHeader: { id: 'security.headers.delete', defaultMessage: 'Delete Account' }, + deleteHeader: { id: 'security.headers.delete', defaultMessage: 'Delete account' }, deleteText: { id: 'security.text.delete', defaultMessage: 'To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It\'s not guaranteed that all servers will purge your account.' }, localDeleteText: { id: 'security.text.delete.local', defaultMessage: 'To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone.' }, - deleteSubmit: { id: 'security.submit.delete', defaultMessage: 'Delete Account' }, + deleteSubmit: { id: 'security.submit.delete', defaultMessage: 'Delete account' }, deleteAccountSuccess: { id: 'security.delete_account.success', defaultMessage: 'Account successfully deleted.' }, deleteAccountFail: { id: 'security.delete_account.fail', defaultMessage: 'Account deletion failed.' }, }); diff --git a/src/features/edit-email/index.tsx b/src/features/edit-email/index.tsx index 70d511ce17..2c783ddb95 100644 --- a/src/features/edit-email/index.tsx +++ b/src/features/edit-email/index.tsx @@ -7,7 +7,7 @@ import { useAppDispatch } from 'soapbox/hooks'; import toast from 'soapbox/toast'; const messages = defineMessages({ - header: { id: 'edit_email.header', defaultMessage: 'Change Email' }, + header: { id: 'edit_email.header', defaultMessage: 'Change email' }, updateEmailSuccess: { id: 'security.update_email.success', defaultMessage: 'Email successfully updated.' }, updateEmailFail: { id: 'security.update_email.fail', defaultMessage: 'Update email failed.' }, emailFieldLabel: { id: 'security.fields.email.label', defaultMessage: 'Email address' }, diff --git a/src/features/edit-password/index.tsx b/src/features/edit-password/index.tsx index 7761f77a21..4d77b07d15 100644 --- a/src/features/edit-password/index.tsx +++ b/src/features/edit-password/index.tsx @@ -12,7 +12,7 @@ const messages = defineMessages({ oldPasswordFieldLabel: { id: 'security.fields.old_password.label', defaultMessage: 'Current password' }, newPasswordFieldLabel: { id: 'security.fields.new_password.label', defaultMessage: 'New password' }, confirmationFieldLabel: { id: 'security.fields.password_confirmation.label', defaultMessage: 'New password (again)' }, - header: { id: 'edit_password.header', defaultMessage: 'Change Password' }, + header: { id: 'edit_password.header', defaultMessage: 'Change password' }, submit: { id: 'security.submit', defaultMessage: 'Save changes' }, cancel: { id: 'common.cancel', defaultMessage: 'Cancel' }, }); diff --git a/src/features/edit-profile/index.tsx b/src/features/edit-profile/index.tsx index 26e903c152..d23e2c2678 100644 --- a/src/features/edit-profile/index.tsx +++ b/src/features/edit-profile/index.tsx @@ -46,7 +46,7 @@ const hidesNetwork = ({ pleroma }: Account): boolean => { const messages = defineMessages({ heading: { id: 'column.edit_profile', defaultMessage: 'Edit profile' }, - header: { id: 'edit_profile.header', defaultMessage: 'Edit Profile' }, + header: { id: 'edit_profile.header', defaultMessage: 'Edit profile' }, metaFieldLabel: { id: 'edit_profile.fields.meta_fields.label_placeholder', defaultMessage: 'Label' }, metaFieldContent: { id: 'edit_profile.fields.meta_fields.content_placeholder', defaultMessage: 'Content' }, success: { id: 'edit_profile.success', defaultMessage: 'Your profile has been successfully saved!' }, diff --git a/src/features/event/components/event-header.tsx b/src/features/event/components/event-header.tsx index bfa7dc4a1d..c3b465dfe2 100644 --- a/src/features/event/components/event-header.tsx +++ b/src/features/event/components/event-header.tsx @@ -55,7 +55,7 @@ const messages = defineMessages({ markStatusNotSensitive: { id: 'admin.statuses.actions.mark_status_not_sensitive', defaultMessage: 'Mark post not sensitive' }, deleteStatus: { id: 'admin.statuses.actions.delete_status', defaultMessage: 'Delete post' }, blockConfirm: { id: 'confirmations.block.confirm', defaultMessage: 'Block' }, - blockAndReport: { id: 'confirmations.block.block_and_report', defaultMessage: 'Block & Report' }, + blockAndReport: { id: 'confirmations.block.block_and_report', defaultMessage: 'Block and report' }, deleteConfirm: { id: 'confirmations.delete_event.confirm', defaultMessage: 'Delete' }, deleteHeading: { id: 'confirmations.delete_event.heading', defaultMessage: 'Delete event' }, deleteMessage: { id: 'confirmations.delete_event.message', defaultMessage: 'Are you sure you want to delete this event?' }, diff --git a/src/features/external-login/index.tsx b/src/features/external-login/index.tsx index 507797f9af..484dde0744 100644 --- a/src/features/external-login/index.tsx +++ b/src/features/external-login/index.tsx @@ -8,7 +8,7 @@ import ExternalLoginForm from './components/external-login-form'; /** Page for logging into a remote instance */ const ExternalLoginPage: React.FC = () => { return ( - }> + }> ); diff --git a/src/features/feed-suggestions/feed-suggestions.tsx b/src/features/feed-suggestions/feed-suggestions.tsx index 94ec0b8d8d..f3e0da2b96 100644 --- a/src/features/feed-suggestions/feed-suggestions.tsx +++ b/src/features/feed-suggestions/feed-suggestions.tsx @@ -11,7 +11,7 @@ import ActionButton from '../ui/components/action-button'; import { HotKeys } from '../ui/components/hotkeys'; const messages = defineMessages({ - heading: { id: 'feed_suggestions.heading', defaultMessage: 'Suggested Profiles' }, + heading: { id: 'feed_suggestions.heading', defaultMessage: 'Suggested profiles' }, viewAll: { id: 'feed_suggestions.view_all', defaultMessage: 'View all' }, }); diff --git a/src/features/filters/edit-filter.tsx b/src/features/filters/edit-filter.tsx index 37cabbcc14..09ea0a4a88 100644 --- a/src/features/filters/edit-filter.tsx +++ b/src/features/filters/edit-filter.tsx @@ -26,7 +26,7 @@ interface IEditFilter { } const messages = defineMessages({ - subheading_add_new: { id: 'column.filters.subheading_add_new', defaultMessage: 'Add New Filter' }, + subheading_add_new: { id: 'column.filters.subheading_add_new', defaultMessage: 'Add new filter' }, title: { id: 'column.filters.title', defaultMessage: 'Title' }, keyword: { id: 'column.filters.keyword', defaultMessage: 'Keyword or phrase' }, keywords: { id: 'column.filters.keywords', defaultMessage: 'Keywords or phrases' }, @@ -40,8 +40,8 @@ const messages = defineMessages({ drop_hint: { id: 'column.filters.drop_hint', defaultMessage: 'Filtered posts will disappear irreversibly, even if filter is later removed' }, hide_header: { id: 'column.filters.hide_header', defaultMessage: 'Hide completely' }, hide_hint: { id: 'column.filters.hide_hint', defaultMessage: 'Completely hide the filtered content, instead of showing a warning' }, - add_new: { id: 'column.filters.add_new', defaultMessage: 'Add New Filter' }, - edit: { id: 'column.filters.edit', defaultMessage: 'Edit Filter' }, + add_new: { id: 'column.filters.add_new', defaultMessage: 'Add new filter' }, + edit: { id: 'column.filters.edit', defaultMessage: 'Edit filter' }, create_error: { id: 'column.filters.create_error', defaultMessage: 'Error adding filter' }, expiration_never: { id: 'column.filters.expiration.never', defaultMessage: 'Never' }, expiration_1800: { id: 'column.filters.expiration.1800', defaultMessage: '30 minutes' }, diff --git a/src/features/follow-recommendations/index.tsx b/src/features/follow-recommendations/index.tsx index 703e23101a..c2b204aacd 100644 --- a/src/features/follow-recommendations/index.tsx +++ b/src/features/follow-recommendations/index.tsx @@ -9,7 +9,7 @@ import AccountContainer from 'soapbox/containers/account-container'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; const messages = defineMessages({ - heading: { id: 'follow_recommendations.heading', defaultMessage: 'Suggested Profiles' }, + heading: { id: 'follow_recommendations.heading', defaultMessage: 'Suggested profiles' }, }); const FollowRecommendations: React.FC = () => { diff --git a/src/features/group/components/group-action-button.tsx b/src/features/group/components/group-action-button.tsx index 5d26f174f9..6739906a5c 100644 --- a/src/features/group/components/group-action-button.tsx +++ b/src/features/group/components/group-action-button.tsx @@ -93,7 +93,7 @@ const GroupActionButton = ({ group }: IGroupActionButton) => { theme='secondary' to={`/group/${group.id}/manage`} > - + ); } @@ -106,8 +106,8 @@ const GroupActionButton = ({ group }: IGroupActionButton) => { disabled={joinGroup.isSubmitting} > {group.locked - ? - : } + ? + : } ); } @@ -119,7 +119,7 @@ const GroupActionButton = ({ group }: IGroupActionButton) => { onClick={onCancelRequest} disabled={cancelRequest.isSubmitting} > - + ); } @@ -130,7 +130,7 @@ const GroupActionButton = ({ group }: IGroupActionButton) => { onClick={onLeaveGroup} disabled={leaveGroup.isSubmitting} > - + ); }; diff --git a/src/features/group/components/group-member-list-item.tsx b/src/features/group/components/group-member-list-item.tsx index 9f7689b67e..5762762610 100644 --- a/src/features/group/components/group-member-list-item.tsx +++ b/src/features/group/components/group-member-list-item.tsx @@ -21,8 +21,8 @@ import type { Group, GroupMember } from 'soapbox/types/entities'; const messages = defineMessages({ adminLimitTitle: { id: 'group.member.admin.limit.title', defaultMessage: 'Admin limit reached' }, adminLimitSummary: { id: 'group.member.admin.limit.summary', defaultMessage: 'You can assign up to {count, plural, one {admin} other {admins}} for the group at this time.' }, - blockConfirm: { id: 'confirmations.block_from_group.confirm', defaultMessage: 'Ban User' }, - blockFromGroupHeading: { id: 'confirmations.block_from_group.heading', defaultMessage: 'Ban From Group' }, + blockConfirm: { id: 'confirmations.block_from_group.confirm', defaultMessage: 'Ban user' }, + blockFromGroupHeading: { id: 'confirmations.block_from_group.heading', defaultMessage: 'Ban from group' }, blockFromGroupMessage: { id: 'confirmations.block_from_group.message', defaultMessage: 'Are you sure you want to ban @{name} from the group?' }, blocked: { id: 'group.group_mod_block.success', defaultMessage: '@{name} is banned' }, demotedToUser: { id: 'group.demote.user.success', defaultMessage: '@{name} is now a member' }, @@ -33,7 +33,7 @@ const messages = defineMessages({ kickConfirm: { id: 'confirmations.kick_from_group.confirm', defaultMessage: 'Kick' }, kickFromGroupMessage: { id: 'confirmations.kick_from_group.message', defaultMessage: 'Are you sure you want to kick @{name} from this group?' }, kicked: { id: 'group.group_mod_kick.success', defaultMessage: 'Kicked @{name} from group' }, - promoteConfirm: { id: 'group.promote.admin.confirmation.title', defaultMessage: 'Assign Admin Role' }, + promoteConfirm: { id: 'group.promote.admin.confirmation.title', defaultMessage: 'Assign admin role' }, promoteConfirmMessage: { id: 'group.promote.admin.confirmation.message', defaultMessage: 'Are you sure you want to assign the admin role to @{name}?' }, promotedToAdmin: { id: 'group.promote.admin.success', defaultMessage: '@{name} is now an admin' }, }); diff --git a/src/features/group/manage-group.tsx b/src/features/group/manage-group.tsx index 0f144f85a7..0e72868cc7 100644 --- a/src/features/group/manage-group.tsx +++ b/src/features/group/manage-group.tsx @@ -15,16 +15,16 @@ import ColumnForbidden from '../ui/components/column-forbidden'; type RouteParams = { groupId: string }; const messages = defineMessages({ - heading: { id: 'column.manage_group', defaultMessage: 'Manage Group' }, - editGroup: { id: 'manage_group.edit_group', defaultMessage: 'Edit Group' }, - pendingRequests: { id: 'manage_group.pending_requests', defaultMessage: 'Pending Requests' }, - blockedMembers: { id: 'manage_group.blocked_members', defaultMessage: 'Banned Members' }, - deleteGroup: { id: 'manage_group.delete_group', defaultMessage: 'Delete Group' }, + heading: { id: 'column.manage_group', defaultMessage: 'Manage group' }, + editGroup: { id: 'manage_group.edit_group', defaultMessage: 'Edit group' }, + pendingRequests: { id: 'manage_group.pending_requests', defaultMessage: 'Pending requests' }, + blockedMembers: { id: 'manage_group.blocked_members', defaultMessage: 'Banned members' }, + deleteGroup: { id: 'manage_group.delete_group', defaultMessage: 'Delete group' }, deleteConfirm: { id: 'confirmations.delete_group.confirm', defaultMessage: 'Delete' }, - 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.' }, 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-editor/components/edit-list-form.tsx b/src/features/list-editor/components/edit-list-form.tsx index e41db67dee..21da2e0d37 100644 --- a/src/features/list-editor/components/edit-list-form.tsx +++ b/src/features/list-editor/components/edit-list-form.tsx @@ -7,7 +7,7 @@ import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; const messages = defineMessages({ title: { id: 'lists.edit.submit', defaultMessage: 'Change title' }, - save: { id: 'lists.new.save_title', defaultMessage: 'Save Title' }, + save: { id: 'lists.new.save_title', defaultMessage: 'Save title' }, }); const ListForm = () => { diff --git a/src/features/onboarding/steps/completed-step.tsx b/src/features/onboarding/steps/completed-step.tsx index 813eff22ad..2d8e780d62 100644 --- a/src/features/onboarding/steps/completed-step.tsx +++ b/src/features/onboarding/steps/completed-step.tsx @@ -28,7 +28,7 @@ const CompletedStep = ({ onComplete }: { onComplete: () => void }) => ( theme='primary' onClick={onComplete} > - + diff --git a/src/features/scheduled-statuses/index.tsx b/src/features/scheduled-statuses/index.tsx index 0a9b3dcaef..e3197fc56d 100644 --- a/src/features/scheduled-statuses/index.tsx +++ b/src/features/scheduled-statuses/index.tsx @@ -10,7 +10,7 @@ import { useAppSelector, useAppDispatch } from 'soapbox/hooks'; import ScheduledStatus from './components/scheduled-status'; const messages = defineMessages({ - heading: { id: 'column.scheduled_statuses', defaultMessage: 'Scheduled Posts' }, + heading: { id: 'column.scheduled_statuses', defaultMessage: 'Scheduled posts' }, }); const handleLoadMore = debounce((dispatch) => { diff --git a/src/features/security/mfa/disable-otp-form.tsx b/src/features/security/mfa/disable-otp-form.tsx index 8a867fa884..0769891dac 100644 --- a/src/features/security/mfa/disable-otp-form.tsx +++ b/src/features/security/mfa/disable-otp-form.tsx @@ -42,7 +42,7 @@ const DisableOtpForm: React.FC = () => { - + diff --git a/src/features/settings/index.tsx b/src/features/settings/index.tsx index c61fdccd89..37e987e14f 100644 --- a/src/features/settings/index.tsx +++ b/src/features/settings/index.tsx @@ -15,12 +15,12 @@ const messages = defineMessages({ accountMigration: { id: 'settings.account_migration', defaultMessage: 'Move Account' }, backups: { id: 'column.backups', defaultMessage: 'Backups' }, blocks: { id: 'settings.blocks', defaultMessage: 'Blocks' }, - changeEmail: { id: 'settings.change_email', defaultMessage: 'Change Email' }, - changePassword: { id: 'settings.change_password', defaultMessage: 'Change Password' }, + changeEmail: { id: 'settings.change_email', defaultMessage: 'Change email' }, + changePassword: { id: 'settings.change_password', defaultMessage: 'Change password' }, configureMfa: { id: 'settings.configure_mfa', defaultMessage: 'Configure MFA' }, - deleteAccount: { id: 'settings.delete_account', defaultMessage: 'Delete Account' }, + deleteAccount: { id: 'settings.delete_account', defaultMessage: 'Delete account' }, domainBlocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Hidden domains' }, - editProfile: { id: 'settings.edit_profile', defaultMessage: 'Edit Profile' }, + editProfile: { id: 'settings.edit_profile', defaultMessage: 'Edit profile' }, exportData: { id: 'column.export_data', defaultMessage: 'Export data' }, filters: { id: 'navigation_bar.filters', defaultMessage: 'Filters' }, importData: { id: 'navigation_bar.import_data', defaultMessage: 'Import data' }, @@ -28,7 +28,7 @@ const messages = defineMessages({ mfaEnabled: { id: 'mfa.enabled', defaultMessage: 'Enabled' }, mutes: { id: 'settings.mutes', defaultMessage: 'Mutes' }, mutesAndBlocks: { id: 'settings.mutes_blocks', defaultMessage: 'Mutes and blocks' }, - other: { id: 'settings.other', defaultMessage: 'Other Options' }, + other: { id: 'settings.other', defaultMessage: 'Other options' }, preferences: { id: 'settings.preferences', defaultMessage: 'Preferences' }, profile: { id: 'settings.profile', defaultMessage: 'Profile' }, security: { id: 'settings.security', defaultMessage: 'Security' }, diff --git a/src/features/status/index.tsx b/src/features/status/index.tsx index 19be5f2e3f..64060c5b61 100644 --- a/src/features/status/index.tsx +++ b/src/features/status/index.tsx @@ -14,7 +14,7 @@ import Thread from './components/thread'; import ThreadLoginCta from './components/thread-login-cta'; const messages = defineMessages({ - title: { id: 'status.title', defaultMessage: 'Post Details' }, + title: { id: 'status.title', defaultMessage: 'Post details' }, titleDirect: { id: 'status.title_direct', defaultMessage: 'Direct message' }, deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' }, deleteHeading: { id: 'confirmations.delete.heading', defaultMessage: 'Delete post' }, @@ -28,7 +28,7 @@ const messages = defineMessages({ detailedStatus: { id: 'status.detailed_status', defaultMessage: 'Detailed conversation view' }, replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' }, replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' }, - blockAndReport: { id: 'confirmations.block.block_and_report', defaultMessage: 'Block & Report' }, + blockAndReport: { id: 'confirmations.block.block_and_report', defaultMessage: 'Block and report' }, }); type RouteParams = { diff --git a/src/features/ui/components/compose-button.tsx b/src/features/ui/components/compose-button.tsx index e2e03ab12c..9e230293bf 100644 --- a/src/features/ui/components/compose-button.tsx +++ b/src/features/ui/components/compose-button.tsx @@ -59,7 +59,7 @@ const GroupComposeButton = () => { - + diff --git a/src/features/ui/components/modals/manage-group-modal/create-group-modal.tsx b/src/features/ui/components/modals/manage-group-modal/create-group-modal.tsx index e608134b97..9bfed7291f 100644 --- a/src/features/ui/components/modals/manage-group-modal/create-group-modal.tsx +++ b/src/features/ui/components/modals/manage-group-modal/create-group-modal.tsx @@ -97,12 +97,12 @@ const CreateGroupModal: React.FC = ({ onClose }) => { const renderModalTitle = () => { switch (currentStep) { case Steps.ONE: - return ; + return ; default: if (params.group_visibility === 'everyone') { - return ; + return ; } else { - return ; + return ; } } }; diff --git a/src/locales/en.json b/src/locales/en.json index 23123ebfe8..3359cdd59f 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -311,10 +311,10 @@ "column.admin.edit_announcement": "Edit announcement", "column.admin.edit_domain": "Edit domain", "column.admin.edit_rule": "Edit rule", - "column.admin.moderation_log": "Moderation Log", + "column.admin.moderation_log": "Moderation log", "column.admin.relays": "Instance relays", "column.admin.reports": "Reports", - "column.admin.reports.menu.moderation_log": "Moderation Log", + "column.admin.reports.menu.moderation_log": "Moderation log", "column.admin.rules": "Instance rules", "column.admin.users": "Users", "column.aliases": "Account aliases", @@ -349,7 +349,7 @@ "column.federation_restrictions": "Federation Restrictions", "column.filters": "Muted words", "column.filters.accounts": "Accounts", - "column.filters.add_new": "Add New Filter", + "column.filters.add_new": "Add new filter", "column.filters.conversations": "Conversations", "column.filters.create_error": "Error adding filter", "column.filters.delete": "Delete", @@ -372,7 +372,7 @@ "column.filters.keywords": "Keywords or phrases", "column.filters.notifications": "Notifications", "column.filters.public_timeline": "Public timeline", - "column.filters.subheading_add_new": "Add New Filter", + "column.filters.subheading_add_new": "Add new filter", "column.filters.title": "Title", "column.filters.whole_word": "Whole word", "column.follow_requests": "Follow requests", @@ -386,7 +386,7 @@ "column.import_data": "Import data", "column.info": "Server information", "column.lists": "Lists", - "column.manage_group": "Manage Group", + "column.manage_group": "Manage group", "column.mentions": "Mentions", "column.mfa": "Multi-Factor Authentication", "column.mfa_cancel": "Cancel", @@ -402,8 +402,8 @@ "column.quotes": "Post quotes", "column.reactions": "Reactions", "column.reblogs": "Reposts", - "column.registration": "Sign Up", - "column.scheduled_statuses": "Scheduled Posts", + "column.registration": "Sign up", + "column.scheduled_statuses": "Scheduled posts", "column.search": "Search", "column.settings_store": "Settings store", "column.soapbox_config": "Soapbox config", @@ -500,12 +500,12 @@ "confirmations.admin.reject_user.confirm": "Reject @{name}", "confirmations.admin.reject_user.heading": "Reject @{acct}", "confirmations.admin.reject_user.message": "You are about to reject @{acct} registration request. This action cannot be undone.", - "confirmations.block.block_and_report": "Block & Report", + "confirmations.block.block_and_report": "Block and report", "confirmations.block.confirm": "Block", "confirmations.block.heading": "Block @{name}", "confirmations.block.message": "Are you sure you want to block {name}?", - "confirmations.block_from_group.confirm": "Ban User", - "confirmations.block_from_group.heading": "Ban From Group", + "confirmations.block_from_group.confirm": "Ban user", + "confirmations.block_from_group.heading": "Ban from group", "confirmations.block_from_group.message": "Are you sure you want to ban @{name} from the group?", "confirmations.cancel.confirm": "Discard", "confirmations.cancel.heading": "Discard post", @@ -527,7 +527,7 @@ "confirmations.delete_event.message": "Are you sure you want to delete this event?", "confirmations.delete_from_group.message": "Are you sure you want to delete @{name}'s post?", "confirmations.delete_group.confirm": "Delete", - "confirmations.delete_group.heading": "Delete Group", + "confirmations.delete_group.heading": "Delete group", "confirmations.delete_group.message": "Are you sure you want to delete this group? This is a permanent action that cannot be undone.", "confirmations.delete_list.confirm": "Delete", "confirmations.delete_list.heading": "Delete list", @@ -609,7 +609,7 @@ "draft_status.edit": "Edit", "edit_bookmark_folder_modal.confirm": "Save", "edit_bookmark_folder_modal.header_title": "Edit folder", - "edit_email.header": "Change Email", + "edit_email.header": "Change email", "edit_email.placeholder": "me@example.com", "edit_federation.followers_only": "Hide posts except to followers", "edit_federation.force_nsfw": "Force attachments to be marked sensitive", @@ -618,7 +618,7 @@ "edit_federation.save": "Save", "edit_federation.success": "{host} federation was updated", "edit_federation.unlisted": "Force posts unlisted", - "edit_password.header": "Change Password", + "edit_password.header": "Change password", "edit_profile.error": "Profile update failed", "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter", "edit_profile.fields.bio_label": "Bio", @@ -637,7 +637,7 @@ "edit_profile.fields.meta_fields.label_placeholder": "Label", "edit_profile.fields.meta_fields_label": "Profile fields", "edit_profile.fields.stranger_notifications_label": "Block notifications from strangers", - "edit_profile.header": "Edit Profile", + "edit_profile.header": "Edit profile", "edit_profile.hints.accepts_email_list": "Opt-in to news and marketing updates.", "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored", "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services", @@ -772,7 +772,7 @@ "fediverse_tab.explanation_box.dismiss": "Don't show again", "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.", "fediverse_tab.explanation_box.title": "What is the Fediverse?", - "feed_suggestions.heading": "Suggested Profiles", + "feed_suggestions.heading": "Suggested profiles", "feed_suggestions.view_all": "View all", "filters.added": "Filter added.", "filters.context_header": "Filter contexts", @@ -786,7 +786,7 @@ "filters.filters_list_phrases_label": "Keywords or phrases:", "filters.filters_list_warn": "Display warning", "filters.removed": "Filter deleted.", - "follow_recommendations.heading": "Suggested Profiles", + "follow_recommendations.heading": "Suggested profiles", "follow_request.authorize": "Authorize", "follow_request.reject": "Reject", "gdpr.accept": "Accept", @@ -796,7 +796,7 @@ "generic.saved": "Saved", "getting_started.open_source_notice": "{code_name} is open source software. You can contribute or report issues at {code_link} (v{code_version}).", "group.banned.message": "You are banned from {group}", - "group.cancel_request": "Cancel Request", + "group.cancel_request": "Cancel request", "group.delete.success": "Group successfully deleted", "group.deleted.message": "This group has been deleted.", "group.demote.user.success": "@{name} is now a member", @@ -811,17 +811,17 @@ "group.group_mod_unblock": "Unban", "group.group_mod_unblock.success": "Unbanned @{name} from group", "group.header.alt": "Group header", - "group.join.private": "Request Access", - "group.join.public": "Join Group", + "group.join.private": "Request access", + "group.join.public": "Join group", "group.join.request_success": "Request sent to group owner", "group.join.success": "Group joined successfully!", - "group.leave": "Leave Group", + "group.leave": "Leave group", "group.leave.label": "Leave", "group.leave.success": "Left the group", - "group.manage": "Manage Group", + "group.manage": "Manage group", "group.member.admin.limit.summary": "You can assign up to {count, plural, one {admin} other {admins}} for the group at this time.", "group.member.admin.limit.title": "Admin limit reached", - "group.popover.action": "View Group", + "group.popover.action": "View group", "group.popover.summary": "You must be a member of the group in order to reply to this status.", "group.popover.title": "Membership required", "group.privacy.locked": "Private", @@ -832,7 +832,7 @@ "group.privacy.public.info": "Discoverable. Anyone can join.", "group.private.message": "Content is only visible to group members", "group.promote.admin.confirmation.message": "Are you sure you want to assign the admin role to @{name}?", - "group.promote.admin.confirmation.title": "Assign Admin Role", + "group.promote.admin.confirmation.title": "Assign admin role", "group.promote.admin.success": "@{name} is now an admin", "group.role.admin": "Admin", "group.role.owner": "Owner", @@ -925,7 +925,7 @@ "lists.edit.submit": "Change title", "lists.new.create": "Add list", "lists.new.create_title": "Add list", - "lists.new.save_title": "Save Title", + "lists.new.save_title": "Save title", "lists.new.title_placeholder": "New list title", "lists.search": "Search among people you follow", "lists.subheading": "Your lists", @@ -947,8 +947,8 @@ "login_external.errors.network_fail": "Connection failed. Is a browser extension blocking it?", "login_form.divider": "or", "login_form.external": "Sign in from remote instance", - "login_form.header": "Sign In", - "manage_group.blocked_members": "Banned Members", + "login_form.header": "Sign in", + "manage_group.blocked_members": "Banned members", "manage_group.confirmation.copy": "Copy link", "manage_group.confirmation.info_1": "As the owner of this group, you can assign staff, delete posts and much more.", "manage_group.confirmation.info_2": "Post the group's first post and get the conversation started.", @@ -956,9 +956,9 @@ "manage_group.confirmation.share": "Share this group", "manage_group.confirmation.title": "You’re all set!", "manage_group.create": "Create Group", - "manage_group.delete_group": "Delete Group", + "manage_group.delete_group": "Delete group", "manage_group.done": "Done", - "manage_group.edit_group": "Edit Group", + "manage_group.edit_group": "Edit group", "manage_group.fields.cannot_change_hint": "This cannot be changed after the group is created.", "manage_group.fields.description_label": "Description", "manage_group.fields.description_placeholder": "Description", @@ -969,7 +969,7 @@ "manage_group.fields.name_placeholder": "Group Name", "manage_group.get_started": "Let’s get started!", "manage_group.next": "Next", - "manage_group.pending_requests": "Pending Requests", + "manage_group.pending_requests": "Pending requests", "manage_group.privacy.hint": "These settings cannot be changed later.", "manage_group.privacy.label": "Privacy settings", "manage_group.privacy.private.hint": "Discoverable. Users can join after their request is approved.", @@ -992,7 +992,7 @@ "mfa.mfa_setup_scan_title": "Scan", "mfa.mfa_setup_verify_title": "Verify", "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.", - "mfa.otp_enabled_title": "OTP Enabled", + "mfa.otp_enabled_title": "OTP enabled", "mfa.setup_recoverycodes": "Recovery codes", "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.", "migration.fields.acct.label": "Handle of the new account", @@ -1023,7 +1023,7 @@ "navbar.login.username.placeholder": "Email or username", "navigation.chats": "Chats", "navigation.compose": "Compose", - "navigation.compose_group": "Compose to Group", + "navigation.compose_group": "Compose to group", "navigation.dashboard": "Dashboard", "navigation.developers": "Developers", "navigation.direct_messages": "Messages", @@ -1042,9 +1042,9 @@ "navigation_bar.compose_quote": "Quote post", "navigation_bar.compose_reply": "Reply to post", "navigation_bar.create_event": "Create new event", - "navigation_bar.create_group": "Create Group", - "navigation_bar.create_group.private": "Create Private Group", - "navigation_bar.create_group.public": "Create Public Group", + "navigation_bar.create_group": "Create group", + "navigation_bar.create_group.private": "Create private group", + "navigation_bar.create_group.public": "Create public group", "navigation_bar.domain_blocks": "Domain blocks", "navigation_bar.edit_group": "Edit Group", "navigation_bar.favourites": "Likes", @@ -1119,11 +1119,11 @@ "onboarding.skip": "Skip for now", "onboarding.suggestions.subtitle": "Here are a few of the most popular accounts you might like.", "onboarding.suggestions.title": "Suggested accounts", - "onboarding.view_feed": "View Feed", + "onboarding.view_feed": "View feed", "password_reset.confirmation": "Check your email for confirmation.", "password_reset.fields.email_placeholder": "E-mail address", "password_reset.fields.username_placeholder": "Email or username", - "password_reset.header": "Reset Password", + "password_reset.header": "Reset password", "password_reset.reset": "Reset password", "patron.donate": "Donate", "patron.title": "Funding Goal", @@ -1197,7 +1197,7 @@ "registration.closed_title": "Registrations closed", "registration.confirmation_modal.close": "Close", "registration.fields.confirm_placeholder": "Password (again)", - "registration.fields.email_placeholder": "E-Mail address", + "registration.fields.email_placeholder": "E-mail address", "registration.fields.password_placeholder": "Password", "registration.fields.username_hint": "Only letters, numbers, and underscores are allowed.", "registration.fields.username_placeholder": "Username", @@ -1288,11 +1288,11 @@ "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.delete": "Delete Account", + "security.headers.delete": "Delete account", "security.headers.tokens": "Sessions", "security.qr.fail": "Failed to fetch setup key", "security.submit": "Save changes", - "security.submit.delete": "Delete Account", + "security.submit.delete": "Delete account", "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.text.delete.local": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone.", "security.tokens.revoke": "Revoke", @@ -1303,16 +1303,16 @@ "select_bookmark_folder_modal.header_title": "Select folder", "settings.account_migration": "Move Account", "settings.blocks": "Blocks", - "settings.change_email": "Change Email", - "settings.change_password": "Change Password", + "settings.change_email": "Change email", + "settings.change_password": "Change password", "settings.configure_mfa": "Configure MFA", - "settings.delete_account": "Delete Account", - "settings.edit_profile": "Edit Profile", + "settings.delete_account": "Delete account", + "settings.edit_profile": "Edit profile", "settings.messages.label": "Allow users to start a new chat with you", "settings.mutes": "Mutes", - "settings.other": "Other Options", + "settings.mutes_blocks": "Mutes and blocks", + "settings.other": "Other options", "settings.preferences": "Preferences", - "settings.privacy": "Privacy", "settings.profile": "Profile", "settings.save.success": "Your preferences have been saved!", "settings.security": "Security", @@ -1384,7 +1384,7 @@ "status.cancel_reblog_private": "Un-repost", "status.cannot_reblog": "This post cannot be reposted", "status.chat": "Chat with @{name}", - "status.copy": "Copy Link to Post", + "status.copy": "Copy link to post", "status.delete": "Delete", "status.detailed_status": "Detailed conversation view", "status.direct": "Direct message @{name}", @@ -1406,7 +1406,7 @@ "status.mention": "Mention @{name}", "status.more": "More", "status.mute_conversation": "Mute Conversation", - "status.open": "Show Post Details", + "status.open": "Show post details", "status.pin": "Pin on profile", "status.pinned": "Pinned post", "status.quote": "Quote post", @@ -1437,7 +1437,7 @@ "status.show_less_all": "Show less for all", "status.show_more_all": "Show more for all", "status.show_original": "Show original", - "status.title": "Post Details", + "status.title": "Post details", "status.title_direct": "Direct message", "status.translate": "Translate", "status.translated_from_with": "Translated from {lang} using {provider}",