From 6b47fde866500b8ec461ffa91b666a7cac1c403e Mon Sep 17 00:00:00 2001 From: Jeeva Kandasamy Date: Fri, 10 Nov 2017 08:13:27 +0530 Subject: [PATCH] update #420, show location name on sunrise widget --- .../adf-myc-sunrisetime/adf-myc-sunrise.js | 1 + .../adf-widgets/adf-myc-sunrisetime/view.html | 2 +- .../mc_locale/mc_locale_java-source_en.properties | 3 ++- .../mc_locale/mc_locale_java_ca_ES.properties | 1 + .../mc_locale/mc_locale_java_cs_CZ.properties | 1 + .../mc_locale/mc_locale_java_da_DK.properties | 1 + .../mc_locale/mc_locale_java_de_DE.properties | 1 + .../mc_locale/mc_locale_java_el_GR.properties | 1 + .../mc_locale/mc_locale_java_en_US.properties | 1 + .../mc_locale/mc_locale_java_es_AR.properties | 1 + .../mc_locale/mc_locale_java_es_ES.properties | 1 + .../mc_locale/mc_locale_java_fr_FR.properties | 1 + .../mc_locale/mc_locale_java_he_IL.properties | 1 + .../mc_locale/mc_locale_java_hu_HU.properties | 1 + .../mc_locale/mc_locale_java_it_IT.properties | 1 + .../mc_locale/mc_locale_java_mk_MK.properties | 1 + .../mc_locale/mc_locale_java_nl_NL.properties | 1 + .../mc_locale/mc_locale_java_no_NO.properties | 1 + .../mc_locale/mc_locale_java_pt_BR.properties | 1 + .../mc_locale/mc_locale_java_ro_RO.properties | 1 + .../mc_locale/mc_locale_java_ru_RU.properties | 11 ++++++----- .../mc_locale/mc_locale_java_sk_SK.properties | 1 + .../mc_locale/mc_locale_java_ta_IN.properties | 1 + .../mc_locale/mc_locale_java_zh_CN.properties | 1 + 24 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dist/src/main/package/www/controllers/adf-widgets/adf-myc-sunrisetime/adf-myc-sunrise.js b/dist/src/main/package/www/controllers/adf-widgets/adf-myc-sunrisetime/adf-myc-sunrise.js index 8b511a60..57226437 100644 --- a/dist/src/main/package/www/controllers/adf-widgets/adf-myc-sunrisetime/adf-myc-sunrise.js +++ b/dist/src/main/package/www/controllers/adf-widgets/adf-myc-sunrisetime/adf-myc-sunrise.js @@ -53,6 +53,7 @@ angular.module('adf.widget.myc-sunrisetime', []) mycSunriseTime.sunsetTime = $filter('date')(response.sunsetTime, mchelper.cfg.timeFormatWithoutSeconds, mchelper.cfg.timezone); mycSunriseTime.latitude = response.latitude; mycSunriseTime.longitude = response.longitude; + mycSunriseTime.name = response.name; mycSunriseTime.isSyncing = false; if(mycSunriseTime.showLoading){ mycSunriseTime.showLoading = false; diff --git a/dist/src/main/package/www/controllers/adf-widgets/adf-myc-sunrisetime/view.html b/dist/src/main/package/www/controllers/adf-widgets/adf-myc-sunrisetime/view.html index 33201c1f..20a3d9db 100644 --- a/dist/src/main/package/www/controllers/adf-widgets/adf-myc-sunrisetime/view.html +++ b/dist/src/main/package/www/controllers/adf-widgets/adf-myc-sunrisetime/view.html @@ -23,6 +23,6 @@
{{mycSunriseTime.sunriseTime}}{{mycSunriseTime.sunsetTime}}
-
{{mycSunriseTime.latitude}}, {{mycSunriseTime.longitude}}
+
{{mycSunriseTime.name}}
diff --git a/dist/src/main/resources/mc_locale/mc_locale_java-source_en.properties b/dist/src/main/resources/mc_locale/mc_locale_java-source_en.properties index 8e1dcc43..7f1a387d 100644 --- a/dist/src/main/resources/mc_locale/mc_locale_java-source_en.properties +++ b/dist/src/main/resources/mc_locale/mc_locale_java-source_en.properties @@ -61,6 +61,7 @@ MQTT=MQTT NEW=New NORMAL=Normal PHANT_IO=Sparkfun [phant.io] +PHILIPS_HUE=Philips Hue PI4J=pi4j REGISTERED=Registered S_AIR_QUALITY=Air quality @@ -178,4 +179,4 @@ V_VOLUME=Volume V_WATT=Watt V_WEIGHT=Weight V_WIND=Wind -WUNDERGROUND=Weather Underground \ No newline at end of file +WUNDERGROUND=Weather Underground diff --git a/dist/src/main/resources/mc_locale/mc_locale_java_ca_ES.properties b/dist/src/main/resources/mc_locale/mc_locale_java_ca_ES.properties index b90ffd97..5f1325aa 100644 --- a/dist/src/main/resources/mc_locale/mc_locale_java_ca_ES.properties +++ b/dist/src/main/resources/mc_locale/mc_locale_java_ca_ES.properties @@ -61,6 +61,7 @@ MQTT=MQTT NEW=New NORMAL=Normal PHANT_IO=Sparkfun [phant.io] +PHILIPS_HUE=Philips Hue PI4J=pi4j REGISTERED=Registered S_AIR_QUALITY=Air quality diff --git a/dist/src/main/resources/mc_locale/mc_locale_java_cs_CZ.properties b/dist/src/main/resources/mc_locale/mc_locale_java_cs_CZ.properties index 146a47c1..ab6b1727 100644 --- a/dist/src/main/resources/mc_locale/mc_locale_java_cs_CZ.properties +++ b/dist/src/main/resources/mc_locale/mc_locale_java_cs_CZ.properties @@ -61,6 +61,7 @@ MQTT=MQTT NEW=Nový NORMAL=Normální PHANT_IO=Sparkfun [phant.io] +PHILIPS_HUE=Philips Hue PI4J=pi4j REGISTERED=Registrován S_AIR_QUALITY=Kvalita vzduchu diff --git a/dist/src/main/resources/mc_locale/mc_locale_java_da_DK.properties b/dist/src/main/resources/mc_locale/mc_locale_java_da_DK.properties index 8cbea5a8..9ce5947b 100644 --- a/dist/src/main/resources/mc_locale/mc_locale_java_da_DK.properties +++ b/dist/src/main/resources/mc_locale/mc_locale_java_da_DK.properties @@ -61,6 +61,7 @@ MQTT=MQTT NEW=Ny NORMAL=Normal PHANT_IO=Sparkfun [phant.io] +PHILIPS_HUE=Philips Hue PI4J=pi4j REGISTERED=Registreret S_AIR_QUALITY=Luftkvalitet diff --git a/dist/src/main/resources/mc_locale/mc_locale_java_de_DE.properties b/dist/src/main/resources/mc_locale/mc_locale_java_de_DE.properties index e32591f3..95461752 100644 --- a/dist/src/main/resources/mc_locale/mc_locale_java_de_DE.properties +++ b/dist/src/main/resources/mc_locale/mc_locale_java_de_DE.properties @@ -61,6 +61,7 @@ MQTT=MQTT NEW=Neu NORMAL=Normal PHANT_IO=Sparkfun [phant.io] +PHILIPS_HUE=Philips Hue PI4J=pi4j REGISTERED=Registriert S_AIR_QUALITY=Luftqualität diff --git a/dist/src/main/resources/mc_locale/mc_locale_java_el_GR.properties b/dist/src/main/resources/mc_locale/mc_locale_java_el_GR.properties index a35915ee..7f1a387d 100644 --- a/dist/src/main/resources/mc_locale/mc_locale_java_el_GR.properties +++ b/dist/src/main/resources/mc_locale/mc_locale_java_el_GR.properties @@ -61,6 +61,7 @@ MQTT=MQTT NEW=New NORMAL=Normal PHANT_IO=Sparkfun [phant.io] +PHILIPS_HUE=Philips Hue PI4J=pi4j REGISTERED=Registered S_AIR_QUALITY=Air quality diff --git a/dist/src/main/resources/mc_locale/mc_locale_java_en_US.properties b/dist/src/main/resources/mc_locale/mc_locale_java_en_US.properties index bfa04c5d..a49ccbab 100644 --- a/dist/src/main/resources/mc_locale/mc_locale_java_en_US.properties +++ b/dist/src/main/resources/mc_locale/mc_locale_java_en_US.properties @@ -61,6 +61,7 @@ MQTT=MQTT NEW=New NORMAL=Normal PHANT_IO=Sparkfun [phant.io] +PHILIPS_HUE=Philips Hue PI4J=pi4j REGISTERED=Registered S_AIR_QUALITY=Air quality diff --git a/dist/src/main/resources/mc_locale/mc_locale_java_es_AR.properties b/dist/src/main/resources/mc_locale/mc_locale_java_es_AR.properties index a35915ee..7f1a387d 100644 --- a/dist/src/main/resources/mc_locale/mc_locale_java_es_AR.properties +++ b/dist/src/main/resources/mc_locale/mc_locale_java_es_AR.properties @@ -61,6 +61,7 @@ MQTT=MQTT NEW=New NORMAL=Normal PHANT_IO=Sparkfun [phant.io] +PHILIPS_HUE=Philips Hue PI4J=pi4j REGISTERED=Registered S_AIR_QUALITY=Air quality diff --git a/dist/src/main/resources/mc_locale/mc_locale_java_es_ES.properties b/dist/src/main/resources/mc_locale/mc_locale_java_es_ES.properties index cd7911c6..6601946d 100644 --- a/dist/src/main/resources/mc_locale/mc_locale_java_es_ES.properties +++ b/dist/src/main/resources/mc_locale/mc_locale_java_es_ES.properties @@ -61,6 +61,7 @@ MQTT=MQTT NEW=New NORMAL=Normal PHANT_IO=Sparkfun [phant.io] +PHILIPS_HUE=Philips Hue PI4J=pi4j REGISTERED=Registered S_AIR_QUALITY=Calidad del aire diff --git a/dist/src/main/resources/mc_locale/mc_locale_java_fr_FR.properties b/dist/src/main/resources/mc_locale/mc_locale_java_fr_FR.properties index ff9804ed..5ee2bdcf 100644 --- a/dist/src/main/resources/mc_locale/mc_locale_java_fr_FR.properties +++ b/dist/src/main/resources/mc_locale/mc_locale_java_fr_FR.properties @@ -61,6 +61,7 @@ MQTT=MQTT NEW=Nouveau NORMAL=Normal PHANT_IO=Sparkfun [phant.io] +PHILIPS_HUE=Philips Hue PI4J=pi4j REGISTERED=Inscrit S_AIR_QUALITY=Qualité d'air diff --git a/dist/src/main/resources/mc_locale/mc_locale_java_he_IL.properties b/dist/src/main/resources/mc_locale/mc_locale_java_he_IL.properties index 4e7114c0..8ca57843 100644 --- a/dist/src/main/resources/mc_locale/mc_locale_java_he_IL.properties +++ b/dist/src/main/resources/mc_locale/mc_locale_java_he_IL.properties @@ -61,6 +61,7 @@ MQTT=MQTT NEW=\u05d7\u05d3\u05e9 NORMAL=\u05e0\u05d5\u05e8\u05de\u05dc\u05d9 PHANT_IO=Sparkfun [phant. io] +PHILIPS_HUE=Philips Hue PI4J=pi4J REGISTERED=\u05e8\u05e9\u05d5\u05dd S_AIR_QUALITY=\u05d0\u05d9\u05db\u05d5\u05ea \u05d0\u05d5\u05d5\u05d9\u05e8 diff --git a/dist/src/main/resources/mc_locale/mc_locale_java_hu_HU.properties b/dist/src/main/resources/mc_locale/mc_locale_java_hu_HU.properties index f90d6623..ca41c3fc 100644 --- a/dist/src/main/resources/mc_locale/mc_locale_java_hu_HU.properties +++ b/dist/src/main/resources/mc_locale/mc_locale_java_hu_HU.properties @@ -61,6 +61,7 @@ MQTT=MQTT NEW=Új NORMAL=Normál PHANT_IO=Sparkfun [phant.io] +PHILIPS_HUE=Philips Hue PI4J=pi4j REGISTERED=Regisztrált S_AIR_QUALITY=Leveg\u0151 min\u0151ség diff --git a/dist/src/main/resources/mc_locale/mc_locale_java_it_IT.properties b/dist/src/main/resources/mc_locale/mc_locale_java_it_IT.properties index c96d0950..b24e2571 100644 --- a/dist/src/main/resources/mc_locale/mc_locale_java_it_IT.properties +++ b/dist/src/main/resources/mc_locale/mc_locale_java_it_IT.properties @@ -61,6 +61,7 @@ MQTT=MQTT NEW=Nuovo NORMAL=Normale PHANT_IO=Sparkfun [phant.io] +PHILIPS_HUE=Philips Hue PI4J=pi4j REGISTERED=Registrato S_AIR_QUALITY=Qualità dell'aria diff --git a/dist/src/main/resources/mc_locale/mc_locale_java_mk_MK.properties b/dist/src/main/resources/mc_locale/mc_locale_java_mk_MK.properties index c8a23bdd..6ccd736e 100644 --- a/dist/src/main/resources/mc_locale/mc_locale_java_mk_MK.properties +++ b/dist/src/main/resources/mc_locale/mc_locale_java_mk_MK.properties @@ -61,6 +61,7 @@ MQTT=MQTT NEW=New NORMAL=\u041d\u043e\u0440\u043c\u0430\u043b\u043d\u043e PHANT_IO=Sparkfun [phant.io] +PHILIPS_HUE=Philips Hue PI4J=pi4j REGISTERED=Registered S_AIR_QUALITY=\u041a\u0432\u0430\u043b\u0438\u0442\u0435\u0442 \u043d\u0430 \u0432\u043e\u0437\u0434\u0443\u0445\u043e\u0442 diff --git a/dist/src/main/resources/mc_locale/mc_locale_java_nl_NL.properties b/dist/src/main/resources/mc_locale/mc_locale_java_nl_NL.properties index 64e683ae..fed02e01 100644 --- a/dist/src/main/resources/mc_locale/mc_locale_java_nl_NL.properties +++ b/dist/src/main/resources/mc_locale/mc_locale_java_nl_NL.properties @@ -61,6 +61,7 @@ MQTT=MQTT NEW=Nieuw NORMAL=Normaal PHANT_IO=Sparkfun [phant.io] +PHILIPS_HUE=Philips Hue PI4J=pi4j REGISTERED=Geregistreerd S_AIR_QUALITY=Lucht kwaliteit diff --git a/dist/src/main/resources/mc_locale/mc_locale_java_no_NO.properties b/dist/src/main/resources/mc_locale/mc_locale_java_no_NO.properties index f573a26e..2185d876 100644 --- a/dist/src/main/resources/mc_locale/mc_locale_java_no_NO.properties +++ b/dist/src/main/resources/mc_locale/mc_locale_java_no_NO.properties @@ -61,6 +61,7 @@ MQTT=MQTT NEW=Ny NORMAL=Normal PHANT_IO=Sparkfun [phant.io] +PHILIPS_HUE=Philips Hue PI4J=pi4j REGISTERED=Registrert S_AIR_QUALITY=Luftkvalitet diff --git a/dist/src/main/resources/mc_locale/mc_locale_java_pt_BR.properties b/dist/src/main/resources/mc_locale/mc_locale_java_pt_BR.properties index 41891a31..5d36c189 100644 --- a/dist/src/main/resources/mc_locale/mc_locale_java_pt_BR.properties +++ b/dist/src/main/resources/mc_locale/mc_locale_java_pt_BR.properties @@ -61,6 +61,7 @@ MQTT=MQTT NEW=New NORMAL=Normal PHANT_IO=Sparkfun [phant.io] +PHILIPS_HUE=Philips Hue PI4J=pi4j REGISTERED=Registered S_AIR_QUALITY=Qualidade do ar diff --git a/dist/src/main/resources/mc_locale/mc_locale_java_ro_RO.properties b/dist/src/main/resources/mc_locale/mc_locale_java_ro_RO.properties index 946ff68d..c1c6d2fb 100644 --- a/dist/src/main/resources/mc_locale/mc_locale_java_ro_RO.properties +++ b/dist/src/main/resources/mc_locale/mc_locale_java_ro_RO.properties @@ -61,6 +61,7 @@ MQTT=MQTT NEW=New NORMAL=Normal PHANT_IO=Sparkfun [phant.io] +PHILIPS_HUE=Philips Hue PI4J=pi4j REGISTERED=Registered S_AIR_QUALITY=Calitatea aerului diff --git a/dist/src/main/resources/mc_locale/mc_locale_java_ru_RU.properties b/dist/src/main/resources/mc_locale/mc_locale_java_ru_RU.properties index d9bce688..b985b52a 100644 --- a/dist/src/main/resources/mc_locale/mc_locale_java_ru_RU.properties +++ b/dist/src/main/resources/mc_locale/mc_locale_java_ru_RU.properties @@ -37,8 +37,8 @@ I_LOCKED=\u0417\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043 I_LOG_MESSAGE=\u0421\u0438\u0441\u0442\u0435\u043c\u043d\u043e\u0435 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435 I_PING=\u041f\u0438\u043d\u0433 I_PONG=\u041f\u043e\u043d\u0433 -I_POST_SLEEP_NOTIFICATION=Post sleep notification -I_PRE_SLEEP_NOTIFICATION=Pre sleep notification +I_POST_SLEEP_NOTIFICATION=\u0421\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435 \u043e \u043d\u0430\u0447\u0430\u043b\u0435 \u0441\u043d\u0430 +I_PRE_SLEEP_NOTIFICATION=\u0423\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435 \u043f\u0435\u0440\u0435\u0434 \u0441\u043d\u043e\u043c I_PRESENTATION=\u041f\u0440\u0435\u0437\u0435\u043d\u0442\u0430\u0446\u0438\u044f I_PROPERTIES=\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 I_REBOOT=\u041f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0430 @@ -46,9 +46,9 @@ I_REGISTRATION_REQUEST=\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0 I_REGISTRATION_RESPONSE=\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f \u043e\u0442\u0432\u0435\u0442\u0430 I_REQUEST_SIGNING=\u0417\u0430\u043f\u0440\u043e\u0441 \u0441 \u043f\u043e\u0434\u043f\u0438\u0441\u044c\u044e I_RSSI=RSSI -I_SIGNAL_REPORT_REQUEST=Signal report request -I_SIGNAL_REPORT_RESPONSE=Signal report response -I_SIGNAL_REPORT_REVERSE=Signal report reverse +I_SIGNAL_REPORT_REQUEST=\u0417\u0430\u043f\u0440\u043e\u0441 \u043e\u0442\u0447\u0435\u0442\u0430 \u043e \u0441\u0438\u0433\u043d\u0430\u043b\u0435 +I_SIGNAL_REPORT_RESPONSE=\u041e\u0442\u0432\u0435\u0442 \u043e\u0442\u0447\u0435\u0442\u0430 \u043e \u0441\u0438\u0433\u043d\u0430\u043b\u0435 +I_SIGNAL_REPORT_REVERSE=\u041e\u0442\u0447\u0435\u0442 \u043e\u0431 \u043e\u0431\u0440\u0430\u0442\u043d\u043e\u043c \u043d\u0430\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0438 I_SKETCH_NAME=\u0438\u043c\u044f Sketch I_SKETCH_VERSION=\u0432\u0435\u0440\u0441\u0438\u044f Sketch I_TIME=\u0412\u0440\u0435\u043c\u044f @@ -61,6 +61,7 @@ MQTT=MQTT NEW=\u041d\u043e\u0432\u044b\u0439 NORMAL=\u041d\u043e\u0440\u043c\u0430\u043b\u044c\u043d\u044b\u0439 PHANT_IO=Sparkfun [phant.io] +PHILIPS_HUE=Philips Hue PI4J=pi4j REGISTERED=\u0417\u0430\u0440\u0435\u0433\u0435\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439 S_AIR_QUALITY=\u041a\u0430\u0447\u0435\u0441\u0442\u0432\u043e \u0432\u043e\u0437\u0434\u0443\u0445\u0430 diff --git a/dist/src/main/resources/mc_locale/mc_locale_java_sk_SK.properties b/dist/src/main/resources/mc_locale/mc_locale_java_sk_SK.properties index a35915ee..7f1a387d 100644 --- a/dist/src/main/resources/mc_locale/mc_locale_java_sk_SK.properties +++ b/dist/src/main/resources/mc_locale/mc_locale_java_sk_SK.properties @@ -61,6 +61,7 @@ MQTT=MQTT NEW=New NORMAL=Normal PHANT_IO=Sparkfun [phant.io] +PHILIPS_HUE=Philips Hue PI4J=pi4j REGISTERED=Registered S_AIR_QUALITY=Air quality diff --git a/dist/src/main/resources/mc_locale/mc_locale_java_ta_IN.properties b/dist/src/main/resources/mc_locale/mc_locale_java_ta_IN.properties index 632a9f8a..27bcd667 100644 --- a/dist/src/main/resources/mc_locale/mc_locale_java_ta_IN.properties +++ b/dist/src/main/resources/mc_locale/mc_locale_java_ta_IN.properties @@ -61,6 +61,7 @@ MQTT=MQTT NEW=New NORMAL=Normal PHANT_IO=Sparkfun [phant.io] +PHILIPS_HUE=Philips Hue PI4J=pi4j REGISTERED=Registered S_AIR_QUALITY=\u0b95\u0bbe\u0bb1\u0bcd\u0bb1\u0bbf\u0ba9\u0bcd \u0ba4\u0bb0\u0bae\u0bcd diff --git a/dist/src/main/resources/mc_locale/mc_locale_java_zh_CN.properties b/dist/src/main/resources/mc_locale/mc_locale_java_zh_CN.properties index 1154d47b..8d3d1b35 100644 --- a/dist/src/main/resources/mc_locale/mc_locale_java_zh_CN.properties +++ b/dist/src/main/resources/mc_locale/mc_locale_java_zh_CN.properties @@ -61,6 +61,7 @@ MQTT=MQTT NEW=\u65b0\u589e NORMAL=\u6b63\u5e38 PHANT_IO=Sparkfun [phant.io] +PHILIPS_HUE=Philips Hue PI4J=pi4j REGISTERED=\u5df2\u6ce8\u518c S_AIR_QUALITY=\u7a7a\u6c14\u8d28\u91cf