Merge remote-tracking branch 'parent/main' into kb_migration

This commit is contained in:
KMY 2023-08-26 18:32:39 +09:00
commit 3affa4177d
13 changed files with 146 additions and 85 deletions
app/javascript/mastodon/actions

View file

@ -90,6 +90,7 @@ const messages = defineMessages({
uploadErrorPoll: { id: 'upload_error.poll', defaultMessage: 'File upload not allowed with polls.' },
open: { id: 'compose.published.open', defaultMessage: 'Open' },
published: { id: 'compose.published.body', defaultMessage: 'Post published.' },
saved: { id: 'compose.saved.body', defaultMessage: 'Post saved.' },
});
export const ensureComposeIsVisible = (getState, routerHistory) => {
@ -253,7 +254,7 @@ export function submitCompose(routerHistory) {
}
dispatch(showAlert({
message: messages.published,
message: statusId === null ? messages.published : messages.saved,
action: messages.open,
dismissAfter: 10000,
onClick: () => routerHistory.push(`/@${response.data.account.username}/${response.data.id}`),