Mastodon
/
Whalebird-desktop-client-mac-linux-windows
mirror of https://github.com/h3poteto/whalebird-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3999 from h3poteto/dependabot/npm_and_yarn/i18next-22.4.9 

build(deps): bump i18next from 21.9.1 to 22.4.9
This commit is contained in:
AkiraFukushima 2023-01-14 10:51:14 +09:00 committed by GitHub
parent 067c17ec6e 995c040649
commit cc627ca854
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@ -93,7 +93,7 @@
"electron-window-state": "^5.0.3", "electron-window-state": "^5.0.3",
"element-plus": "^2.2.28", "element-plus": "^2.2.28",
"emoji-mart-vue-fast": "^12.0.1", "emoji-mart-vue-fast": "^12.0.1",
"i18next": "^21.9.1", "i18next": "^22.4.9",
"megalodon": "5.0.6", "megalodon": "5.0.6",
"minimist": "^1.2.7", "minimist": "^1.2.7",
"mitt": "^3.0.0", "mitt": "^3.0.0",
@ -125,7 +125,6 @@
"@electron/universal": "^1.3.4", "@electron/universal": "^1.3.4",
"@types/auto-launch": "^5.0.2", "@types/auto-launch": "^5.0.2",
"@types/electron-json-storage": "^4.5.0", "@types/electron-json-storage": "^4.5.0",
"@types/i18next": "^13.0.0",
"@types/jest": "27.4.1", "@types/jest": "27.4.1",
"@types/jsdom": "^20.0.1", "@types/jsdom": "^20.0.1",
"@types/node": "^18.11.18", "@types/node": "^18.11.18",

58
src/main/index.ts
View File

@ -847,22 +847,22 @@ const ApplicationMenu = (accountsChange: Array<MenuItemConstructorOptions>, menu
type: 'separator' type: 'separator'
}, },
{ {
label: i18n.t('main_menu.application.services'), label: i18n.t<string>('main_menu.application.services'),
role: 'services' role: 'services'
}, },
{ {
type: 'separator' type: 'separator'
}, },
{ {
label: i18n.t('main_menu.application.hide'), label: i18n.t<string>('main_menu.application.hide'),
role: 'hide' role: 'hide'
}, },
{ {
label: i18n.t('main_menu.application.hide_others'), label: i18n.t<string>('main_menu.application.hide_others'),
role: 'hideOthers' role: 'hideOthers'
}, },
{ {
label: i18n.t('main_menu.application.show_all'), label: i18n.t<string>('main_menu.application.show_all'),
role: 'unhide' role: 'unhide'
} }
] ]
@ -872,7 +872,7 @@ const ApplicationMenu = (accountsChange: Array<MenuItemConstructorOptions>, menu
? [] ? []
: [ : [
{ {
label: i18n.t('main_menu.window.always_show_menu_bar'), label: i18n.t<string>('main_menu.window.always_show_menu_bar'),
type: 'checkbox', type: 'checkbox',
checked: !menu.autoHideMenu, checked: !menu.autoHideMenu,
click: item => { click: item => {
@ -888,14 +888,14 @@ const ApplicationMenu = (accountsChange: Array<MenuItemConstructorOptions>, menu
process.platform === 'darwin' process.platform === 'darwin'
? [ ? [
{ {
label: i18n.t('main_menu.application.quit'), label: i18n.t<string>('main_menu.application.quit'),
accelerator: 'CmdOrCtrl+Q', accelerator: 'CmdOrCtrl+Q',
role: 'quit' role: 'quit'
} }
] ]
: [ : [
{ {
label: i18n.t('main_menu.application.quit'), label: i18n.t<string>('main_menu.application.quit'),
accelerator: 'CmdOrCtrl+Q', accelerator: 'CmdOrCtrl+Q',
click: () => { click: () => {
mainWindow!.destroy() mainWindow!.destroy()
@ -905,10 +905,10 @@ const ApplicationMenu = (accountsChange: Array<MenuItemConstructorOptions>, menu
const template: Array<MenuItemConstructorOptions> = [ const template: Array<MenuItemConstructorOptions> = [
{ {
label: i18n.t('main_menu.application.name'), label: i18n.t<string>('main_menu.application.name'),
submenu: [ submenu: [
{ {
label: i18n.t('main_menu.application.about'), label: i18n.t<string>('main_menu.application.about'),
role: 'about', role: 'about',
click: () => { click: () => {
openAboutWindow({ openAboutWindow({
@ -923,14 +923,14 @@ const ApplicationMenu = (accountsChange: Array<MenuItemConstructorOptions>, menu
type: 'separator' type: 'separator'
}, },
{ {
label: i18n.t('main_menu.application.preferences'), label: i18n.t<string>('main_menu.application.preferences'),
accelerator: 'CmdOrCtrl+,', accelerator: 'CmdOrCtrl+,',
click: () => { click: () => {
mainWindow!.webContents.send('open-preferences') mainWindow!.webContents.send('open-preferences')
} }
}, },
{ {
label: i18n.t('main_menu.application.shortcuts'), label: i18n.t<string>('main_menu.application.shortcuts'),
accelerator: 'Shift+?', accelerator: 'Shift+?',
click: () => { click: () => {
mainWindow!.webContents.send('open-shortcuts-list') mainWindow!.webContents.send('open-shortcuts-list')
@ -944,10 +944,10 @@ const ApplicationMenu = (accountsChange: Array<MenuItemConstructorOptions>, menu
] ]
}, },
{ {
label: i18n.t('main_menu.toot.name'), label: i18n.t<string>('main_menu.toot.name'),
submenu: [ submenu: [
{ {
label: i18n.t('main_menu.toot.new'), label: i18n.t<string>('main_menu.toot.new'),
accelerator: 'CmdOrCtrl+N', accelerator: 'CmdOrCtrl+N',
click: () => { click: () => {
mainWindow!.webContents.send('CmdOrCtrl+N') mainWindow!.webContents.send('CmdOrCtrl+N')
@ -956,15 +956,15 @@ const ApplicationMenu = (accountsChange: Array<MenuItemConstructorOptions>, menu
] ]
}, },
{ {
label: i18n.t('main_menu.edit.name'), label: i18n.t<string>('main_menu.edit.name'),
submenu: [ submenu: [
{ {
label: i18n.t('main_menu.edit.undo'), label: i18n.t<string>('main_menu.edit.undo'),
accelerator: 'CmdOrCtrl+Z', accelerator: 'CmdOrCtrl+Z',
role: 'undo' role: 'undo'
}, },
{ {
label: i18n.t('main_menu.edit.redo'), label: i18n.t<string>('main_menu.edit.redo'),
accelerator: 'Shift+CmdOrCtrl+Z', accelerator: 'Shift+CmdOrCtrl+Z',
role: 'redo' role: 'redo'
}, },
@ -972,60 +972,60 @@ const ApplicationMenu = (accountsChange: Array<MenuItemConstructorOptions>, menu
type: 'separator' type: 'separator'
}, },
{ {
label: i18n.t('main_menu.edit.cut'), label: i18n.t<string>('main_menu.edit.cut'),
accelerator: 'CmdOrCtrl+X', accelerator: 'CmdOrCtrl+X',
role: 'cut' role: 'cut'
}, },
{ {
label: i18n.t('main_menu.edit.copy'), label: i18n.t<string>('main_menu.edit.copy'),
accelerator: 'CmdOrCtrl+C', accelerator: 'CmdOrCtrl+C',
role: 'copy' role: 'copy'
}, },
{ {
label: i18n.t('main_menu.edit.paste'), label: i18n.t<string>('main_menu.edit.paste'),
accelerator: 'CmdOrCtrl+V', accelerator: 'CmdOrCtrl+V',
role: 'paste' role: 'paste'
}, },
{ {
label: i18n.t('main_menu.edit.select_all'), label: i18n.t<string>('main_menu.edit.select_all'),
accelerator: 'CmdOrCtrl+A', accelerator: 'CmdOrCtrl+A',
role: 'selectall' role: 'selectall'
} }
] as Array<MenuItemConstructorOptions> ] as Array<MenuItemConstructorOptions>
}, },
{ {
label: i18n.t('main_menu.view.name'), label: i18n.t<string>('main_menu.view.name'),
submenu: [ submenu: [
{ {
label: i18n.t('main_menu.view.toggle_full_screen'), label: i18n.t<string>('main_menu.view.toggle_full_screen'),
role: 'togglefullscreen' role: 'togglefullscreen'
} }
] ]
}, },
{ {
label: i18n.t('main_menu.window.name'), label: i18n.t<string>('main_menu.window.name'),
submenu: [ submenu: [
...macWindowMenu, ...macWindowMenu,
{ {
label: i18n.t('main_menu.window.close'), label: i18n.t<string>('main_menu.window.close'),
role: 'close' role: 'close'
}, },
{ {
label: i18n.t('main_menu.window.open'), label: i18n.t<string>('main_menu.window.open'),
enabled: false, enabled: false,
click: () => { click: () => {
reopenWindow() reopenWindow()
} }
}, },
{ {
label: i18n.t('main_menu.window.minimize'), label: i18n.t<string>('main_menu.window.minimize'),
role: 'minimize' role: 'minimize'
}, },
{ {
type: 'separator' type: 'separator'
}, },
{ {
label: i18n.t('main_menu.window.jump_to'), label: i18n.t<string>('main_menu.window.jump_to'),
accelerator: 'CmdOrCtrl+K', accelerator: 'CmdOrCtrl+K',
enabled: true, enabled: true,
click: () => { click: () => {
@ -1047,7 +1047,7 @@ const TrayMenu = (accountsChange: Array<MenuItemConstructorOptions>, i18n: I18n)
const template: Array<MenuItemConstructorOptions> = [ const template: Array<MenuItemConstructorOptions> = [
...accountsChange, ...accountsChange,
{ {
label: i18n.t('main_menu.application.open'), label: i18n.t<string>('main_menu.application.open'),
click: async () => { click: async () => {
if (mainWindow) { if (mainWindow) {
mainWindow.show() mainWindow.show()
@ -1057,7 +1057,7 @@ const TrayMenu = (accountsChange: Array<MenuItemConstructorOptions>, i18n: I18n)
} }
}, },
{ {
label: i18n.t('main_menu.application.quit'), label: i18n.t<string>('main_menu.application.quit'),
click: () => { click: () => {
stopAllStreamings() stopAllStreamings()
mainWindow!.destroy() mainWindow!.destroy()

2
src/renderer/components/utils/reloadable.ts
View File

@ -9,7 +9,7 @@ export default function useReloadable(store: Store<RootState>, route: RouteLocat
async function reloadable() { async function reloadable() {
const account = await store.dispatch(`TimelineSpace/${ACTION_TYPES.LOCAL_ACCOUNT}`, route.params.id).catch(err => { const account = await store.dispatch(`TimelineSpace/${ACTION_TYPES.LOCAL_ACCOUNT}`, route.params.id).catch(err => {
ElMessage({ ElMessage({
message: i18next.t('message.account_load_error'), message: i18next.t<string>('message.account_load_error'),
type: 'error' type: 'error'
}) })
throw err throw err

19
yarn.lock
View File

@ -942,7 +942,7 @@
"@babel/types" "^7.4.4" "@babel/types" "^7.4.4"
esutils "^2.0.2" esutils "^2.0.2"
"@babel/runtime@7.20.7", "@babel/runtime@^7.17.2", "@babel/runtime@^7.18.6", "@babel/runtime@^7.8.4": "@babel/runtime@7.20.7", "@babel/runtime@^7.18.6", "@babel/runtime@^7.20.6", "@babel/runtime@^7.8.4":
version "7.20.7" version "7.20.7"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.7.tgz#fcb41a5a70550e04a7b708037c7c32f7f356d8fd" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.7.tgz#fcb41a5a70550e04a7b708037c7c32f7f356d8fd"
integrity sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ== integrity sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==
@ -1837,13 +1837,6 @@
dependencies: dependencies:
"@types/node" "*" "@types/node" "*"
"@types/i18next@^13.0.0":
version "13.0.0"
resolved "https://registry.yarnpkg.com/@types/i18next/-/i18next-13.0.0.tgz#403ef338add0104e74d9759f1b39217e7c5d4084"
integrity sha512-gp/SIShAuf4WOqi8ey0nuI7qfWaVpMNCcs/xLygrh/QTQIXmlDC1E0TtVejweNW+7SGDY7g0lyxyKZIJuCKIJw==
dependencies:
i18next "*"
"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
version "2.0.3" version "2.0.3"
resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762" resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
@ -6922,12 +6915,12 @@ humanize-plus@^1.8.1:
resolved "https://registry.yarnpkg.com/humanize-plus/-/humanize-plus-1.8.2.tgz#a65b34459ad6367adbb3707a82a3c9f916167030" resolved "https://registry.yarnpkg.com/humanize-plus/-/humanize-plus-1.8.2.tgz#a65b34459ad6367adbb3707a82a3c9f916167030"
integrity sha1-pls0RZrWNnrbs3B6gqPJ+RYWcDA= integrity sha1-pls0RZrWNnrbs3B6gqPJ+RYWcDA=
i18next@*, i18next@^21.9.1: i18next@^22.4.9:
version "21.9.1" version "22.4.9"
resolved "https://registry.yarnpkg.com/i18next/-/i18next-21.9.1.tgz#9e3428990f5b2cc9ac1b98dd025f3e411c368249" resolved "https://registry.yarnpkg.com/i18next/-/i18next-22.4.9.tgz#98c8384c6bd41ff937da98b1e809ba03d3b41053"
integrity sha512-ITbDrAjbRR73spZAiu6+ex5WNlHRr1mY+acDi2ioTHuUiviJqSz269Le1xHAf0QaQ6GgIHResUhQNcxGwa/PhA== integrity sha512-8gWMmUz460KJDQp/ob3MNUX84cVuDRY9PLFPnV8d+Qezz/6dkjxwOaH70xjrCNDO+JrUL25iXfAIN9wUkInNZw==
dependencies: dependencies:
"@babel/runtime" "^7.17.2" "@babel/runtime" "^7.20.6"
iconv-corefoundation@^1.1.7: iconv-corefoundation@^1.1.7:
version "1.1.7" version "1.1.7"