Fix translation fallback

Author: PikachuEXE

src/renderer/components/external-player-settings/external-player-settings.js

@@ -24,7 +24,14 @@ export default Vue.extend({
     },
 
     externalPlayerNames: function () {
-      return this.$store.getters.getExternalPlayerNames.map((value) => this.$t(value))
+      const fallbackNames = this.$store.getters.getExternalPlayerNames
+      const nameTranslationKeys = this.$store.getters.getExternalPlayerNameTranslationKeys
+
+      return nameTranslationKeys.map((translationKey, idx) => {
+        if (this.$te(translationKey)) { return this.$t(translationKey) }
+
+        return fallbackNames[idx]
+      })
     },
     externalPlayerValues: function () {
       return this.$store.getters.getExternalPlayerValues

src/renderer/store/modules/utils.js

@@ -78,6 +78,7 @@ const state = {
     '#F1FA8C'
   ],
   externalPlayerNames: [],
+  externalPlayerNameTranslationKeys: [],
   externalPlayerValues: [],
   externalPlayerCmdArguments: {}
 }
@@ -135,6 +136,10 @@ const getters = {
     return state.externalPlayerNames
   },
 
+  getExternalPlayerNameTranslationKeys () {
+    return state.externalPlayerNameTranslationKeys
+  },
+
   getExternalPlayerValues () {
     return state.externalPlayerValues
   },
@@ -797,17 +802,24 @@ const actions = {
     }
 
     const externalPlayerMap = JSON.parse(fileData).map((entry) => {
-      return { name: entry.name, value: entry.value, cmdArguments: entry.cmdArguments }
+      return {
+        name: entry.name,
+        nameTranslationKey: entry.nameTranslationKey,
+        value: entry.value,
+        cmdArguments: entry.cmdArguments
+      }
     })
 
     const externalPlayerNames = externalPlayerMap.map((entry) => { return entry.name })
+    const externalPlayerNameTranslationKeys = externalPlayerMap.map((entry) => { return entry.nameTranslationKey })
     const externalPlayerValues = externalPlayerMap.map((entry) => { return entry.value })
     const externalPlayerCmdArguments = externalPlayerMap.reduce((result, item) => {
       result[item.value] = item.cmdArguments
       return result
     }, {})
 
     commit('setExternalPlayerNames', externalPlayerNames)
+    commit('setExternalPlayerNameTranslationKeys', externalPlayerNameTranslationKeys)
     commit('setExternalPlayerValues', externalPlayerValues)
     commit('setExternalPlayerCmdArguments', externalPlayerCmdArguments)
   },
@@ -1020,6 +1032,10 @@ const mutations = {
     state.externalPlayerNames = value
   },
 
+  setExternalPlayerNameTranslationKeys (state, value) {
+    state.externalPlayerNameTranslationKeys = value
+  },
+
   setExternalPlayerValues (state, value) {
     state.externalPlayerValues = value
   },

static/external-player-map.json

@@ -1,11 +1,13 @@
 [
     {
-        "name": "Settings.External Player Settings.None",
+        "name": "None",
+        "nameTranslationKey": "Settings.External Player Settings.Players.None.Name",
         "value": "",
         "cmdArguments": null
     },
     {
         "name": "mpv",
+        "nameTranslationKey": "Settings.External Player Settings.Players.mpv.Name",
         "value": "mpv",
         "cmdArguments": {
             "defaultExecutable": "mpv",
@@ -23,6 +25,7 @@
     },
     {
         "name": "VLC",
+        "nameTranslationKey": "Settings.External Player Settings.Players.VLC.Name",
         "value": "vlc",
         "cmdArguments": {
             "defaultExecutable": "vlc",
@@ -40,6 +43,7 @@
     },
     {
         "name": "iina",
+        "nameTranslationKey": "Settings.External Player Settings.Players.iina.Name",
         "value": "iina",
         "cmdArguments": {
             "defaultExecutable": "iina",

static/locales/en-US.yaml

@@ -230,10 +230,13 @@ Settings:
   External Player Settings:
     External Player Settings: External Player Settings
     External Player: External Player
-    None: None
     Ignore Unsupported Action Warnings: Ignore Unsupported Action Warnings
     Custom External Player Executable: Custom External Player Executable
     Custom External Player Arguments: Custom External Player Arguments
+
+    Players:
+      None:
+        Name: None
   Privacy Settings:
     Privacy Settings: Privacy Settings
     Remember History: Remember History

static/locales/zh-TW.yaml

@@ -334,6 +334,10 @@ Settings:
     Ignore Unsupported Action Warnings: 忽略不支援的動作警告
     External Player: 外部播放程式
     External Player Settings: 外部播放程式設定
+
+    Players:
+      None:
+        Name: Nein
   Download Settings:
     Download Settings: 下載設定
     Ask Download Path: 詢問下載路徑