diff --git a/resources-ces/strings/strings.xml b/resources-ces/strings/strings.xml index f2e19c7b..a32f18c1 100644 --- a/resources-ces/strings/strings.xml +++ b/resources-ces/strings/strings.xml @@ -1,5 +1,6 @@ + Crystal App Version @@ -15,6 +16,7 @@ Move Bar Style Hide Seconds Hide Hours Leading Zero + OpenWeatherMap API Key Override Number Of Data Fields Data Field 1 diff --git a/resources-dan/strings/strings.xml b/resources-dan/strings/strings.xml index fad0c3ec..25596ac4 100644 --- a/resources-dan/strings/strings.xml +++ b/resources-dan/strings/strings.xml @@ -1,5 +1,6 @@ + Crystal App Version @@ -15,6 +16,7 @@ Move Bar Style Hide Seconds Hide Hours Leading Zero + OpenWeatherMap API Key Override Number Of Data Fields Data Field 1 diff --git a/resources-deu/strings/strings.xml b/resources-deu/strings/strings.xml index c77cc033..fc22c229 100644 --- a/resources-deu/strings/strings.xml +++ b/resources-deu/strings/strings.xml @@ -15,6 +15,7 @@ Move Bar Style Sekunden ausblenden Führende Nullen ausblenden + OpenWeatherMap API Key Override Anzahl der Datenfelder Datenfeld 1 diff --git a/resources-dut/strings/strings.xml b/resources-dut/strings/strings.xml index 0ddbd381..c0d17187 100644 --- a/resources-dut/strings/strings.xml +++ b/resources-dut/strings/strings.xml @@ -1,5 +1,6 @@ + Crystal App Versie @@ -15,6 +16,7 @@ Beweeg Balk Stijl Verberg Seconden Verberg Eerste Nul Bij Uuren + OpenWeatherMap API Key Override Hoeveelheid Datavelden Data Veld 1 diff --git a/resources-fin/strings/strings.xml b/resources-fin/strings/strings.xml index 9884f1f7..8be0eaf1 100644 --- a/resources-fin/strings/strings.xml +++ b/resources-fin/strings/strings.xml @@ -1,5 +1,6 @@ + Crystal App Version @@ -15,6 +16,7 @@ Move Bar Style Hide Seconds Hide Hours Leading Zero + OpenWeatherMap API Key Override Number Of Data Fields Data Field 1 diff --git a/resources-fre/strings/strings.xml b/resources-fre/strings/strings.xml index 87dab35c..86a4c4cb 100644 --- a/resources-fre/strings/strings.xml +++ b/resources-fre/strings/strings.xml @@ -1,5 +1,6 @@ + Crystal App Version @@ -15,6 +16,7 @@ Move Bar Style Hide Seconds Hide Hours Leading Zero + OpenWeatherMap API Key Override Number Of Data Fields Data Field 1 diff --git a/resources-hrv/strings/strings.xml b/resources-hrv/strings/strings.xml index bb0c04ae..c276bbdd 100644 --- a/resources-hrv/strings/strings.xml +++ b/resources-hrv/strings/strings.xml @@ -1,5 +1,6 @@ + Crystal App Version @@ -15,6 +16,7 @@ Move Bar Style Hide Seconds Hide Hours Leading Zero + OpenWeatherMap API Key Override Number Of Data Fields Data Field 1 diff --git a/resources-hun/strings/strings.xml b/resources-hun/strings/strings.xml index a6feb09f..ea52a8c5 100644 --- a/resources-hun/strings/strings.xml +++ b/resources-hun/strings/strings.xml @@ -1,5 +1,6 @@ + Crystal App Version @@ -15,6 +16,7 @@ Move Bar Style Hide Seconds Hide Hours Leading Zero + OpenWeatherMap API Key Override Number Of Data Fields Data Field 1 diff --git a/resources-ita/strings/strings.xml b/resources-ita/strings/strings.xml index dc60dc43..fe6c592f 100644 --- a/resources-ita/strings/strings.xml +++ b/resources-ita/strings/strings.xml @@ -1,5 +1,6 @@ + Crystal App Version @@ -15,6 +16,7 @@ Move Bar Style Hide Seconds Hide Hours Leading Zero + OpenWeatherMap API Key Override Number Of Data Fields Data Field 1 diff --git a/resources-kor/strings/strings.xml b/resources-kor/strings/strings.xml index e83f9713..cc6715cf 100644 --- a/resources-kor/strings/strings.xml +++ b/resources-kor/strings/strings.xml @@ -1,5 +1,6 @@ + Crystal App Version @@ -15,6 +16,7 @@ Move Bar Style Hide Seconds Hide Hours Leading Zero + OpenWeatherMap API Key Override Number Of Data Fields Data Field 1 diff --git a/resources-nob/strings/strings.xml b/resources-nob/strings/strings.xml index b617a6f6..edb90006 100644 --- a/resources-nob/strings/strings.xml +++ b/resources-nob/strings/strings.xml @@ -1,5 +1,6 @@ + Crystal App Version @@ -15,6 +16,7 @@ Move Bar Style Hide Seconds Hide Hours Leading Zero + OpenWeatherMap API Key Override Number Of Data Fields Data Field 1 diff --git a/resources-pol/strings/strings.xml b/resources-pol/strings/strings.xml index 047e812b..ed28931d 100644 --- a/resources-pol/strings/strings.xml +++ b/resources-pol/strings/strings.xml @@ -15,6 +15,7 @@ Wygląd Move Bar'a Ukryj Sekundy Ukryj Zero Poprzedzające Godzinę + OpenWeatherMap API Key Override Liczba Pól z Danymi Pole Danych 1 diff --git a/resources-por/strings/strings.xml b/resources-por/strings/strings.xml index 09e0106d..d0e1a467 100644 --- a/resources-por/strings/strings.xml +++ b/resources-por/strings/strings.xml @@ -1,5 +1,6 @@ + Crystal App Version @@ -15,6 +16,7 @@ Move Bar Style Hide Seconds Hide Hours Leading Zero + OpenWeatherMap API Key Override Number Of Data Fields Data Field 1 diff --git a/resources-rus/strings/strings.xml b/resources-rus/strings/strings.xml index 82b84b80..d4722902 100644 --- a/resources-rus/strings/strings.xml +++ b/resources-rus/strings/strings.xml @@ -15,6 +15,7 @@ Вид полосы подвижности Скрывать секунды Скрывать нули перед часами + OpenWeatherMap API Key Override Количество полей данных Поле данных 1 diff --git a/resources-slo/strings/strings.xml b/resources-slo/strings/strings.xml index 5d49cb15..f00d62a9 100644 --- a/resources-slo/strings/strings.xml +++ b/resources-slo/strings/strings.xml @@ -1,5 +1,6 @@ + Crystal App Version @@ -15,6 +16,7 @@ Move Bar Style Hide Seconds Hide Hours Leading Zero + OpenWeatherMap API Key Override Number Of Data Fields Data Field 1 diff --git a/resources-slv/strings/strings.xml b/resources-slv/strings/strings.xml index 89d606f0..5bd646b7 100644 --- a/resources-slv/strings/strings.xml +++ b/resources-slv/strings/strings.xml @@ -1,5 +1,6 @@ + Crystal App Version @@ -15,6 +16,7 @@ Move Bar Style Hide Seconds Hide Hours Leading Zero + OpenWeatherMap API Key Override Number Of Data Fields Data Field 1 diff --git a/resources-spa/strings/strings.xml b/resources-spa/strings/strings.xml index c64bedc6..5bf5b9bc 100644 --- a/resources-spa/strings/strings.xml +++ b/resources-spa/strings/strings.xml @@ -1,5 +1,6 @@ + Crystal App Version @@ -15,6 +16,7 @@ Move Bar Style Hide Seconds Hide Hours Leading Zero + OpenWeatherMap API Key Override Number Of Data Fields Data Field 1 diff --git a/resources-swe/strings/strings.xml b/resources-swe/strings/strings.xml index a2fa1960..0f3b06a1 100644 --- a/resources-swe/strings/strings.xml +++ b/resources-swe/strings/strings.xml @@ -15,6 +15,7 @@ Rörelsemätarstil Dölj sekunder Dölj inledande nollor + OpenWeatherMap API Key Override Antal datafält Datafält 1 diff --git a/resources-zhs/strings/strings.xml b/resources-zhs/strings/strings.xml index a2d2ea05..0ccda644 100644 --- a/resources-zhs/strings/strings.xml +++ b/resources-zhs/strings/strings.xml @@ -1,5 +1,6 @@ + Crystal App Version @@ -15,6 +16,7 @@ Move Bar Style Hide Seconds Hide Hours Leading Zero + OpenWeatherMap API Key Override Number Of Data Fields Data Field 1 diff --git a/resources-zht/strings/strings.xml b/resources-zht/strings/strings.xml index 375c7cda..c0d9b744 100644 --- a/resources-zht/strings/strings.xml +++ b/resources-zht/strings/strings.xml @@ -1,5 +1,6 @@ + Crystal App Version @@ -15,6 +16,7 @@ Move Bar Style Hide Seconds Hide Hours Leading Zero + OpenWeatherMap API Key Override Number Of Data Fields Data Field 1 diff --git a/resources/settings/properties.xml b/resources/settings/properties.xml index 2477245e..a62c6854 100644 --- a/resources/settings/properties.xml +++ b/resources/settings/properties.xml @@ -30,4 +30,6 @@ false true + + diff --git a/resources/settings/settings.xml b/resources/settings/settings.xml index 3410e3fd..d1ad615a 100644 --- a/resources/settings/settings.xml +++ b/resources/settings/settings.xml @@ -199,4 +199,8 @@ + + + + diff --git a/resources/strings/strings.xml b/resources/strings/strings.xml index f9512d17..3f805380 100644 --- a/resources/strings/strings.xml +++ b/resources/strings/strings.xml @@ -15,6 +15,7 @@ Move Bar Style Hide Seconds Hide Hours Leading Zero + OpenWeatherMap API Key Override Number Of Data Fields Data Field 1 diff --git a/source/BackgroundService.mc b/source/BackgroundService.mc index a7198f76..17e30159 100644 --- a/source/BackgroundService.mc +++ b/source/BackgroundService.mc @@ -32,6 +32,7 @@ class BackgroundService extends Sys.ServiceDelegate { // 2. Weather. } else if (pendingWebRequests["OpenWeatherMapCurrent"] != null) { + var owmKeyOverride = App.getApp().getProperty("OWMKeyOverride"); makeWebRequest( "https://api.openweathermap.org/data/2.5/weather", { @@ -51,7 +52,7 @@ class BackgroundService extends Sys.ServiceDelegate { // If you intend to use this key in your own app, especially for the One Call API, please create your own // OWM account, and own key. You should be able to apply for the Open Source Plan to benefit from the same // lifted limits as Crystal. Thank you. - "appid" => "2651f49cb20de925fc57590709b86ce6", + "appid" => ((owmKeyOverride != null) && (owmKeyOverride.length() == 0)) ? "2651f49cb20de925fc57590709b86ce6" : owmKeyOverride, "units" => "metric" // Celcius. },