From 110a1a640d62232baa5b8531b11dd70e62d49f11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Sun, 29 Jan 2017 17:14:09 -0300 Subject: [PATCH 1/4] fix .stylelintrc in jsonlint check --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index a3edb053..02c9402d 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -22,7 +22,7 @@ module.exports = function(grunt) { }, jsonlint: { main: { - src: ["package.json", ".eslintrc.json", ".stylelint"], + src: ["package.json", ".eslintrc.json", ".stylelintrc"], options: { reporter: "jshint" } From b4271da13ed163b631b6ffe2e899280cdca6d447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Mon, 30 Jan 2017 13:17:36 -0300 Subject: [PATCH 2/4] add translations/translations.js eslint check --- Gruntfile.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gruntfile.js b/Gruntfile.js index 02c9402d..a4d2f43a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -10,6 +10,8 @@ module.exports = function(grunt) { "serveronly/*.js", "*.js", "tests/*/*.js", "!modules/default/alert/notificationFx.js", "!modules/default/alert/modernizr.custom.js", "!modules/default/alert/classie.js", "config/*", + "translations/translations.js" + ] }, stylelint: { From 1032e97d5845a9ef01a79d98a0c708bf66bc13dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Mon, 30 Jan 2017 13:32:52 -0300 Subject: [PATCH 3/4] Fix string russian translation module alert --- modules/default/alert/translations/ru.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/default/alert/translations/ru.json b/modules/default/alert/translations/ru.json index ef7ee708..60ddf3d8 100644 --- a/modules/default/alert/translations/ru.json +++ b/modules/default/alert/translations/ru.json @@ -1,4 +1,4 @@ { "sysTitle": "MagicMirror Уведомление", - "welcome": "Добро пожаловать, старт был успешным!"" + "welcome": "Добро пожаловать, старт был успешным!" } From cb71667336c6263e5edbcf3d196155c2b2553edb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Mon, 30 Jan 2017 13:34:51 -0300 Subject: [PATCH 4/4] Use jsonlint task to check translation files --- CHANGELOG.md | 1 + Gruntfile.js | 2 +- translations/af.json | 4 ---- translations/da.json | 4 ---- translations/de.json | 4 ---- translations/en.json | 4 ---- translations/es.json | 4 ---- translations/fi.json | 4 ---- translations/fr.json | 3 --- translations/fy.json | 3 --- translations/gr.json | 3 --- translations/hu.json | 6 +----- translations/is.json | 4 ---- translations/it.json | 3 --- translations/ja.json | 5 +---- translations/nb.json | 3 --- translations/nl.json | 4 ---- translations/nn.json | 3 --- translations/pl.json | 4 ---- translations/pt.json | 3 --- translations/pt_br.json | 3 --- translations/ru.json | 4 ---- translations/sv.json | 4 ---- translations/tr.json | 3 --- translations/zh_cn.json | 3 --- translations/zh_tw.json | 3 --- 26 files changed, 4 insertions(+), 87 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2aa0ec6b..4bf38a33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Run `npm test` on Travis automatically - Show the splash screen image even when is reboot or halted. - Added some missing translaton strings in the sv.json file. +- Run task jsonlint to check translation files. ### Added - Add loaded function to modules, providing an async callback. diff --git a/Gruntfile.js b/Gruntfile.js index a4d2f43a..5aa68811 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -24,7 +24,7 @@ module.exports = function(grunt) { }, jsonlint: { main: { - src: ["package.json", ".eslintrc.json", ".stylelintrc"], + src: ["package.json", ".eslintrc.json", ".stylelintrc", "translations/*.json", "modules/default/*/translations/*.json"], options: { reporter: "jshint" } diff --git a/translations/af.json b/translations/af.json index 894b14ea..0995bdf0 100644 --- a/translations/af.json +++ b/translations/af.json @@ -1,15 +1,12 @@ { - /* GENERAL */ "LOADING": "Besig om te laai …", - /* CALENDAR */ "TODAY": "Vandag", "TOMORROW": "Môre", "DAYAFTERTOMORROW": "Oormôre", "RUNNING": "Eindig in", "EMPTY": "Geen komende gebeurtenisse.", - /* WEATHER */ "N": "N", "NNE": "NNO", "NE": "NO", @@ -27,7 +24,6 @@ "NW": "NW", "NNW": "NNW", - /* UPDATE INFO */ "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." diff --git a/translations/da.json b/translations/da.json index 5ad271fe..68c544a6 100644 --- a/translations/da.json +++ b/translations/da.json @@ -1,15 +1,12 @@ { - /* GENERAL */ "LOADING": "Indlæser …", - /* CALENDAR */ "TODAY": "I dag", "TOMORROW": "I morgen", "DAYAFTERTOMORROW": "I overmorgen", "RUNNING": "Slutter om", "EMPTY": "Ingen kommende begivenheder.", - /* WEATHER */ "N": "N", "NNE": "NNØ", "NE": "NØ", @@ -28,7 +25,6 @@ "NNW": "NNV", - /* UPDATE INFO */ "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." diff --git a/translations/de.json b/translations/de.json index 54ac5015..eb67d41a 100644 --- a/translations/de.json +++ b/translations/de.json @@ -1,15 +1,12 @@ { - /* GENERAL */ "LOADING": "Lade …", - /* CALENDAR */ "TODAY": "Heute", "TOMORROW": "Morgen", "DAYAFTERTOMORROW": "Übermorgen", "RUNNING": "noch", "EMPTY": "Keine Termine.", - /* WEATHER */ "N": "N", "NNE": "NNO", "NE": "NO", @@ -27,7 +24,6 @@ "NW": "NW", "NNW": "NNW", - /* UPDATE INFO */ "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." diff --git a/translations/en.json b/translations/en.json index 45609f61..46061738 100644 --- a/translations/en.json +++ b/translations/en.json @@ -1,15 +1,12 @@ { - /* GENERAL */ "LOADING": "Loading …", - /* CALENDAR */ "TODAY": "Today", "TOMORROW": "Tomorrow", "DAYAFTERTOMORROW": "The day after tomorrow", "RUNNING": "Ends in", "EMPTY": "No upcoming events.", - /* WEATHER */ "N": "N", "NNE": "NNE", "NE": "NE", @@ -27,7 +24,6 @@ "NW": "NW", "NNW": "NNW", - /* UPDATE INFO */ "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." diff --git a/translations/es.json b/translations/es.json index 9b80b45a..914a72ce 100644 --- a/translations/es.json +++ b/translations/es.json @@ -1,15 +1,12 @@ { - /* GENERAL */ "LOADING": "Cargando …", - /* CALENDAR */ "TODAY": "Hoy", "TOMORROW": "Mañana", "DAYAFTERTOMORROW": "Pasado mañana", "RUNNING": "Termina en", "EMPTY": "No hay eventos programados.", - /* WEATHER */ "N": "N", "NNE": "NNE", "NE": "NE", @@ -27,7 +24,6 @@ "NW": "NO", "NNW": "NNO", - /* UPDATE INFO */ "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." diff --git a/translations/fi.json b/translations/fi.json index 59fa0180..08bc4060 100644 --- a/translations/fi.json +++ b/translations/fi.json @@ -1,15 +1,12 @@ { - /* GENERAL */ "LOADING": "Lataa …", - /* CALENDAR */ "TODAY": "Tänään", "TOMORROW": "Huomenna", "DAYAFTERTOMORROW": "Ylihuomenna", "RUNNING": "Meneillään", "EMPTY": "Ei tulevia tapahtumia.", - /* WEATHER */ "N": "P", "NNE": "PPI", "NE": "PI", @@ -27,7 +24,6 @@ "NW": "PL", "NNW": "PPL", - /* UPDATE INFO */ "UPDATE_NOTIFICATION": "MagicMirror² päivitys saatavilla.", "UPDATE_NOTIFICATION_MODULE": "Päivitys saatavilla moduulille MODULE_NAME." } diff --git a/translations/fr.json b/translations/fr.json index 2701eb08..d27bc7e6 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -1,14 +1,11 @@ { - /* GENERAL */ "LOADING": "Chargement …", - /* CALENDAR */ "TODAY": "Aujourd'hui", "TOMORROW": "Demain", "RUNNING": "Se termine dans", "EMPTY": "Aucun RDV.", - /* WEATHER */ "N": "N", "NNE": "NNE", "NE": "NE", diff --git a/translations/fy.json b/translations/fy.json index 44f1b476..f1735382 100644 --- a/translations/fy.json +++ b/translations/fy.json @@ -1,15 +1,12 @@ { - /* GENERAL */ "LOADING": "Bezich mei laden …", - /* CALENDAR */ "TODAY": "Hjoed", "TOMORROW": "Moarn", "DAYAFTERTOMORROW": "Oaremoarn", "RUNNING": "Einigest oer", "EMPTY": "Gjin plande ôfspraken.", - /* WEATHER */ "N": "N", "NNE": "NNE", "NE": "NE", diff --git a/translations/gr.json b/translations/gr.json index 6b9c92ac..a8f5ccbd 100644 --- a/translations/gr.json +++ b/translations/gr.json @@ -1,14 +1,11 @@ { - /* GENERAL */ "LOADING": "Φόρτωση …", - /* CALENDAR */ "TODAY": "Σήμερα", "TOMORROW": "Αύριο", "RUNNING": "Λήγει σε", "EMPTY": "Δεν υπάρχουν προσεχείς εκδηλώσεις.", - /* WEATHER */ "N": "B", "NNE": "BBA", "NE": "BA", diff --git a/translations/hu.json b/translations/hu.json index 069ad1ad..de18d82e 100644 --- a/translations/hu.json +++ b/translations/hu.json @@ -1,15 +1,12 @@ { - /* GENERAL */ "LOADING": "Betöltés …", - /* CALENDAR */ "TODAY": "Ma", "TOMORROW": "Holnap", "DAYAFTERTOMORROW": "Holnapután", "RUNNING": "Vége lesz", "EMPTY": "Nincs közelgő esemény.", - /* WEATHER */ "N": "É", "NNE": "ÉÉK", "NE": "ÉK", @@ -27,8 +24,7 @@ "NW": "ÉNy", "NNW": "ÉÉNy", - /* UPDATE INFO */ "UPDATE_NOTIFICATION": "MagicMirror² elérhető egy frissítés!", "UPDATE_NOTIFICATION_MODULE": "A frissítés MODULE_NAME modul néven érhető el.", "UPDATE_INFO": "A jelenlegi telepítés COMMIT_COUNT mögött BRANCH_NAME ágon található." -} \ No newline at end of file +} diff --git a/translations/is.json b/translations/is.json index d3e6d6cb..aabc3997 100644 --- a/translations/is.json +++ b/translations/is.json @@ -1,15 +1,12 @@ { - /* GENERAL */ "LOADING": "Hleð upp …", - /* CALENDAR */ "TODAY": "Í dag", "TOMORROW": "Á morgun", "DAYAFTERTOMORROW": "Ekki á morgun, heldur hinn", "RUNNING": "Endar eftir", "EMPTY": "Ekkert framundan.", - /* WEATHER */ "N": "N", "NNE": "NNA", "NE": "NA", @@ -27,7 +24,6 @@ "NW": "NV", "NNW": "NNV", - /* UPDATE INFO */ "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." diff --git a/translations/it.json b/translations/it.json index bde608b4..4e3041da 100644 --- a/translations/it.json +++ b/translations/it.json @@ -1,14 +1,11 @@ { - /* GENERAL */ "LOADING": "Caricamento in corso …", - /* CALENDAR */ "TODAY": "Oggi", "TOMORROW": "Domani", "RUNNING": "Termina entro", "EMPTY": "Nessun evento in arrivo.", - /* WEATHER */ "N": "N", "NNE": "NNE", "NE": "NE", diff --git a/translations/ja.json b/translations/ja.json index 72849559..ff15687b 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -1,14 +1,11 @@ { - /* GENERAL */ - "LOADING": "ローディング …", + "LOADING": "ローディング …", - /* CALENDAR */ "TODAY": "今日", "TOMORROW": "明日", "RUNNING": "で終わります", "EMPTY": "直近のイベントはありません", - /* WEATHER */ "N": "北", "NNE": "北北東", "NE": "北東", diff --git a/translations/nb.json b/translations/nb.json index 48f0ac6f..1b57a5fa 100644 --- a/translations/nb.json +++ b/translations/nb.json @@ -1,14 +1,11 @@ { - /* GENERAL */ "LOADING": "Laster …", - /* CALENDAR */ "TODAY": "I dag", "TOMORROW": "I morgen", "RUNNING": "Slutter om", "EMPTY": "Ingen kommende arrangementer.", - /* WEATHER */ "N": "N", "NNE": "NNØ", "NE": "NØ", diff --git a/translations/nl.json b/translations/nl.json index 803db06c..c615903b 100644 --- a/translations/nl.json +++ b/translations/nl.json @@ -1,15 +1,12 @@ { - /* GENERAL */ "LOADING": "Bezig met laden …", - /* CALENDAR */ "TODAY": "Vandaag", "TOMORROW": "Morgen", "DAYAFTERTOMORROW": "Overmorgen", "RUNNING": "Eindigt over", "EMPTY": "Geen geplande afspraken.", - /* WEATHER */ "N": "N", "NNE": "NNO", "NE": "NO", @@ -27,7 +24,6 @@ "NW": "NW", "NNW": "NNW", - /* UPDATE INFO */ "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." diff --git a/translations/nn.json b/translations/nn.json index b7dbe3ea..107bec9d 100644 --- a/translations/nn.json +++ b/translations/nn.json @@ -1,14 +1,11 @@ { - /* GENERAL */ "LOADING": "Lastar …", - /* CALENDAR */ "TODAY": "I dag", "TOMORROW": "I morgon", "RUNNING": "Sluttar om", "EMPTY": "Ingen komande hendingar.", - /* WEATHER */ "N": "N", "NNE": "NNA", "NE": "NA", diff --git a/translations/pl.json b/translations/pl.json index 06bf3b5c..0c79835f 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -1,14 +1,11 @@ { - /* GENERAL */ "LOADING": "Ładowanie …", - /* CALENDAR */ "TODAY": "Dziś", "TOMORROW": "Jutro", "RUNNING": "Koniec za", "EMPTY": "Brak wydarzeń.", - /* WEATHER */ "N": "N", "NNE": "NNE", "NE": "NE", @@ -26,7 +23,6 @@ "NW": "NW", "NNW": "NNW", - /* UPDATE INFO */ "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." diff --git a/translations/pt.json b/translations/pt.json index f8797f0f..35de1326 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -1,14 +1,11 @@ { - /* GENERAL */ "LOADING": "A carregar …", - /* CALENDAR */ "TODAY": "Hoje", "TOMORROW": "Amanhã", "RUNNING": "Termina em", "EMPTY": "Sem eventos a chegar.", - /* WEATHER */ "N": "N", "NNE": "NNE", "NE": "NE", diff --git a/translations/pt_br.json b/translations/pt_br.json index 17d3e636..92002b54 100644 --- a/translations/pt_br.json +++ b/translations/pt_br.json @@ -1,14 +1,11 @@ { - /* GENERAL */ "LOADING": "Carregando …", - /* CALENDAR */ "TODAY": "Hoje", "TOMORROW": "Amanhã", "RUNNING": "Acaba em", "EMPTY": "Nenhum evento novo.", - /* WEATHER */ "N": "N", "NNE": "NNE", "NE": "NE", diff --git a/translations/ru.json b/translations/ru.json index 053385ee..48c49fd9 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -1,15 +1,12 @@ { - /* GENERAL */ "LOADING": "Загрузка …", - /* CALENDAR */ "TODAY": "Сегодня", "TOMORROW": "Завтра", "DAYAFTERTOMORROW": "Послезавтра", "RUNNING": "Заканчивается через", "EMPTY": "Нет предстоящих событий", - /* WEATHER */ "N": "С", "NNE": "ССВ", "NE": "СВ", @@ -27,7 +24,6 @@ "NW": "СЗ", "NNW": "ССЗ", - /* UPDATE INFO */ "UPDATE_NOTIFICATION": "Есть обновление для MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "Есть обновление для MODULE_NAME модуля.", "UPDATE_INFO": "Данная инсталляция позади BRANCH_NAME ветки на COMMIT_COUNT коммитов." diff --git a/translations/sv.json b/translations/sv.json index 8a1440f0..1fe3d48d 100644 --- a/translations/sv.json +++ b/translations/sv.json @@ -1,15 +1,12 @@ { - /* GENERAL */ "LOADING": "Laddar …", - /* CALENDAR */ "TODAY": "Idag", "TOMORROW": "Imorgon", "DAYAFTERTOMORROW": "Iövermorgon", "RUNNING": "Slutar", "EMPTY": "Inga kommande händelser.", - /* WEATHER */ "N": "N", "NNE": "NNO", "NE": "NO", @@ -27,7 +24,6 @@ "NW": "NV", "NNW": "NNV", - /* UPDATE INFO */ "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." diff --git a/translations/tr.json b/translations/tr.json index a0d61ac7..c79956b8 100644 --- a/translations/tr.json +++ b/translations/tr.json @@ -1,14 +1,11 @@ { - /* GENERAL */ "LOADING": "Yükleniyor …", - /* CALENDAR */ "TODAY": "Bugün", "TOMORROW": "Yarın", "RUNNING": "Biten", "EMPTY": "Yakında etkinlik yok.", - /* WEATHER */ "N": "K", "NNE": "KKD", "NE": "KD", diff --git a/translations/zh_cn.json b/translations/zh_cn.json index a8c32d70..e7f69616 100644 --- a/translations/zh_cn.json +++ b/translations/zh_cn.json @@ -1,14 +1,11 @@ { - /* GENERAL */ "LOADING": "正在加载 …", - /* CALENDAR */ "TODAY": "今天", "TOMORROW": "明天", "RUNNING": "结束日期", "EMPTY": "没有更多的活动。", - /* WEATHER */ "N": "北风", "NNE": "北偏东风", "NE": "东北风", diff --git a/translations/zh_tw.json b/translations/zh_tw.json index 1a5827be..550de453 100644 --- a/translations/zh_tw.json +++ b/translations/zh_tw.json @@ -1,14 +1,11 @@ { - /* GENERAL */ "LOADING": "正在加載 …", - /* CALENDAR */ "TODAY": "今天", "TOMORROW": "明天", "RUNNING": "結束日期", "EMPTY": "沒有更多的活動。", - /* WEATHER */ "N": "北風", "NNE": "北偏東風", "NE": "東北風",