fix: internationalize dialogs (#2033)

* fix: internationalize dialogs

Fixes #1988

* test: fix test

* test: fix test

* Revert "test: fix test"

This reverts commit 559e3d80eb.
This commit is contained in:
Nolan Lawson 2021-04-11 19:40:18 -07:00 committed by GitHub
parent ad9609738b
commit 66fc202b5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 32 additions and 20 deletions

View File

@ -653,5 +653,15 @@ export default {
createdFilter: 'Created filter',
failedToModifyFilter: 'Failed to modify filter: {error}',
deletedFilter: 'Deleted filter',
required: 'Required'
required: 'Required',
// Dialogs
profileOptions: 'Profile options',
copyLink: 'Copy link',
emoji: 'Emoji',
editMedia: 'Edit media',
shortcutHelp: 'Shortcut help',
statusOptions: 'Status options',
confirm: 'Confirm',
closeDialog: 'Close dialog',
postPrivacy: 'Post privacy'
}

View File

@ -14,7 +14,7 @@
{/if}
<div class="close-dialog-button-wrapper">
<button class="close-dialog-button focus-fix"
data-a11y-dialog-hide aria-label="Close dialog">
data-a11y-dialog-hide aria-label="{intl.closeDialog}">
<SvgIcon className="close-dialog-button-svg" href="#fa-times" />
</button>
</div>

View File

@ -3,7 +3,7 @@ import { showDialog } from './showDialog'
export default function showAccountProfileOptionsDialog (account, relationship, verifyCredentials) {
return showDialog(AccountProfileOptionsDialog, {
label: 'Profile options dialog',
label: 'intl.profileOptions',
title: '',
account: account,
relationship: relationship,

View File

@ -2,5 +2,5 @@ import ComposeDialog from '../components/ComposeDialog.html'
import { showDialog } from './showDialog'
export default function showComposeDialog () {
return showDialog(ComposeDialog, { label: 'Compose dialog' })
return showDialog(ComposeDialog, { label: 'intl.composeStatus' })
}

View File

@ -3,8 +3,8 @@ import { showDialog } from './showDialog'
export default function showCopyDialog (text) {
return showDialog(CopyDialog, {
label: 'Copy dialog',
title: 'Copy link',
label: 'intl.copyLink',
title: 'intl.copyLink',
text
})
}

View File

@ -3,8 +3,8 @@ import { showDialog } from './showDialog'
export default function showEmojiDialog (realm) {
return showDialog(EmojiDialog, {
label: 'Emoji dialog',
title: 'Emoji',
label: 'intl.emoji',
title: 'intl.emoji',
realm
})
}

View File

@ -3,7 +3,7 @@ import { showDialog } from './showDialog'
export default function showMediaDialog (mediaItems, scrolledItem) {
return showDialog(MediaDialog, {
label: 'Media dialog',
label: 'intl.media',
mediaItems,
scrolledItem
})

View File

@ -3,8 +3,8 @@ import { showDialog } from './showDialog'
export default function showMediaEditDialog (realm, index, type) {
return showDialog(MediaFocalPointDialog, {
label: 'Edit media',
title: 'Edit media',
label: 'intl.editMedia',
title: 'intl.editMedia',
realm,
index,
type

View File

@ -3,7 +3,7 @@ import { showDialog } from './showDialog'
export default function showMuteDialog (account) {
return showDialog(MuteDialog, {
label: 'Mute dialog',
label: 'intl.mute',
account
})
}

View File

@ -3,8 +3,8 @@ import { showDialog } from './showDialog'
export default function showPostPrivacyDialog (realm) {
return showDialog(PostPrivacyDialog, {
label: 'Post privacy dialog',
title: 'Post privacy',
label: 'intl.postPrivacy',
title: 'intl.postPrivacy',
realm: realm
})
}

View File

@ -1,10 +1,12 @@
import ReportDialog from '../components/ReportDialog.html'
import { showDialog } from './showDialog'
import { formatIntl } from '../../../_utils/formatIntl'
export default function showReportDialog ({ account, status }) {
const label = formatIntl('intl.reportAccount', { account: `@${account.acct}` })
return showDialog(ReportDialog, {
label: 'Report dialog',
title: `Report @${account.acct}`,
label,
title: label,
account,
status
})

View File

@ -3,6 +3,6 @@ import { showDialog } from './showDialog'
export default function showShortcutHelpDialog (options) {
return showDialog(ShortcutHelpDialog, Object.assign({
label: 'shortcut help dialog'
label: 'intl.shortcutHelp'
}, options))
}

View File

@ -3,7 +3,7 @@ import { showDialog } from './showDialog'
export default function showStatusOptionsDialog (status) {
return showDialog(StatusOptionsDialog, {
label: 'Status options dialog',
label: 'intl.statusOptions',
title: '',
status: status
})

View File

@ -3,6 +3,6 @@ import { showDialog } from './showDialog'
export default function showTextConfirmationDialog (options) {
return showDialog(TextConfirmationDialog, Object.assign({
label: 'Confirmation dialog'
label: 'intl.confirm'
}, options))
}

View File

@ -81,7 +81,7 @@ export const composePollAddButton = $('.compose-poll button:last-of-type')
export const composeMediaSensitiveCheckbox = $('.compose-media-sensitive input')
export const postPrivacyDialogButtonUnlisted = $('[aria-label="Post privacy dialog"] li:nth-child(2) button')
export const postPrivacyDialogButtonUnlisted = $('[aria-label="Post privacy"] li:nth-child(2) button')
export const accountProfileFilterStatuses = $('.account-profile-filters li:nth-child(1)')
export const accountProfileFilterStatusesAndReplies = $('.account-profile-filters li:nth-child(2)')