From c1a666f48d468fb1080891c67e2c0a1c9a8ebd0f Mon Sep 17 00:00:00 2001
From: leejooy96 <leejooy96@gmail.com>
Date: Thu, 23 Jun 2022 12:27:44 +0900
Subject: [PATCH] renderer: fix i18n is not load correctly

---
 src/renderer/main.js            |  2 ++
 src/renderer/plugins/i18n.js    | 14 +++++++++++---
 src/renderer/plugins/vuetify.js |  6 ------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/renderer/main.js b/src/renderer/main.js
index 5307a45..82ee856 100644
--- a/src/renderer/main.js
+++ b/src/renderer/main.js
@@ -6,11 +6,13 @@ import router from './router'
 import vuetify from './plugins/vuetify'
 
 import 'vuetify/dist/vuetify.min.css'
+import i18n from './plugins/i18n'
 
 const app = createApp(App)
 
 app
   .use(vuetify)
+  .use(i18n)
   .use(router)
   .use(createPinia())
 
diff --git a/src/renderer/plugins/i18n.js b/src/renderer/plugins/i18n.js
index 7144357..c77c833 100644
--- a/src/renderer/plugins/i18n.js
+++ b/src/renderer/plugins/i18n.js
@@ -1,5 +1,13 @@
+import { createI18n } from 'vue-i18n'
 import en from '../../locales/en.json'
 
-export default {
-  en
-}
+// eslint-disable-next-line new-cap
+export default createI18n({
+  legacy: false,
+  locale: 'en',
+  fallbackLocale: 'en',
+  globalInjection: true,
+  messages: {
+    en
+  }
+})
diff --git a/src/renderer/plugins/vuetify.js b/src/renderer/plugins/vuetify.js
index 7e9056a..4890db7 100644
--- a/src/renderer/plugins/vuetify.js
+++ b/src/renderer/plugins/vuetify.js
@@ -1,14 +1,8 @@
 import { createVuetify } from 'vuetify/dist/vuetify'
-import messages from './i18n'
 
 const vuetify = createVuetify({
   icons: {
     iconfont: 'mdi'
-  },
-  locale: {
-    defaultLocale: 'en',
-    fallbackLocale: 'en',
-    messages
   }
 })