From b4fd570269a9ce8d93790625fc002a558505e78d Mon Sep 17 00:00:00 2001 From: Wolf-Gideon Bleek Date: Tue, 3 Oct 2017 21:18:25 +0200 Subject: [PATCH 1/2] moved weekNumber into field and adjusted language handling accordingly [issue #910] --- modules/default/clock/clock.js | 2 +- translations/cy.json | 2 +- translations/de.json | 2 +- translations/en.json | 2 +- translations/es.json | 2 +- translations/fr.json | 2 +- translations/nb.json | 2 +- translations/pl.json | 2 +- translations/pt.json | 2 +- translations/ro.json | 2 +- translations/ru.json | 2 +- translations/sv.json | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/default/clock/clock.js b/modules/default/clock/clock.js index 9a0f57d7..705b4303 100644 --- a/modules/default/clock/clock.js +++ b/modules/default/clock/clock.js @@ -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"); diff --git a/translations/cy.json b/translations/cy.json index c823b7f6..d0b2a077 100644 --- a/translations/cy.json +++ b/translations/cy.json @@ -7,7 +7,7 @@ "RUNNING": "Gorffen mewn", "EMPTY": "Dim digwyddiadau.", - "WEEK": "Wythnos", + "WEEK": "Wythnos {weekNumber}", "N": "Go", "NNE": "GoGoDw", diff --git a/translations/de.json b/translations/de.json index 2723bf86..278a4bba 100644 --- a/translations/de.json +++ b/translations/de.json @@ -7,7 +7,7 @@ "RUNNING": "noch", "EMPTY": "Keine Termine.", - "WEEK": "Woche", + "WEEK": "{weekNumber}. Kalenderwoche", "N": "N", "NNE": "NNO", diff --git a/translations/en.json b/translations/en.json index a1472cf1..7e048c8c 100644 --- a/translations/en.json +++ b/translations/en.json @@ -7,7 +7,7 @@ "RUNNING": "Ends in", "EMPTY": "No upcoming events.", - "WEEK": "Week", + "WEEK": "Week {weekNumber}", "N": "N", "NNE": "NNE", diff --git a/translations/es.json b/translations/es.json index adee4dfc..21634351 100644 --- a/translations/es.json +++ b/translations/es.json @@ -7,7 +7,7 @@ "RUNNING": "Termina en", "EMPTY": "No hay eventos programados.", - "WEEK": "Semana", + "WEEK": "Semana {weekNumber}", "N": "N", "NNE": "NNE", diff --git a/translations/fr.json b/translations/fr.json index c17b2df8..87c26a6a 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -7,7 +7,7 @@ "RUNNING": "Se termine dans", "EMPTY": "Aucun RDV à venir.", - "WEEK": "Semaine", + "WEEK": "Semaine {weekNumber}", "N": "N", "NNE": "NNE", diff --git a/translations/nb.json b/translations/nb.json index 3aad4263..36a28de2 100644 --- a/translations/nb.json +++ b/translations/nb.json @@ -7,7 +7,7 @@ "RUNNING": "Slutter om", "EMPTY": "Ingen kommende arrangementer.", - "WEEK": "Uke", + "WEEK": "Uke {weekNumber}", "N": "N", "NNE": "NNØ", diff --git a/translations/pl.json b/translations/pl.json index 1d30e395..3c69d3bc 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -7,7 +7,7 @@ "RUNNING": "Koniec za", "EMPTY": "Brak wydarzeń.", - "WEEK": "Tydzień", + "WEEK": "Tydzień {weekNumber}", "N": "N", "NNE": "NNE", diff --git a/translations/pt.json b/translations/pt.json index 07148c2c..c340ff51 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -6,7 +6,7 @@ "RUNNING": "Termina em", "EMPTY": "Sem eventos programados.", - "WEEK": "Semana", + "WEEK": "Semana {weekNumber}", "N": "N", "NNE": "NNE", diff --git a/translations/ro.json b/translations/ro.json index 4105763e..cf1eca73 100644 --- a/translations/ro.json +++ b/translations/ro.json @@ -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", diff --git a/translations/ru.json b/translations/ru.json index c919af50..eee96ebc 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -7,7 +7,7 @@ "RUNNING": "Заканчивается через", "EMPTY": "Нет предстоящих событий", - "WEEK": "Неделя", + "WEEK": "Неделя {weekNumber}", "N": "С", "NNE": "ССВ", diff --git a/translations/sv.json b/translations/sv.json index 13288ec3..d33461ef 100644 --- a/translations/sv.json +++ b/translations/sv.json @@ -7,7 +7,7 @@ "RUNNING": "Slutar", "EMPTY": "Inga kommande händelser.", - "WEEK": "Vecka", + "WEEK": "Vecka {weekNumber}", "N": "N", "NNE": "NNO", From 8c150c23f3bed783878ff47dc57825e840a41930 Mon Sep 17 00:00:00 2001 From: Wolf-Gideon Bleek Date: Tue, 3 Oct 2017 21:25:30 +0200 Subject: [PATCH 2/2] moved weekNumber into field and adjusted language handling accordingly [issue #910] --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee252ea0..f4df7113 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +### Changed +- calender week is now handled with a variable translation in order to move number language specific + ## [2.1.3] - 2017-10-01 **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`