From 885f2346a60a26cc743fe75cfd82dcf27187dd1d Mon Sep 17 00:00:00 2001 From: Pedro Date: Sat, 28 Oct 2023 17:49:09 -0300 Subject: [PATCH] Updated every page to use new translation system --- btapackconverter.html | 4 ++-- index.html | 14 +++++++------- js/dark-mode.js | 6 +++--- js/senha.js | 2 +- js/text.js | 11 ++++++++--- js/translate.js | 4 ++-- minecrafttooltips.html | 32 +++++++++++++------------------- senha.html | 16 ++++++++-------- 8 files changed, 44 insertions(+), 45 deletions(-) diff --git a/btapackconverter.html b/btapackconverter.html index c8e9a00..31f2e9a 100644 --- a/btapackconverter.html +++ b/btapackconverter.html @@ -9,8 +9,8 @@
-
Conversor de pacotes para BTA
-
Converte pacotes de recursos do Minecraft moderno para pacotes de texturas do BTA
+
Conversor de pacotes para BTA
+
Converte pacotes de recursos do Minecraft moderno para pacotes de texturas do BTA
diff --git a/index.html b/index.html index 2a38cc5..63e1bf7 100644 --- a/index.html +++ b/index.html @@ -3,21 +3,21 @@ title: "Início" --- -

Pedro270707

[ativar modo escuro]

+

Pedro270707

[ativar modo escuro]

-

Profissional

-

(em fazer websites ruins)

-

(em fazer tarefa de casa)

-

(em jogar games irados)

+

Profissional

+

(em fazer websites ruins)

+

(em fazer tarefa de casa)

+

(em jogar games irados)

-

Redes sociais

+

Redes sociais

-

Projetos divertidos

+

Projetos divertidos

diff --git a/js/dark-mode.js b/js/dark-mode.js index 2e2ded4..01839a4 100644 --- a/js/dark-mode.js +++ b/js/dark-mode.js @@ -8,7 +8,7 @@ if (localStorage.darkmode == undefined) { translate.translateString('mainpage-disabledarkmode').then(str => { darkModeButton.innerHTML = str; }); - darkModeButton.dataset.string = 'mainpage-disabledarkmode'; + darkModeButton.dataset.string = '{"translate":"mainpage-disabledarkmode"}'; } } @@ -19,13 +19,13 @@ function toggleDarkMode() { translate.translateString('mainpage-disabledarkmode').then(str => { darkModeButton.innerHTML = str; }); - darkModeButton.dataset.string = 'mainpage-disabledarkmode'; + darkModeButton.dataset.string = '{"translate":"mainpage-disabledarkmode"}'; } else { document.body.classList.remove("dark-mode"); localStorage.darkmode = "false"; translate.translateString('mainpage-enabledarkmode').then(str => { darkModeButton.innerHTML = str; }); - darkModeButton.dataset.string = 'mainpage-enabledarkmode'; + darkModeButton.dataset.string = '{"translate":"mainpage-enabledarkmode"}'; } } \ No newline at end of file diff --git a/js/senha.js b/js/senha.js index ca3efbe..1c2ba9e 100644 --- a/js/senha.js +++ b/js/senha.js @@ -78,7 +78,7 @@ function startNewGame(pAmountOfCharacters = 5) { document.getElementById("victory").classList.add("invisible"); amountOfCharacters = pAmountOfCharacters; randomSequence = getRandomCharacterSequence(amountOfCharacters); - translate.translateString("senha-gamestarted", randomSequence).then(str => { + translate.translateString("senha-gamestarted", new LiteralText(randomSequence)).then(str => { console.log(str); }); document.getElementById("valid-characters").innerHTML = validCharacters; diff --git a/js/text.js b/js/text.js index a435356..c1616b5 100644 --- a/js/text.js +++ b/js/text.js @@ -66,13 +66,18 @@ class TranslatableText { function getTextFromJSON(jsonObject) { if (typeof jsonObject !== 'object') { - jsonObject = JSON.parse(jsonObject); + try { + jsonObject = JSON.parse(jsonObject); + } catch (error) { + console.log("Error when translating JSON to text: " + error.message + "\nPassed parameter: " + jsonObject); + return new LiteralText(jsonObject); + } } for (const key in jsonObject) { let arr = []; if (jsonObject.with) { if (!Array.isArray(jsonObject.with)) { - throw new Error(jsonObject.with + "is not a JSON array"); + console.log(jsonObject.with + "is not a JSON array"); } for (const jsonObj of jsonObject.with) { arr.push(getTextFromJSON(jsonObj)); @@ -83,7 +88,7 @@ function getTextFromJSON(jsonObject) { } else if (key === 'translate') { return new TranslatableText(jsonObject[key], ...arr); } else { - throw new Error('Invalid text type: ' + key); + console.log('Invalid text type: ' + key); } } } \ No newline at end of file diff --git a/js/translate.js b/js/translate.js index 49cc224..b0b036d 100644 --- a/js/translate.js +++ b/js/translate.js @@ -78,13 +78,13 @@ class Translate { if (placeholderKeyAttribute !== null) { getTextFromJSON(placeholderKeyAttribute).get().then(str => { - currentElement.innerHTML = str; + currentElement.placeholder = str; }); } if (ariaLabelKeyAttribute !== null) { getTextFromJSON(ariaLabelKeyAttribute).get().then(str => { - currentElement.innerHTML = str; + currentElement.ariaLabel = str; }); } } diff --git a/minecrafttooltips.html b/minecrafttooltips.html index 0318b0f..0402ae9 100644 --- a/minecrafttooltips.html +++ b/minecrafttooltips.html @@ -17,23 +17,23 @@
-
+
-

+

-
+

-
+

-
+
-
+

-
+
- - + +


- resolução da imagem: 1x !
+ resolução da imagem: 1x !

-
+
-
+
com caractere(s) + com caractere(s)