kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 19:53:36 +00:00
Code Issues Projects Releases Wiki Activity

Fix exception on translation of objects

Browse Source 
Sometimes, the content of translations[module.name][key] is not a string but an entire object. It cause a crash on template.replace(...) of createStringFromTemplate(...). It is currently the case of MMM-Voice-Control and the previous commit have broked this module (10 month ago... I am surprised to be the first founded it)
This commit is contained in:
Steelskin3 2018-02-23 11:51:59 +01:00 committed by GitHub
parent 20823bfc87
commit 0388f5787a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/translator.js
View File

@ -126,6 +126,9 @@ var Translator = (function() {
// variables: {timeToWait: "2 hours", work: "painting"} // variables: {timeToWait: "2 hours", work: "painting"}
// to: "Please wait for 2 hours before continuing with painting." // to: "Please wait for 2 hours before continuing with painting."
function createStringFromTemplate(template, variables) { function createStringFromTemplate(template, variables) {
if(Object.prototype.toString.call(template) !== '[object String]') {
return template;
}
if(variables.fallback && !template.match(new RegExp("\{.+\}"))) { if(variables.fallback && !template.match(new RegExp("\{.+\}"))) {
template = variables.fallback; template = variables.fallback;
} }