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

Merge pull request #1046 from wbleek/master

Browse Source 
moved weekNumber into field and adjusted language handling accordingly [issue #910]
This commit is contained in:
Michael Teeuw 2017-10-03 22:13:21 +02:00 committed by GitHub
commit 980b017fbe
13 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
**Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`
### Changed
- calender week is now handled with a variable translation in order to move number language specific
### Added
- Add option to use [Nunjucks](https://mozilla.github.io/nunjucks/) templates in modules. (See `helloworld` module as an example.)

2
modules/default/clock/clock.js
View File

@ -94,7 +94,7 @@ Module.register("clock",{
dateWrapper.innerHTML = now.format(this.config.dateFormat);
}
if (this.config.showWeek) {
weekWrapper.innerHTML = this.translate("WEEK") + " " + now.week();
weekWrapper.innerHTML = this.translate("WEEK", { weekNumber: now.week() });
}
timeWrapper.innerHTML = timeString;
secondsWrapper.innerHTML = now.format("ss");

2
translations/cy.json
View File

@ -7,7 +7,7 @@
"RUNNING": "Gorffen mewn",
"EMPTY": "Dim digwyddiadau.",
"WEEK": "Wythnos",
"WEEK": "Wythnos {weekNumber}",
"N": "Go",
"NNE": "GoGoDw",

2
translations/de.json
View File

@ -7,7 +7,7 @@
"RUNNING": "noch",
"EMPTY": "Keine Termine.",
"WEEK": "Woche",
"WEEK": "{weekNumber}. Kalenderwoche",
"N": "N",
"NNE": "NNO",

2
translations/en.json
View File

@ -7,7 +7,7 @@
"RUNNING": "Ends in",
"EMPTY": "No upcoming events.",
"WEEK": "Week",
"WEEK": "Week {weekNumber}",
"N": "N",
"NNE": "NNE",

2
translations/es.json
View File

@ -7,7 +7,7 @@
"RUNNING": "Termina en",
"EMPTY": "No hay eventos programados.",
"WEEK": "Semana",
"WEEK": "Semana {weekNumber}",
"N": "N",
"NNE": "NNE",

2
translations/fr.json
View File

@ -7,7 +7,7 @@
"RUNNING": "Se termine dans",
"EMPTY": "Aucun RDV à venir.",
"WEEK": "Semaine",
"WEEK": "Semaine {weekNumber}",
"N": "N",
"NNE": "NNE",

2
translations/nb.json
View File

@ -7,7 +7,7 @@
"RUNNING": "Slutter om",
"EMPTY": "Ingen kommende arrangementer.",
"WEEK": "Uke",
"WEEK": "Uke {weekNumber}",
"N": "N",
"NNE": "NNØ",

2
translations/pl.json
View File

@ -7,7 +7,7 @@
"RUNNING": "Koniec za",
"EMPTY": "Brak wydarzeń.",
"WEEK": "Tydzień",
"WEEK": "Tydzień {weekNumber}",
"N": "N",
"NNE": "NNE",

2
translations/pt.json
View File

@ -6,7 +6,7 @@
"RUNNING": "Termina em",
"EMPTY": "Sem eventos programados.",
"WEEK": "Semana",
"WEEK": "Semana {weekNumber}",
"N": "N",
"NNE": "NNE",

2
translations/ro.json
View File

@ -7,7 +7,7 @@
"RUNNING": "Se termină în",
"EMPTY": "Nici un eveniment.",
"WEEK": "Săptămâna",
"WEEK": "Săptămâna {weekNumber}",
"N": "N",
"NNE": "NNE",

2
translations/ru.json
View File

@ -7,7 +7,7 @@
"RUNNING": "Заканчивается через",
"EMPTY": "Нет предстоящих событий",
"WEEK": "Неделя",
"WEEK": "Неделя {weekNumber}",
"N": "С",
"NNE": "ССВ",

2
translations/sv.json
View File

@ -7,7 +7,7 @@
"RUNNING": "Slutar",
"EMPTY": "Inga kommande händelser.",
"WEEK": "Vecka",
"WEEK": "Vecka {weekNumber}",
"N": "N",
"NNE": "NNO",