kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-22 21:11:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #877 from Arkkimaagi/better-translations

Browse Source 
Improve translation flexibility
This commit is contained in:
Michael Teeuw
2017-05-01 14:27:35 +02:00
committed by GitHub
parent 73a47b2853 7c20d2f97c
commit 322cec0980
6 changed files with 86 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/default/calendar/calendar.js
View File

@@ -265,7 +265,12 @@ Module.register("calendar", {
}
}
} else {
timeWrapper.innerHTML = this.capFirst(this.translate("RUNNING")) + " " + moment(event.endDate, "x").fromNow(true);
timeWrapper.innerHTML = this.capFirst(
this.translate("RUNNING", {
fallback: this.translate("RUNNING") + " {timeUntilEnd}",
timeUntilEnd: moment(event.endDate, "x").fromNow(true)
})
);
}
}
//timeWrapper.innerHTML += ' - '+ moment(event.startDate,'x').format('lll');