-
Notifications
You must be signed in to change notification settings - Fork 1.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Internationalization of alarm app #202
Closed
Closed
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
bd21113
Patch 1 (#1)
DerGuteWolf 470f1e6
i18n also alarm.js
DerGuteWolf b803b48
Update alarm.html
DerGuteWolf 7a8b515
Update alarm.html
DerGuteWolf 4d54bb4
Update alarm.html
DerGuteWolf 3d7d60e
Update alarm.html
DerGuteWolf e025391
Update alarm.js
DerGuteWolf a5fcea5
Update apps.json
DerGuteWolf da7f97d
Update alarm.html
DerGuteWolf File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| <html> | ||
| <head> | ||
| <link rel="stylesheet" href="../../css/spectre.min.css"> | ||
| </head> | ||
| <body> | ||
|
|
||
| <p><button id="fetch" class="btn btn-primary">Fetch Language from Bangle.js</button></p> | ||
| <div id="formGroup" class="form-group" style="visibility: hidden;"> | ||
| <p>Then please choose a language from the following list:</p> | ||
| <select id="languages" class="form-select"> | ||
| </select> | ||
| </div> | ||
| <p><button id="upload" class="btn btn-primary" style="visibility: hidden;">Then Upload</button></p> | ||
|
|
||
| <script src="../../lib/customize.js"></script> | ||
| <script src="https://www.puck-js.com/puck.js"></script> | ||
|
|
||
| <script> | ||
| let request = url => new Promise( (resolve, reject) => { | ||
| let xhr = new XMLHttpRequest(); | ||
| xhr.open("GET", url); | ||
| xhr.onload = () => { | ||
| if (xhr.status >= 200 && xhr.status < 300) { | ||
| resolve(xhr.response); | ||
| } else { | ||
| reject(xhr.statusText); | ||
| } | ||
| }; | ||
| xhr.onerror = () => reject(xhr.statusText); | ||
| xhr.onabort = () => reject(xhr.statusText); | ||
| xhr.send(); | ||
| }); | ||
|
|
||
| let translated = {}; | ||
| let translate = () => { | ||
| Promise.all([translateFile("app.js"), translateFile("alarm.js")]).then(() => { | ||
| document.getElementById("upload").style.visibility = 'visible'; | ||
| }).catch( error => { | ||
| console.log(error); | ||
| document.getElementById("upload").style.visibility = 'hidden'; | ||
| }); | ||
| }; | ||
| let translateFile = (fileName) => { | ||
| var languageSelector = document.getElementById("languages"); | ||
| var lang = languageSelector.options[languageSelector.selectedIndex].value; | ||
| console.log(lang); | ||
| request(fileName).then( fileContent => | ||
| request("app_" + lang + ".json") | ||
| .catch( () => request("app_" + lang.substring(0,2) + ".json")) | ||
| .catch( () => request("app.json")) | ||
| .then( langjson => { | ||
| var trans = JSON.parse(langjson); | ||
| fileContent = fileContent.replace(/"([^"]*?)"\/\*LANG\*\//g, function(m, p1) { return '"' + (trans[p1]||p1) + '"' + (trans[p1]?'':'/*LANG*/'); }); | ||
| fileContent = fileContent.replace(/'([^']*?)'\/\*LANG\*\//g, function(m, p1) { return "'" + (trans[p1]||p1) + "'" + (trans[p1]?'':'/*LANG*/'); }); | ||
| return fileContent; | ||
| }).catch( error => { | ||
| console.log(error); | ||
| return fileContent; // unmodified | ||
| }) | ||
| ).then( fileContent => { | ||
| translated[fileName] = fileContent; | ||
| }); | ||
| }; | ||
|
|
||
| document.getElementById("fetch").addEventListener("click", () => { | ||
| new Promise((resolve,reject) => { | ||
| Puck.write("\x03",(result) => { | ||
| if (result===null) return reject(""); | ||
| Puck.eval(`require("locale").name`, (content,err) => { | ||
| if (content===null) return reject(err || ""); | ||
| resolve(content); | ||
| }); | ||
| }); | ||
| }).catch( error => { | ||
| console.log("Error getting langFromDevice, using fallback en_GB, error was: " + error); | ||
| return "en_GB"; | ||
| }).then( lang => { | ||
| document.getElementById("languages").innerHTML = ["en_GB","de_DE","fr_FR","en_US","en_JP","nl_NL","en_CA","sv_SE","en_AU","de_AT","en_IL","es_ES","fr_BE","fi_FI","de_CH","fr_CH","it_CH","tr_TR","hu_HU"].map(l=>`<option value="${l}"${(l===lang)?" selected":""}>${l}</option>`).join("\n"); | ||
| document.getElementById("formGroup").style.visibility = 'visible'; | ||
| translate(); | ||
| }); | ||
| }); | ||
|
|
||
| document.getElementById("languages").addEventListener("onchange", () => { | ||
| translate(); | ||
| }); | ||
|
|
||
| document.getElementById("upload").addEventListener("click", function() { | ||
| console.log("app.js is:", translated["app.js"]); | ||
| console.log("alarm.js is:", translated["alarm.js"]); | ||
| sendCustomizedApp({ | ||
| storage:[ | ||
| {"name":"alarm.app.js",content: translated["app.js"]}, | ||
| {"name":"alarm.boot.js","url":"boot.js"}, | ||
| {"name": "alarm.js", content: translated["alarm.js"]}, | ||
| {"name":"alarm.img","url":"app-icon.js","evaluate":true}, | ||
| {"name":"alarm.wid.js","url":"widget.js"} | ||
| ] | ||
| }); | ||
| }); | ||
| </script> | ||
| </body> | ||
| </html> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| { | ||
| "Alarms":"Alarms", | ||
| "Hours":"Hours", | ||
| "Minutes":"Minutes", | ||
| "Enabled":"Enabled", | ||
| "New Alarm":"New Alarm", | ||
| "Save":"Save", | ||
| "Back":"Back", | ||
| "Repeat":"Repeat", | ||
| "Delete":"Delete", | ||
| "rpt":"rpt", | ||
| "ALARM!":"ALARM!", | ||
| "Sleep":"Sleep" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| { | ||
| "Alarms" : "Wecker", | ||
| "Hours" : "Stunden", | ||
| "Minutes" : "Minuten", | ||
| "Enabled" : "Aktiviert", | ||
| "New Alarm" : "Neuer Wecker", | ||
| "Save" : "Speichern", | ||
| "Back" : "Zurück", | ||
| "Repeat" : "Wiederholen", | ||
| "Delete" : "Löschen", | ||
| "rpt" : "Wdh.", | ||
| "ALARM!" : "ALARM!", | ||
| "Sleep" : "Schlummern" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| { | ||
| "Alarms" : "Alarms", | ||
| "Hours" : "Hours", | ||
| "Minutes" : "Minutes", | ||
| "Enabled" : "Enabled", | ||
| "New Alarm" : "New Alarm", | ||
| "Save" : "Save", | ||
| "Back" : "Back", | ||
| "Repeat" : "Repeat", | ||
| "Delete" : "Delete", | ||
| "rpt" : "repeat", | ||
| "ALARM!" : "ALARM!", | ||
| "Sleep" : "Sleep" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| { | ||
| "Alarms" : "Alarmas", | ||
| "Hours" : "Horas", | ||
| "Minutes" : "Minutos", | ||
| "Enabled" : "Activados", | ||
| "New Alarm" : "Alarma nueva", | ||
| "Save" : "Grabar", | ||
| "Back" : "Atrás", | ||
| "Repeat" : "Repetición", | ||
| "Delete" : "Borrar", | ||
| "rpt" : "rep.", | ||
| "ALARM!" : "ALARM", | ||
| "Sleep" : "Dormir" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| { | ||
| "Alarms" : "Hälytykset", | ||
| "Hours" : "Tunnit", | ||
| "Minutes" : "Minuutit", | ||
| "Enabled" : "Aktivoitu", | ||
| "New Alarm" : "Uusi hälytys", | ||
| "Save" : "Tallenna", | ||
| "Back" : "Paluu", | ||
| "Repeat" : "Toista", | ||
| "Delete" : "Poista", | ||
| "rpt" : "toistaa", | ||
| "ALARM!" : "ALARM", | ||
| "Sleep" : "Nukkuminen" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| { | ||
| "Alarms" : "Réveils", | ||
| "Hours" : "Heures", | ||
| "Minutes" : "Minutes", | ||
| "Enabled" : "Activé", | ||
| "New Alarm" : "Nouveau Réveil", | ||
| "Save" : "Sauvegarder", | ||
| "Back" : "Retour", | ||
| "Repeat" : "Répétition", | ||
| "Delete" : "Supprimer", | ||
| "rpt" : "rép.", | ||
| "ALARM!" : "ALARM!", | ||
| "Sleep" : "Sommeil" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| { | ||
| "Alarms" : "Riasztások", | ||
| "Hours" : "Óra", | ||
| "Minutes" : "Perc", | ||
| "Enabled" : "Aktiválva", | ||
| "New Alarm" : "Új riasztás", | ||
| "Save" : "Mentés", | ||
| "Back" : "Vissza", | ||
| "Repeat" : "Ismétlés", | ||
| "Delete" : "Törlés", | ||
| "rpt" : "ismétlés", | ||
| "ALARM!" : "ALARM!", | ||
| "Sleep" : "Alvás" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| { | ||
| "Alarms" : "Allarmi", | ||
| "Hours" : "Ore", | ||
| "Minutes" : "Minuti", | ||
| "Enabled" : "Attivato", | ||
| "New Alarm" : "Nuovo allarme", | ||
| "Save" : "Salvare", | ||
| "Back" : "Indietro", | ||
| "Repeat" : "Ripetere", | ||
| "Delete" : "Cancellare", | ||
| "rpt" : "ripetere", | ||
| "ALARM!" : "ALARM!", | ||
| "Sleep" : "Dormire" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| { | ||
| "Alarms" : "Alarmen", | ||
| "Hours" : "Uren", | ||
| "Minutes" : "Minuten", | ||
| "Enabled" : "Geactiveerd", | ||
| "New Alarm" : "Nieuw alarm", | ||
| "Save" : "Opslaan", | ||
| "Back" : "Terug", | ||
| "Repeat" : "Herhalen", | ||
| "Delete" : "Verwijderen", | ||
| "rpt" : "herhalen", | ||
| "ALARM!" : "ALARV.", | ||
| "Sleep" : "Stand-by" | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is clever, but I think it would be better to just use a function in the callsite, something like https://www.i18next.com/translation-function/essentials#passing-a-default-value (and many others) use:
locale.t('new', 'New Alarm')Using the English (here) as the key is not good, if the English text “New Alarm” changes, then you can't reuse the translations properly.
Actually, there's already a locale.translate function: https://www.espruino.com/Bangle.js+Locale#translation
but it uses the English text, and doesn't support Application resources.
Needs some work!