github-mirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-28 09:42:21 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1186 from BonySimon/patch-1

Browse source 
Fix exception on translation of objects
This commit is contained in:
Michael Teeuw 2018-03-25 14:55:52 +02:00 • committed by GitHub
commit d0eeb55999
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
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;
} }