From a71acadbbaea2d17ef8ef90c9e3c6c4f3e2b82c8 Mon Sep 17 00:00:00 2001 From: Trestolt <49414917+Trestolt@users.noreply.github.com> Date: Mon, 11 May 2020 19:11:52 +0200 Subject: [PATCH] update import function using get TranslationsByKey (#6427) --- Das_Schwarze_Auge_5_Tsa_Edition/dsa5.html | 17 +++++++++++------ .../translation.json | 12 +++++++++++- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/Das_Schwarze_Auge_5_Tsa_Edition/dsa5.html b/Das_Schwarze_Auge_5_Tsa_Edition/dsa5.html index a5b54b8469..b72ef92f75 100644 --- a/Das_Schwarze_Auge_5_Tsa_Edition/dsa5.html +++ b/Das_Schwarze_Auge_5_Tsa_Edition/dsa5.html @@ -14944,25 +14944,28 @@ }); }); - // NPC-Import button + // NPC-Import button// NPC-Import button on("clicked:importnpc", function () { getAttrs(["npc_import"], function (values) { console.log("Import Triggert"); var endtoken = 'ENDTOKEN'; - var input = values.npc_import + endtoken; + // strip : + var input = values.npc_import.replace(/:/g, '') + endtoken; //Keywords to look for - var keywords = ["Größe:", "Gewicht:", "MU", "KL", "IN", "CH", "FF", "GE", "KO", "KK", "LeP", "AsP", "KaP", "INI", "VW", "SK", "ZK", "GS", "RS/BE:", "Aktionen:", "Sonderfertigkeiten:", "Talente:", "Zauber:", "Größenkategorie:", "Typus:", "Anrufungsschwierigkeit:", "Beute:", "Kampfverhalten:", "Flucht:", "Jagd:", "Schmerz +1 bei:", "Sonderregeln:", "Anzahl:", "ENDTOKEN"]; + var keywords = ["groesse", "gewicht", "MU", "KL", "IN", "CH", "FF", "GE", "KO", "KK", "lep", "asp", "kap", "INI", "VW", "sk", "zk", "gs", "RS/BE", "aktionen", "sonderfertigkeiten", "talente", "zauber", "gkategorie", "typus", "anrufungsschwierigkeit", "beute", "kampfverhalten", "flucht", "jagd", "schmerzplus1", "sonderregeln", "anzahl", "ENDTOKEN"]; //array for the results var multi = []; - + keywords.forEach(function (key, index, keywords) { + var translatedKey = getTranslationByKey(key); var newArray = []; - newArray[0] = key; //add keyword + newArray[0] = translatedKey; //add keyword newArray[1] = index; //add keyword index - newArray[2] = input.search(key); //add position in text + newArray[2] = input.search(translatedKey); //add position in text newArray[3] = ''; //result value multi[index] = newArray; + console.log(key + " "+ translatedKey); //console.log(multi[index][0]+" inloop "+multi[index][1]); }); @@ -15059,5 +15062,7 @@ }); }); + + \ No newline at end of file diff --git a/Das_Schwarze_Auge_5_Tsa_Edition/translation.json b/Das_Schwarze_Auge_5_Tsa_Edition/translation.json index 4a301577b2..d04b29a67d 100644 --- a/Das_Schwarze_Auge_5_Tsa_Edition/translation.json +++ b/Das_Schwarze_Auge_5_Tsa_Edition/translation.json @@ -702,6 +702,16 @@ "ruestung_preset_6":"BE 3", "ruestung_mod":"Zusätzliche Modifikatoren: ", "npc-import":"NPC-Stats-Block importieren: (Achtung: Beta-Status!)", - "import":"Starte Import" + "import":"Starte Import", + "lep":"LeP", + "asp":"AsP", + "kap":"KaP", + "INI":"INI", + "VW":"VW", + "RS/BE":"RS/BE", + "aktionen":"Aktionen", + "anrufungsschwierigkeit":"Anrufungsschwierigkeit", + "schmerzplus1":"Schmerz +1 bei", + "ENDTOKEN":"ENDTOKEN" }