moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix test 

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak 2022-08-04 00:09:47 +02:00
parent 81af0e64f1
commit 2ea76f74cf
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/soapbox/features/ui/components/compose_modal.tsx
View File

@ -11,7 +11,7 @@ import ComposeFormContainer from '../../compose/containers/compose_form_containe
const messages = defineMessages({ const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' }, close: { id: 'lightbox.close', defaultMessage: 'Close' },
confirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' }, confirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
discardConfirm: { id: 'confirmations.discard_edit.confirm', defaultMessage: 'Discard' }, cancelEditing: { id: 'confirmations.cancel_editing.confirm', defaultMessage: 'Cancel editing' },
}); });
interface IComposeModal { interface IComposeModal {
@ -33,12 +33,12 @@ const ComposeModal: React.FC<IComposeModal> = ({ onClose }) => {
dispatch(openModal('CONFIRM', { dispatch(openModal('CONFIRM', {
icon: require('@tabler/icons/trash.svg'), icon: require('@tabler/icons/trash.svg'),
heading: statusId heading: statusId
? <FormattedMessage id='confirmations.discard_edit.heading' defaultMessage='Discard post changes' /> ? <FormattedMessage id='confirmations.cancel_editing.heading' defaultMessage='Cancel post editing' />
: <FormattedMessage id='confirmations.delete.heading' defaultMessage='Delete post' />, : <FormattedMessage id='confirmations.delete.heading' defaultMessage='Delete post' />,
message: statusId message: statusId
? <FormattedMessage id='confirmations.discard_edit.message' defaultMessage='Are you sure you want to discard changes to this post?' /> ? <FormattedMessage id='confirmations.cancel_editing.message' defaultMessage='Are you sure you want to cancel editing this post? All changes will be lost.' />
: <FormattedMessage id='confirmations.delete.message' defaultMessage='Are you sure you want to delete this post?' />, : <FormattedMessage id='confirmations.delete.message' defaultMessage='Are you sure you want to delete this post?' />,
confirm: intl.formatMessage(statusId ? messages.discardConfirm : messages.confirm), confirm: intl.formatMessage(statusId ? messages.cancelEditing : messages.confirm),
onConfirm: () => { onConfirm: () => {
dispatch(closeModal('COMPOSE')); dispatch(closeModal('COMPOSE'));
dispatch(cancelReplyCompose()); dispatch(cancelReplyCompose());

3
app/soapbox/locales/pl.json
View File

@ -339,9 +339,6 @@
"confirmations.delete_list.confirm": "Usuń", "confirmations.delete_list.confirm": "Usuń",
"confirmations.delete_list.heading": "Usuń listę", "confirmations.delete_list.heading": "Usuń listę",
"confirmations.delete_list.message": "Czy na pewno chcesz bezpowrotnie usunąć tą listę?", "confirmations.delete_list.message": "Czy na pewno chcesz bezpowrotnie usunąć tą listę?",
"confirmations.discard_edit.confirm": "Odrzuć",
"confirmations.discard_edit.heading": "Odrzuć edycję wpisu",
"confirmations.discard_edit.message": "Czy na pewno chcesz odrzucić zmiany w tym wpisie?",
"confirmations.domain_block.confirm": "Ukryj wszysyko z domeny", "confirmations.domain_block.confirm": "Ukryj wszysyko z domeny",
"confirmations.domain_block.heading": "Zablokuj {domain}", "confirmations.domain_block.heading": "Zablokuj {domain}",
"confirmations.domain_block.message": "Czy na pewno chcesz zablokować całą domenę {domain}? Zwykle lepszym rozwiązaniem jest blokada lub wyciszenie kilku użytkowników.", "confirmations.domain_block.message": "Czy na pewno chcesz zablokować całą domenę {domain}? Zwykle lepszym rozwiązaniem jest blokada lub wyciszenie kilku użytkowników.",

1
app/soapbox/reducers/__tests__/compose.test.ts
View File

@ -44,6 +44,7 @@ describe('compose reducer', () => {
type: actions.COMPOSE_SET_STATUS, type: actions.COMPOSE_SET_STATUS,
status: normalizeStatus(fromJS(require('soapbox/__fixtures__/pleroma-status-deleted.json'))), status: normalizeStatus(fromJS(require('soapbox/__fixtures__/pleroma-status-deleted.json'))),
v: { software: 'Pleroma' }, v: { software: 'Pleroma' },
withRedraft: true,
}; };
const result = reducer(undefined, action); const result = reducer(undefined, action);