From a65d0cfd31418af7dbc960f38d6b676607f281c1 Mon Sep 17 00:00:00 2001 From: argoneus Date: Sun, 17 May 2020 11:39:00 +0200 Subject: [PATCH 1/6] updated translation revision --- Js/Translations | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Js/Translations b/Js/Translations index 178ec9b..cf2e201 160000 --- a/Js/Translations +++ b/Js/Translations @@ -1 +1 @@ -Subproject commit 178ec9be36f504418d6aae0bb099d5006bd4186a +Subproject commit cf2e201e97c6c0bbf5117fb25f0b5a1630a0e612 From 86efedf43af7ae5a91d62a1a2e6969a159f4eafe Mon Sep 17 00:00:00 2001 From: argoneus Date: Sun, 24 May 2020 19:31:31 +0200 Subject: [PATCH 2/6] updated translations git --- Js/Translations | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Js/Translations b/Js/Translations index cf2e201..06a52db 160000 --- a/Js/Translations +++ b/Js/Translations @@ -1 +1 @@ -Subproject commit cf2e201e97c6c0bbf5117fb25f0b5a1630a0e612 +Subproject commit 06a52db84c21ce7e584a493cc278bb6e29e940cc From d8928a381f7cfc89713a8818c033323df2ba054d Mon Sep 17 00:00:00 2001 From: argoneus Date: Fri, 31 Jul 2020 10:53:46 +0200 Subject: [PATCH 3/6] fixed player supporting global --- Js/Main.js | 4 ++-- Js/Translations | 2 +- Js/UtageParse.js | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Js/Main.js b/Js/Main.js index ccf8202..9c491ee 100644 --- a/Js/Main.js +++ b/Js/Main.js @@ -142,7 +142,7 @@ function buildQuestSelectList() { let tl_key = utage.questTranslations[cust][q.QuestMstId]; if (!tl_key) { console.log("Failed to build quest list: missing translations"); - return; + continue; } if (!tl_key.Enabled && !utage.quests[cust][q.QuestMstId].Scenes.some((s) => { return utage.sceneTranslations[cust][s].Enabled === true })) { continue; @@ -191,7 +191,7 @@ function buildSceneSelectList() { let tl_key = utage.sceneTranslations[cust][questSceneMstId]; if (!tl_key) { console.log("Failed to build scene list: missing translations"); - return; + continue; } if (!tl_key.Enabled) { continue; diff --git a/Js/Translations b/Js/Translations index 06a52db..4e3efff 160000 --- a/Js/Translations +++ b/Js/Translations @@ -1 +1 @@ -Subproject commit 06a52db84c21ce7e584a493cc278bb6e29e940cc +Subproject commit 4e3efff1afd08fc1022862c1d91b8aa0dd6636a1 diff --git a/Js/UtageParse.js b/Js/UtageParse.js index 3efa61e..69387e7 100644 --- a/Js/UtageParse.js +++ b/Js/UtageParse.js @@ -141,7 +141,9 @@ class UtageInfo { for (const k of Object.keys(this.questTranslationsInner[this.currentTranslation][c])) { if (this.questTranslationsInner[this.currentTranslation][c][k].Enabled) { for (const s of this.quests[c][k].Scenes) { - this.sceneTranslationsInner[this.currentTranslation][c][s].Enabled = true; + if (c in this.sceneTranslationsInner[this.currentTranslation] && s in this.sceneTranslationsInner[this.currentTranslation][c]) { + this.sceneTranslationsInner[this.currentTranslation][c][s].Enabled = true; + } } } } From 59eb51d8a2452c3a22fe4ebf2c51866f02b42681 Mon Sep 17 00:00:00 2001 From: louis Date: Fri, 31 Jul 2020 10:32:42 -0400 Subject: [PATCH 4/6] make sure translation is supplied when propagating enables --- Js/UtageParse.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Js/UtageParse.js b/Js/UtageParse.js index 69387e7..a33cde2 100644 --- a/Js/UtageParse.js +++ b/Js/UtageParse.js @@ -141,7 +141,10 @@ class UtageInfo { for (const k of Object.keys(this.questTranslationsInner[this.currentTranslation][c])) { if (this.questTranslationsInner[this.currentTranslation][c][k].Enabled) { for (const s of this.quests[c][k].Scenes) { - if (c in this.sceneTranslationsInner[this.currentTranslation] && s in this.sceneTranslationsInner[this.currentTranslation][c]) { + // only propagate if exists in translation file (THANKS GLOBAL) and translated name is supplied + if (c in this.sceneTranslationsInner[this.currentTranslation] + && s in this.sceneTranslationsInner[this.currentTranslation][c] + && this.sceneTranslationsInner[this.currentTranslation][c][s].Name != "") { this.sceneTranslationsInner[this.currentTranslation][c][s].Enabled = true; } } From 4c40e45a4f95fb6f02dd6c90969e86a8554b0233 Mon Sep 17 00:00:00 2001 From: argoneus Date: Mon, 10 Aug 2020 13:57:02 +0200 Subject: [PATCH 5/6] fixed some stories --- Js/Translations | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Js/Translations b/Js/Translations index 4e3efff..6bba82d 160000 --- a/Js/Translations +++ b/Js/Translations @@ -1 +1 @@ -Subproject commit 4e3efff1afd08fc1022862c1d91b8aa0dd6636a1 +Subproject commit 6bba82d4abc2bc143d43bf52c255d4e6173b099e From a9d48ce0587ded9445c37a7f06eb230cc4fc4b47 Mon Sep 17 00:00:00 2001 From: argoneus Date: Mon, 10 Aug 2020 14:15:27 +0200 Subject: [PATCH 6/6] updated translations --- Js/Translations | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Js/Translations b/Js/Translations index 6bba82d..bb6b874 160000 --- a/Js/Translations +++ b/Js/Translations @@ -1 +1 @@ -Subproject commit 6bba82d4abc2bc143d43bf52c255d4e6173b099e +Subproject commit bb6b8748a985ea6662300faaba12dcac2c8e0a45