From 044e783d0ac2a1ec66f6c5a4c430dd527f80f743 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Tue, 24 Sep 2024 22:22:41 +0200
Subject: [PATCH] Let translateWindowTitle use the imported i18n instance

---
 src/renderer/App.js                                          | 2 +-
 src/renderer/components/general-settings/general-settings.js | 2 +-
 src/renderer/components/top-nav/top-nav.js                   | 3 +--
 src/renderer/helpers/strings.js                              | 4 +++-
 src/renderer/main.js                                         | 4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/renderer/App.js b/src/renderer/App.js
index 36611d193852..6f29f4e2a7c4 100644
--- a/src/renderer/App.js
+++ b/src/renderer/App.js
@@ -83,7 +83,7 @@ export default defineComponent({
     windowTitle: function () {
       const routePath = this.$route.path
       if (!routePath.startsWith('/channel/') && !routePath.startsWith('/watch/') && !routePath.startsWith('/hashtag/') && !routePath.startsWith('/playlist/')) {
-        let title = translateWindowTitle(this.$route.meta.title, this.$i18n)
+        let title = translateWindowTitle(this.$route.meta.title)
         if (!title) {
           title = packageDetails.productName
         } else {
diff --git a/src/renderer/components/general-settings/general-settings.js b/src/renderer/components/general-settings/general-settings.js
index 1ddbf2c1d460..b7d0f60bd7b1 100644
--- a/src/renderer/components/general-settings/general-settings.js
+++ b/src/renderer/components/general-settings/general-settings.js
@@ -96,7 +96,7 @@ export default defineComponent({
       return this.$router.getRoutes().filter((route) => includedPageNames.includes(route.name))
     },
     defaultPageNames: function () {
-      return this.defaultPages.map((route) => translateWindowTitle(route.meta.title, this.$i18n))
+      return this.defaultPages.map((route) => translateWindowTitle(route.meta.title))
     },
     defaultPageValues: function () {
       // avoid Vue parsing issues by excluding '/' from path values
diff --git a/src/renderer/components/top-nav/top-nav.js b/src/renderer/components/top-nav/top-nav.js
index 1e08e430b0f1..f5aef0c0b669 100644
--- a/src/renderer/components/top-nav/top-nav.js
+++ b/src/renderer/components/top-nav/top-nav.js
@@ -53,8 +53,7 @@ export default defineComponent({
         {
           page: translateWindowTitle(this.$router.getRoutes()
             .find((route) => route.path === '/' + this.landingPage)
-            .meta.title,
-          this.$i18n
+            .meta.title
           )
         })
     },
diff --git a/src/renderer/helpers/strings.js b/src/renderer/helpers/strings.js
index 97a5d6d2341e..6c9e79465b8e 100644
--- a/src/renderer/helpers/strings.js
+++ b/src/renderer/helpers/strings.js
@@ -1,3 +1,5 @@
+import i18n from '../i18n/index'
+
 /**
  * This will return true if a string is null, undefined or empty.
  * @param {string|null|undefined} _string the string to process
@@ -24,7 +26,7 @@ export function isKeyboardEventKeyPrintableChar(eventKey) {
   return false
 }
 
-export function translateWindowTitle(title, i18n) {
+export function translateWindowTitle(title) {
   switch (title) {
     case 'Subscriptions':
       return i18n.t('Subscriptions.Subscriptions')
diff --git a/src/renderer/main.js b/src/renderer/main.js
index fc0476101c4c..cfd35f888fa4 100644
--- a/src/renderer/main.js
+++ b/src/renderer/main.js
@@ -1,9 +1,9 @@
 // import the styles
 import Vue from 'vue'
-import App from './App.vue'
+import i18n from './i18n/index'
 import router from './router/index'
 import store from './store/index'
-import i18n from './i18n/index'
+import App from './App.vue'
 import { IpcChannels } from '../constants'
 import { library } from '@fortawesome/fontawesome-svg-core'