matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

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

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

Closes #1553

See merge request soapbox-pub/soapbox!2799
This commit is contained in:
Alex Gleason
2023-10-11 20:27:32 +00:00
parent 04214c5075 c62e595c58
commit d0170dc449
44 changed files with 305 additions and 962 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/features/ui/components/floating-action-button.tsx
View File

@ -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. */

2
src/features/ui/components/modals/actions-modal.tsx
View File

@ -64,7 +64,7 @@ const ActionsModal: React.FC<IActionsModal> = ({ status, actions, onClick, onClo
<li>
<button type='button' onClick={onClose}>
<FormattedMessage id='lightbox.close' defaultMessage='Cancel' />
<FormattedMessage id='lightbox.close' defaultMessage='Close' />
</button>
</li>
</ul>

2
src/features/ui/components/modals/compose-event-modal/upload-button.tsx
View File

@ -34,7 +34,7 @@ const UploadButton: React.FC<IUploadButton> = ({ disabled, onSelectFile }) => {
/>
<Text size='sm' theme='primary' weight='semibold' transform='uppercase' tabIndex={0}>
<FormattedMessage id='compose_event.upload_banner' defaultMessage='Upload photo' />
<FormattedMessage id='compose_event.upload_banner' defaultMessage='Upload event banner' />
</Text>
<input
ref={fileElement}

2
src/features/ui/components/modals/compose-modal.tsx
View File

@ -69,7 +69,7 @@ const ComposeModal: React.FC<IComposeModal> = ({ onClose, composeId = 'compose-m
} else if (quote) {
return <FormattedMessage id='navigation_bar.compose_quote' defaultMessage='Quote post' />;
} else {
return <FormattedMessage id='navigation_bar.compose' defaultMessage='Compose new post' />;
return <FormattedMessage id='navigation_bar.compose' defaultMessage='Compose a post' />;
}
};

4
src/features/ui/components/modals/edit-announcement-modal.tsx
View File

@ -10,8 +10,8 @@ import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
const messages = defineMessages({
save: { id: 'admin.edit_announcement.save', defaultMessage: 'Save' },
announcementContentPlaceholder: { id: 'admin.edit_announcement.fields.content_placeholder', defaultMessage: 'Announcement content' },
announcementStartTimePlaceholder: { id: 'admin.edit_announcement.fields.start_time_placeholder', defaultMessage: 'Announcement starts on…' },
announcementEndTimePlaceholder: { id: 'admin.edit_announcement.fields.end_time_placeholder', defaultMessage: 'Announcement ends on…' },
announcementStartTimePlaceholder: { id: 'admin.edit_announcement.fields.start_time_placeholder', defaultMessage: 'Announcement starts on:' },
announcementEndTimePlaceholder: { id: 'admin.edit_announcement.fields.end_time_placeholder', defaultMessage: 'Announcement ends on:' },
});
interface IEditAnnouncementModal {

2
src/features/ui/components/modals/missing-description-modal.tsx
View File

@ -4,7 +4,7 @@ import { injectIntl, FormattedMessage, IntlShape, defineMessages } from 'react-i
import { Modal } from 'soapbox/components/ui';
const messages = defineMessages({
modalTitle: { id: 'missing_description_modal.text', defaultMessage: 'You have not entered a description for all attachments.' },
modalTitle: { id: 'missing_description_modal.text', defaultMessage: 'You have not entered a description for all attachments. Continue anyway?' },
post: { id: 'missing_description_modal.continue', defaultMessage: 'Post' },
cancel: { id: 'missing_description_modal.cancel', defaultMessage: 'Cancel' },
});

4
src/features/ui/components/navbar.tsx
View File

@ -18,7 +18,7 @@ import type { AxiosError } from 'axios';
const messages = defineMessages({
login: { id: 'navbar.login.action', defaultMessage: 'Log in' },
username: { id: 'navbar.login.username.placeholder', defaultMessage: 'E-mail or username' },
username: { id: 'navbar.login.username.placeholder', defaultMessage: 'Email or username' },
email: { id: 'navbar.login.email.placeholder', defaultMessage: 'E-mail address' },
password: { id: 'navbar.login.password.label', defaultMessage: 'Password' },
forgotPassword: { id: 'navbar.login.forgot_password', defaultMessage: 'Forgot password?' },
@ -170,7 +170,7 @@ const Navbar = () => {
size='sm'
{...(features.nostrSignup ? { onClick: handleNostrLogin } : { to: '/login' })}
>
<FormattedMessage id='account.login' defaultMessage='Log In' />
<FormattedMessage id='account.login' defaultMessage='Log in' />
</Button>
{(isOpen) && (

2
src/features/ui/components/panels/sign-up-panel.tsx
View File

@ -19,7 +19,7 @@ const SignUpPanel = () => {
</Text>
<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>
</Stack>

2
src/features/ui/components/profile-stats.tsx
View File

@ -9,7 +9,7 @@ import type { Account } from 'soapbox/schemas';
const messages = defineMessages({
followers: { id: 'account.followers', defaultMessage: 'Followers' },
follows: { id: 'account.follows', defaultMessage: 'Follows' },
follows: { id: 'account.follows', defaultMessage: 'Following' },
});
interface IProfileStats {

2
src/features/ui/components/user-panel.tsx
View File

@ -97,7 +97,7 @@ const UserPanel: React.FC<IUserPanel> = ({ accountId, action, badges, domain })
{shortNumberFormat(account.following_count)}
</Text>
<Text weight='bold' size='sm'>
<FormattedMessage id='account.follows' defaultMessage='Follows' />
<FormattedMessage id='account.follows' defaultMessage='Following' />
</Text>
</HStack>
</Link>