From 6f307cd298f5986c02e5c835134ef1fc474d4368 Mon Sep 17 00:00:00 2001 From: AkiraFukushima Date: Tue, 19 Apr 2022 22:16:05 +0900 Subject: [PATCH] Replace vue-i18next to vue-i18n-next --- package.json | 3 +- src/config/i18n.ts | 22 +++ src/renderer/App.vue | 2 +- .../components/Preferences/General.vue | 119 +++++---------- .../components/Preferences/Language.vue | 68 +++------ .../TimelineSpace/Contents/Home.vue | 4 +- src/renderer/components/organisms/Toot.vue | 27 +--- src/renderer/main.js | 15 +- yarn.lock | 136 ++++++++++-------- 9 files changed, 168 insertions(+), 228 deletions(-) diff --git a/package.json b/package.json index 5c521864..0c909ff2 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,6 @@ "@fortawesome/free-regular-svg-icons": "^6.1.0", "@fortawesome/free-solid-svg-icons": "^6.1.0", "@fortawesome/vue-fontawesome": "^3.0.0-5", - "@panter/vue-i18next": "^0.15.2", "@trodi/electron-splashscreen": "^1.0.2", "@vue/compat": "^3.2.31", "about-window": "^1.15.2", @@ -87,7 +86,6 @@ "electron-log": "^4.4.6", "electron-window-state": "^5.0.3", "element-plus": "^2.1.9", - "element-ui": "2.15.8", "emoji-mart-vue-fast": "^10.2.1", "i18next": "^21.6.16", "lodash": "^4.17.21", @@ -107,6 +105,7 @@ "unicode-emoji-json": "^0.3.1", "vue": "^3.2.31", "vue-click-outside": "^1.1.0", + "vue-i18n": "9", "vue-popperjs": "^2.3.0", "vue-resize": "^2.0.0-alpha.1", "vue-router": "^4.0.14", diff --git a/src/config/i18n.ts b/src/config/i18n.ts index b8096b37..bf14f1d9 100644 --- a/src/config/i18n.ts +++ b/src/config/i18n.ts @@ -87,4 +87,26 @@ const options: InitOptions = { i18next.init(options) +export const translations = { + cs: cs, + de: de, + en: en, + es_es: es_es, + fr: fr, + gd: gd, + id: id, + it: it, + ja: ja, + ko: ko, + no: no, + pl: pl, + pt_pt: pt_pt, + ru: ru, + si: si, + sv_se: sv_se, + tzm: tzm, + zh_cn: zh_cn, + zh_tw: zh_tw +} + export default i18next diff --git a/src/renderer/App.vue b/src/renderer/App.vue index a7693905..baa48bae 100644 --- a/src/renderer/App.vue +++ b/src/renderer/App.vue @@ -34,7 +34,7 @@ export default { created() { this.$store.dispatch('App/watchShortcutsEvents') this.$store.dispatch('App/loadPreferences').then(conf => { - this.$i18n.i18next.changeLanguage(conf.language.language) + this.$i18n.locale = conf.language.language }) }, destroyed() { diff --git a/src/renderer/components/Preferences/General.vue b/src/renderer/components/Preferences/General.vue index 03d76b96..0a67b414 100644 --- a/src/renderer/components/Preferences/General.vue +++ b/src/renderer/components/Preferences/General.vue @@ -1,85 +1,41 @@ @@ -91,10 +47,10 @@ export default { name: 'general', computed: { ...mapState('Preferences/General', { - loading: (state) => state.loading, + loading: state => state.loading }), ...mapState({ - backgroundColor: (state) => state.App.theme.background_color, + backgroundColor: state => state.App.theme.background_color }), ...mapGetters('Preferences/General', ['notDarwin']), sound_fav_rb: { @@ -103,9 +59,9 @@ export default { }, set(value) { this.$store.dispatch('Preferences/General/updateSound', { - fav_rb: value, + fav_rb: value }) - }, + } }, sound_toot: { get() { @@ -113,9 +69,9 @@ export default { }, set(value) { this.$store.dispatch('Preferences/General/updateSound', { - toot: value, + toot: value }) - }, + } }, timeline_cw: { get() { @@ -123,9 +79,9 @@ export default { }, set(value) { this.$store.dispatch('Preferences/General/updateTimeline', { - cw: value, + cw: value }) - }, + } }, timeline_nsfw: { get() { @@ -133,20 +89,19 @@ export default { }, set(value) { this.$store.dispatch('Preferences/General/updateTimeline', { - nsfw: value, + nsfw: value }) - }, + } }, timeline_hide_attachments: { get() { - return this.$store.state.Preferences.General.general.timeline - .hideAllAttachments + return this.$store.state.Preferences.General.general.timeline.hideAllAttachments }, set(value) { this.$store.dispatch('Preferences/General/updateTimeline', { - hideAllAttachments: value, + hideAllAttachments: value }) - }, + } }, other_launch: { get() { @@ -154,16 +109,16 @@ export default { }, set(value) { this.$store.dispatch('Preferences/General/updateOther', { - launch: value, + launch: value }) - }, - }, + } + } }, created() { this.$store.dispatch('Preferences/General/loadGeneral').catch(() => { this.$message({ message: this.$t('message.preferences_load_error'), - type: 'error', + type: 'error' }) }) }, @@ -171,17 +126,17 @@ export default { reset() { this.$store .dispatch('Preferences/General/reset') - .then((language) => { - this.$i18n.i18next.changeLanguage(language) + .then(language => { + this.$i18n.locale = language }) .catch(() => { this.$message({ message: this.$t('message.preferences_load_error'), - type: 'error', + type: 'error' }) }) - }, - }, + } + } } diff --git a/src/renderer/components/Preferences/Language.vue b/src/renderer/components/Preferences/Language.vue index f56d2294..8eb12b03 100644 --- a/src/renderer/components/Preferences/Language.vue +++ b/src/renderer/components/Preferences/Language.vue @@ -3,35 +3,19 @@

{{ $t('preferences.language.title') }}

{{ $t('preferences.language.language.title') }}

- + - - +

{{ $t('preferences.language.spellchecker.title') }}

- - - + + - + { - this.$i18n.i18next.changeLanguage(key) - }) - }, + this.$store.dispatch('Preferences/Language/changeLanguage', value).then(key => { + this.$i18n.locale = key + }) + } }, spellcheck: { get() { - return this.$store.state.Preferences.Language.language.spellchecker - .enabled + return this.$store.state.Preferences.Language.language.spellchecker.enabled }, set(value) { this.$store.dispatch('Preferences/Language/toggleSpellchecker', value) - }, + } }, spellcheckLanguages: { get() { - return this.$store.state.Preferences.Language.language.spellchecker - .languages + return this.$store.state.Preferences.Language.language.spellchecker.languages }, set(value) { - this.$store - .dispatch('Preferences/Language/updateSpellcheckerLanguages', value) - .catch(() => { - this.$message({ - message: this.$t( - 'message.language_not_support_spellchecker_error' - ), - type: 'error', - }) + this.$store.dispatch('Preferences/Language/updateSpellcheckerLanguages', value).catch(() => { + this.$message({ + message: this.$t('message.language_not_support_spellchecker_error'), + type: 'error' }) - }, - }, + }) + } + } }, created() { this.$store.dispatch('Preferences/Language/loadLanguage') - }, + } } diff --git a/src/renderer/components/TimelineSpace/Contents/Home.vue b/src/renderer/components/TimelineSpace/Contents/Home.vue index 3eb8770e..b6b668db 100644 --- a/src/renderer/components/TimelineSpace/Contents/Home.vue +++ b/src/renderer/components/TimelineSpace/Contents/Home.vue @@ -1,6 +1,6 @@