Skip to content

Commit

Permalink
CHANGED: The COMMIT_COUNT placeholder in the UPDATE_INFO message of t…
Browse files Browse the repository at this point in the history
…he UpdateNotification module does not contain the word "commit" or "commits" any more, so language files can independently localize them.
  • Loading branch information
balassy committed Sep 5, 2018
1 parent f4c6bcf commit 3544082
Show file tree
Hide file tree
Showing 27 changed files with 28 additions and 27 deletions.
2 changes: 1 addition & 1 deletion modules/default/updatenotification/updatenotification.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Module.register("updatenotification", {
message.appendChild(icon);

var subtextHtml = this.translate("UPDATE_INFO", {
COMMIT_COUNT: this.status.behind + " " + ((this.status.behind == 1) ? "commit" : "commits"),
COMMIT_COUNT: this.status.behind,
BRANCH_NAME: this.status.current
});

Expand Down
2 changes: 1 addition & 1 deletion tests/configs/data/TranslationTest.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@

"UPDATE_NOTIFICATION": "MagicMirror² update available.",
"UPDATE_NOTIFICATION_MODULE": "Update available for MODULE_NAME module.",
"UPDATE_INFO": "The current installation is COMMIT_COUNT behind on the BRANCH_NAME branch."
"UPDATE_INFO": "The current installation is COMMIT_COUNT commit(s) behind on the BRANCH_NAME branch."
}
2 changes: 1 addition & 1 deletion tests/configs/data/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@

"UPDATE_NOTIFICATION": "MagicMirror² update available.",
"UPDATE_NOTIFICATION_MODULE": "Update available for MODULE_NAME module.",
"UPDATE_INFO": "The current installation is COMMIT_COUNT behind on the BRANCH_NAME branch."
"UPDATE_INFO": "The current installation is COMMIT_COUNT commit(s) behind on the BRANCH_NAME branch."
}
2 changes: 1 addition & 1 deletion translations/af.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@

"UPDATE_NOTIFICATION": "MagicMirror² update beskikbaar.",
"UPDATE_NOTIFICATION_MODULE": "Update beskikbaar vir {MODULE_NAME} module.",
"UPDATE_INFO": "Die huidige installasie is {COMMIT_COUNT} agter op die {BRANCH_NAME} branch."
"UPDATE_INFO": "Die huidige installasie is {COMMIT_COUNT} commit(s) agter op die {BRANCH_NAME} branch."
}
2 changes: 1 addition & 1 deletion translations/bg.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@

"UPDATE_NOTIFICATION": "Налична актуализация за MagicMirror².",
"UPDATE_NOTIFICATION_MODULE": "Налична актуализация за {MODULE_NAME} модул.",
"UPDATE_INFO": "Текущата инсталация е изостанала с {COMMIT_COUNT} къмита на клон {BRANCH_NAME}."
"UPDATE_INFO": "Текущата инсталация е изостанала с {COMMIT_COUNT} commit(s) къмита на клон {BRANCH_NAME}."
}
2 changes: 1 addition & 1 deletion translations/ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@

"UPDATE_NOTIFICATION": "MagicMirror² actualizació disponible.",
"UPDATE_NOTIFICATION_MODULE": "Disponible una actualizació per al mòdul {MODULE_NAME}.",
"UPDATE_INFO": "La teva instal·lació actual està {COMMIT_COUNT} canvis darrere de la branca {BRANCH_NAME}."
"UPDATE_INFO": "La teva instal·lació actual està {COMMIT_COUNT} commit(s) canvis darrere de la branca {BRANCH_NAME}."
}
2 changes: 1 addition & 1 deletion translations/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@

"UPDATE_NOTIFICATION": "Dostupná aktualizace pro MagicMirror².",
"UPDATE_NOTIFICATION_MODULE": "Dostupná aktualizace pro modul {MODULE_NAME}.",
"UPDATE_INFO": "Současná instalace je na větvi {BRANCH_NAME} pozadu o {COMMIT_COUNT}."
"UPDATE_INFO": "Současná instalace je na větvi {BRANCH_NAME} pozadu o {COMMIT_COUNT} commit(s)."
}
2 changes: 1 addition & 1 deletion translations/da.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@

"UPDATE_NOTIFICATION": "MagicMirror² opdatering tilgængelig.",
"UPDATE_NOTIFICATION_MODULE": "Opdatering tilgængelig for {MODULE_NAME} modulet.",
"UPDATE_INFO": "Den nuværende installation er {COMMIT_COUNT} bagud på {BRANCH_NAME} branch'en."
"UPDATE_INFO": "Den nuværende installation er {COMMIT_COUNT} commit(s) bagud på {BRANCH_NAME} branch'en."
}
2 changes: 1 addition & 1 deletion translations/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

"UPDATE_NOTIFICATION": "Aktualisierung für MagicMirror² verfügbar.",
"UPDATE_NOTIFICATION_MODULE": "Aktualisierung für das {MODULE_NAME} Modul verfügbar.",
"UPDATE_INFO": "Die aktuelle Installation ist {COMMIT_COUNT} hinter dem {BRANCH_NAME} Branch.",
"UPDATE_INFO": "Die aktuelle Installation ist {COMMIT_COUNT} Commit(s) hinter dem {BRANCH_NAME} Branch.",

"FEELS": "Gefühlt"
}
2 changes: 1 addition & 1 deletion translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

"UPDATE_NOTIFICATION": "MagicMirror² update available.",
"UPDATE_NOTIFICATION_MODULE": "Update available for {MODULE_NAME} module.",
"UPDATE_INFO": "The current installation is {COMMIT_COUNT} behind on the {BRANCH_NAME} branch.",
"UPDATE_INFO": "The current installation is {COMMIT_COUNT} commit(s) behind on the {BRANCH_NAME} branch.",

"FEELS": "Feels"
}
2 changes: 1 addition & 1 deletion translations/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

"UPDATE_NOTIFICATION": "MagicMirror² actualización disponible.",
"UPDATE_NOTIFICATION_MODULE": "Disponible una actualización para el módulo {MODULE_NAME}.",
"UPDATE_INFO": "Tu actual instalación está {COMMIT_COUNT} cambios detrás de la rama {BRANCH_NAME}.",
"UPDATE_INFO": "Tu actual instalación está {COMMIT_COUNT} commit(s) cambios detrás de la rama {BRANCH_NAME}.",

"FEELS": "Sensación térmica de"
}
2 changes: 1 addition & 1 deletion translations/et.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@

"UPDATE_NOTIFICATION": "MagicMirror²´le uuendus saadaval.",
"UPDATE_NOTIFICATION_MODULE": "Uuendus saadaval {MODULE_NAME} moodulile.",
"UPDATE_INFO": "Praegune paigaldus on {COMMIT_COUNT} tagapool {BRANCH_NAME} harul."
"UPDATE_INFO": "Praegune paigaldus on {COMMIT_COUNT} commit(s) tagapool {BRANCH_NAME} harul."
}
2 changes: 1 addition & 1 deletion translations/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

"UPDATE_NOTIFICATION": "Une mise à jour de MagicMirror² est disponible",
"UPDATE_NOTIFICATION_MODULE": "Une mise à jour est disponible pour le module {MODULE_NAME} .",
"UPDATE_INFO": "L'installation actuelle est {COMMIT_COUNT} en retard sur la branche {BRANCH_NAME} .",
"UPDATE_INFO": "L'installation actuelle est {COMMIT_COUNT} commit(s) en retard sur la branche {BRANCH_NAME} .",

"FEELS": "Ressenti"
}
2 changes: 1 addition & 1 deletion translations/hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

"UPDATE_NOTIFICATION": "MagicMirror²-hoz frissítés érhető el.",
"UPDATE_NOTIFICATION_MODULE": "A {MODULE_NAME} modulhoz frissítés érhető el.",
"UPDATE_INFO": "A jelenlegi telepítés óta {COMMIT_COUNT} commit jelent meg a {BRANCH_NAME} ágon.",
"UPDATE_INFO": "A jelenlegi telepítés óta {COMMIT_COUNT} új commit jelent meg a {BRANCH_NAME} ágon.",

"FEELS": "Érzet"
}
2 changes: 1 addition & 1 deletion translations/id.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@

"UPDATE_NOTIFICATION": "Memperbarui MagicMirror² tersedia.",
"UPDATE_NOTIFICATION_MODULE": "Memperbarui tersedia untuk modul {MODULE_NAME}.",
"UPDATE_INFO": "Instalasi saat ini tertinggal {COMMIT_COUNT} pada cabang {BRANCH_NAME}."
"UPDATE_INFO": "Instalasi saat ini tertinggal {COMMIT_COUNT} commit(s) pada cabang {BRANCH_NAME}."
}
2 changes: 1 addition & 1 deletion translations/is.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@

"UPDATE_NOTIFICATION": "MagicMirror² uppfærsla í boði.",
"UPDATE_NOTIFICATION_MODULE": "Uppfærsla í boði fyrir {MODULE_NAME} module.",
"UPDATE_INFO": "Núverandi kerfi er {COMMIT_COUNT} á eftir {BRANCH_NAME} branchinu."
"UPDATE_INFO": "Núverandi kerfi er {COMMIT_COUNT} commit(s) á eftir {BRANCH_NAME} branchinu."
}
2 changes: 1 addition & 1 deletion translations/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@

"UPDATE_NOTIFICATION": "E' disponibile un aggiornamento di MagicMirror².",
"UPDATE_NOTIFICATION_MODULE": "E' disponibile un aggiornamento del modulo {MODULE_NAME}.",
"UPDATE_INFO": "L'installazione è {COMMIT_COUNT} indietro rispetto all'attuale branch {BRANCH_NAME}."
"UPDATE_INFO": "L'installazione è {COMMIT_COUNT} commit(s) indietro rispetto all'attuale branch {BRANCH_NAME}."
}
2 changes: 1 addition & 1 deletion translations/kr.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@

"UPDATE_NOTIFICATION": "새로운 MagicMirror² 업데이트가 있습니다.",
"UPDATE_NOTIFICATION_MODULE": "{MODULE_NAME} 모듈에서 사용 가능한 업데이트 입니다.",
"UPDATE_INFO": "설치할 {COMMIT_COUNT} 는 {BRANCH_NAME} 분기에 해당됩니다."
"UPDATE_INFO": "설치할 {COMMIT_COUNT} commit(s) 는 {BRANCH_NAME} 분기에 해당됩니다."
}
2 changes: 1 addition & 1 deletion translations/nb.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

"UPDATE_NOTIFICATION": "MagicMirror²-oppdatering er tilgjengelig.",
"UPDATE_NOTIFICATION_MODULE": "Oppdatering tilgjengelig for modulen {MODULE_NAME}.",
"UPDATE_INFO": "Nåværende installasjon er {COMMIT_COUNT} bak {BRANCH_NAME} grenen.",
"UPDATE_INFO": "Nåværende installasjon er {COMMIT_COUNT} commit(s) bak {BRANCH_NAME} grenen.",

"FEELS": "Føles som"
}
2 changes: 1 addition & 1 deletion translations/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

"UPDATE_NOTIFICATION": "MagicMirror² update beschikbaar.",
"UPDATE_NOTIFICATION_MODULE": "Update beschikbaar voor {MODULE_NAME} module.",
"UPDATE_INFO": "De huidige installatie loopt {COMMIT_COUNT} achter op de {BRANCH_NAME} branch.",
"UPDATE_INFO": "De huidige installatie loopt {COMMIT_COUNT} commit(s) achter op de {BRANCH_NAME} branch.",

"FEELS": "Gevoelstemperatuur"
}
2 changes: 1 addition & 1 deletion translations/nn.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

"UPDATE_NOTIFICATION": "MagicMirror² oppdatering er tilgjengeleg.",
"UPDATE_NOTIFICATION_MODULE": "Oppdatering tilgjengeleg for modulen {MODULE_NAME}.",
"UPDATE_INFO": "noverande installasjon er {COMMIT_COUNT} bak {BRANCH_NAME} greinen.",
"UPDATE_INFO": "noverande installasjon er {COMMIT_COUNT} commit(s) bak {BRANCH_NAME} greinen.",

"FEELS": "Kjenst som"
}
3 changes: 2 additions & 1 deletion translations/pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@

"UPDATE_NOTIFICATION": "Dostępna jest aktualizacja MagicMirror².",
"UPDATE_NOTIFICATION_MODULE": "Dostępna jest aktualizacja modułu {MODULE_NAME}.",
"UPDATE_INFO": "Zainstalowana wersja odbiega o {COMMIT_COUNT} commitów od gałęzi {BRANCH_NAME}.",
"UPDATE_INFO_SINGLE": "Zainstalowana wersja odbiega o {COMMIT_COUNT} commitów od gałęzi {BRANCH_NAME}.",
"UPDATE_INFO_MULTIPLE": "Zainstalowana wersja odbiega o {COMMIT_COUNT} commitów od gałęzi {BRANCH_NAME}.",

"FEELS": "Odczuwalna"
}
2 changes: 1 addition & 1 deletion translations/pt-br.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@

"UPDATE_NOTIFICATION": "Nova atualização para MagicMirror disponível.",
"UPDATE_NOTIFICATION_MODULE": "Atualização para o módulo {MODULE_NAME} disponível.",
"UPDATE_INFO": "Sua versão atual é a {COMMIT_COUNT} dentro do seguinte branch {BRANCH_NAME}."
"UPDATE_INFO": "Sua versão atual é a {COMMIT_COUNT} commit(s) dentro do seguinte branch {BRANCH_NAME}."
}
2 changes: 1 addition & 1 deletion translations/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@

"UPDATE_NOTIFICATION": "Atualização do MagicMirror² disponível.",
"UPDATE_NOTIFICATION_MODULE": "Atualização para o módulo {MODULE_NAME} disponível.",
"UPDATE_INFO": "A instalação atual está {COMMIT_COUNT} atrasada no branch {BRANCH_NAME}."
"UPDATE_INFO": "A instalação atual está {COMMIT_COUNT} commit(s) atrasada no branch {BRANCH_NAME}."
}
2 changes: 1 addition & 1 deletion translations/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@

"UPDATE_NOTIFICATION": "Есть обновление для MagicMirror².",
"UPDATE_NOTIFICATION_MODULE": "Есть обновление для {MODULE_NAME} модуля.",
"UPDATE_INFO": "Данная инсталляция позади {BRANCH_NAME} ветки на {COMMIT_COUNT} коммитов."
"UPDATE_INFO": "Данная инсталляция позади {BRANCH_NAME} commit(s) ветки на {COMMIT_COUNT} коммитов."
}
2 changes: 1 addition & 1 deletion translations/sv.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

"UPDATE_NOTIFICATION": "MagicMirror² uppdatering finns tillgänglig.",
"UPDATE_NOTIFICATION_MODULE": "Uppdatering finns tillgänglig av {MODULE_NAME} modulen.",
"UPDATE_INFO": "Denna installation ligger {COMMIT_COUNT} steg bakom {BRANCH_NAME} grenen.",
"UPDATE_INFO": "Denna installation ligger {COMMIT_COUNT} commit(s) steg bakom {BRANCH_NAME} grenen.",

"FEELS": "Känns som"
}
2 changes: 1 addition & 1 deletion translations/zh-cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@

"UPDATE_NOTIFICATION": "MagicMirror² 有新的更新",
"UPDATE_NOTIFICATION_MODULE": "模块 {MODULE_NAME} 可更新",
"UPDATE_INFO": "当前已安装版本为 {COMMIT_COUNT} 落后于分支 {BRANCH_NAME} "
"UPDATE_INFO": "当前已安装版本为 {COMMIT_COUNT} commit(s) 落后于分支 {BRANCH_NAME} "
}

0 comments on commit 3544082

Please sign in to comment.