From 9fecff4c8c23e8f5a599a9caa2e1939b996b7b4d Mon Sep 17 00:00:00 2001
From: Ronald <zeilfanaat@hotmail.com>
Date: Wed, 20 Oct 2021 14:52:29 +0200
Subject: [PATCH 01/15] wrong temperature displayed Fixes #12

---
 weatherClock.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/weatherClock.py b/weatherClock.py
index d0c872f..d4d630e 100644
--- a/weatherClock.py
+++ b/weatherClock.py
@@ -587,7 +587,7 @@ def on_close():
                             y_shift = -5
                         if (temp_array[j] < 10):
                             x_shift = x_shift + 4
-                        bg_hourtext[i-1].goto(hour_x[i-1] + temperature_text_horz_spacing + x_shift - 20 + global_x_shift, hour_y[i-1] + temperature_text_vert_spacing + y_shift + global_y_shift)
+                        bg_hourtext[i-1].goto(hour_x[j] + temperature_text_horz_spacing + x_shift - 20 + global_x_shift, hour_y[j] + temperature_text_vert_spacing + y_shift + global_y_shift)
                         v = int(round(temp_array[j]))
                         v2 = int(round(temp_feel_array[j]))
                         bg_hourtext[i-1].write(str(round(temp_array[j])), align="left", font=("Verdana", temperature_text_font_size, "bold"))
@@ -598,12 +598,12 @@ def on_close():
                             kmh = " km/h"
                             if (wind_text_no_measure_text):
                                 kmh = ""
-                            bg_windtext[i-1].goto(hour_x[i-1] + temperature_text_horz_spacing +  x_shift + wind_text_right_shift + global_x_shift, hour_y[i-1] + temperature_text_vert_spacing + y_shift + global_y_shift)
+                            bg_windtext[i-1].goto(hour_x[j] + temperature_text_horz_spacing +  x_shift + wind_text_right_shift + global_x_shift, hour_y[j] + temperature_text_vert_spacing + y_shift + global_y_shift)
                             bg_windtext[i-1].write(str(wind_array[j]) + kmh, align="left", font=("Verdana", temperature_text_font_size, ""))
                         if (i in range(7,12)):
                             bg_windtext[i-1].clear()
                             bg_windtext[i-1].penup()
-                            bg_windtext[i-1].goto(hour_x[i-1] + temperature_text_horz_spacing +  x_shift - wind_text_left_shift + global_x_shift, hour_y[i-1] + temperature_text_vert_spacing + y_shift + global_y_shift)
+                            bg_windtext[i-1].goto(hour_x[j] + temperature_text_horz_spacing +  x_shift - wind_text_left_shift + global_x_shift, hour_y[j] + temperature_text_vert_spacing + y_shift + global_y_shift)
                             bg_windtext[i-1].write(str(wind_array[j]), align="right", font=("Verdana", temperature_text_font_size, ""))
                 temp_array_was[j] = temp_array[j]
                 temp_feel_array_was[j] = temp_feel_array[j]

From 85cb39dbfda32ea6fc4808f2a13d11d62f01ff00 Mon Sep 17 00:00:00 2001
From: Ronald <zeilfanaat@hotmail.com>
Date: Wed, 20 Oct 2021 14:59:04 +0200
Subject: [PATCH 02/15] VS Code

---
 .vscode/launch.json | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .vscode/launch.json

diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 0000000..564acd2
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,27 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        
+        {
+            "name": "Launch Program",
+            "program": "${workspaceFolder}/weatherClock.py",
+            "request": "launch",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "type": "pwa-node"
+        },
+        {
+            "type": "pwa-node",
+            "request": "launch",
+            "name": "Launch Program",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${file}"
+        }
+    ]
+}
\ No newline at end of file

From b166bc1aa17936846842db8e96e24e1a690aac4c Mon Sep 17 00:00:00 2001
From: vierlijner <68417202+vierlijner@users.noreply.github.com>
Date: Sun, 14 Nov 2021 10:19:53 +0100
Subject: [PATCH 03/15] Language

Translation added for en_US, en_GB, nl_NL and de_DE.
---
 locales/de_DE/LC_MESSAGES/messages.mo | Bin 0 -> 2729 bytes
 locales/de_DE/LC_MESSAGES/messages.po | 180 +++++++++++++++++++++++++
 locales/en_GB/LC_MESSAGES/messages.mo | Bin 0 -> 2591 bytes
 locales/en_GB/LC_MESSAGES/messages.po | 180 +++++++++++++++++++++++++
 locales/en_US/LC_MESSAGES/messages.mo | Bin 0 -> 2591 bytes
 locales/en_US/LC_MESSAGES/messages.po | 180 +++++++++++++++++++++++++
 locales/messages.pot                  | 168 +++++++++++++++++++++++
 locales/nl_NL/LC_MESSAGES/messages.mo | Bin 0 -> 2737 bytes
 locales/nl_NL/LC_MESSAGES/messages.po | 184 ++++++++++++++++++++++++++
 settings.json                         |   3 +-
 settings_320_240.json                 |   1 +
 weatherClock.py                       | 149 +++++++++++++++------
 12 files changed, 1000 insertions(+), 45 deletions(-)
 create mode 100644 locales/de_DE/LC_MESSAGES/messages.mo
 create mode 100644 locales/de_DE/LC_MESSAGES/messages.po
 create mode 100644 locales/en_GB/LC_MESSAGES/messages.mo
 create mode 100644 locales/en_GB/LC_MESSAGES/messages.po
 create mode 100644 locales/en_US/LC_MESSAGES/messages.mo
 create mode 100644 locales/en_US/LC_MESSAGES/messages.po
 create mode 100644 locales/messages.pot
 create mode 100644 locales/nl_NL/LC_MESSAGES/messages.mo
 create mode 100644 locales/nl_NL/LC_MESSAGES/messages.po

diff --git a/locales/de_DE/LC_MESSAGES/messages.mo b/locales/de_DE/LC_MESSAGES/messages.mo
new file mode 100644
index 0000000000000000000000000000000000000000..c5f7477f139c9600df27cedd3f24d93044871705
GIT binary patch
literal 2729
zcmcJQO>7%Q6vu~BC^et03X}?|Q=zIfu*NoD#U&L^yh)?RNfbMYP>5h+Kd-l0&sejw
zaZ^$WA*5coA&?LUgoHqxIC7u|q)JGL3ql}qph)G?8{$S!i2vJloTPl*u<ZTq?99G-
zU-S1b2lu`!@Hvj(qxe;C<I(mf+9Sjx7<R!k;AQY3@N4jP@EZ6acpc1ve}H?zJ(xTQ
z?gJkNkARPXCGbvg5j+a6fHm+Ecn|n3h_Cnwmpj0pLALiR$nV_%PlCUJhrz>`<oO~l
zZ0|Xc?JN$SH^KWb?tq8D{$T!X@P3Tn2RWY42IH>=^WTB&|26Pl@OSVP@Xx{gGMwXm
zI^dhgSppuz_$Hj30FUg$4^$vr6`LUE=?(BM@I4S;@gXkk*QX%Ia|L`F{1L=g?8oBc
z-~liMp9k5WkHEXZ&j;f#LC*g-Ap7+LSOTwuZ1>RqY~BM;V0;SXb+3U4Np!&jpanS}
zZ-H#@1MmUx6OiNi0%U)`A3VPSa(~<e+1^3C6o5xT_U|&talgaHa`}8-)>NqFv@tzd
zcgi}6XE|{qCg(yO#QF2F(I;d(j7VzZWZNXVm6r=KCS}ufyGplY6l#(^WmT6P**Gso
zM&yLw7(eS*<&3{1tCdDYj*N(^+7SMQkPXWvQm#XGJTlF-yqF-0V%S+Dan>YOOzCwM
zg)Q07R>`TVm{vMSR6w%X!5y`vGxGJqB{6LRIZf*nN%+hU!@;|-kWe{YQ=6^&WhrW5
zoce9xuCcOf>~6PbjI8v+bF?9YaGf-VNn1~lq+K~-0|};wVVC8yr#3xL^$^9zN?y$N
zTxfKhc`!FSC-8$4^T>C4;d|<0#OY8rNV=q5Ec;;;rKw&e-k_DepVsDYdCTWTgStJ@
zFiEq6lys0g8O9uQdLK*GA=MH)lP#7)-4e~jT5OlDf+HBl2&iW%PPe@9q}&kgVNtN6
zjbt@dJbWYFiuYNn)MaCKAuaYX(M_-fo~J2pmxVUca)Y&$QzC9!A}#wWMx9cRg@gNK
zl}jv2C6X8gF6RbS&w8V`u{*Ky#g`FfR;M#^dD)AQ^vDDe_rQu=uF`4}Y)<L6*<4aq
zZ~E36yRx|=wtERX^^pV__lWZ==BznSP3KLuyhZdcs#cbBmGN_xNnbAd^Yy9OncO_}
zjCEcu4#Ji<mISfaFlFi2DpS)hRjSo_zh2MH%{IJoi<X52uc{nEDiumauZV9+77FEO
zicb`Zg#s3O^RyoFPPeWr%2KIZcs5%%jf8s*t8^SGXKY!{s31~pgq7Pm4rSS*SF8ST
z>@`Sr%W{$|j^>W_b5UYd<V_gcMN8^lI*dn4r)73K`nZ<IMrHA2t~OQkxARcU7jol9
zJ2Z>e*ytf7M;F{vy$Dr3&1cc#Sd1pF?VZ|Q#~!!IdcJO&7P_`9PpyV7H%XdnO-SHI
zS&pey9NJR;g?urWNl_+1Ewb{gN_sACb|MPf^v{x{!)C|HfZ7lwKC7r)pZHd;8!gAE
zO`RydNDwYPJfk|5rWt?1XHD{FWMyp9pI?~39ptH@f?X#CeViK1i%IMPb51ODEKGtr
zxOydWA>?QYN{LXRQ1zZwIEE0Q^Z*8Q^<(&B9ru?rYbJ_l6&a8!Y0G42K*IuLw@tAN
zD5Ag(C2OIM-t=QkArD#->>5r^mpYapU2|KCn-}MJa-dzTjsfqqGbi=%Ka`A(t`F14
zONSZz7gZyi5EkEg?4((co3!&Dey1}~v|uoi-r_mRw2G?2y%szgs2)M+Etf7U>Xt8q
zR8(}EW8y^Z_|F(<UnU-6jO^7b9qS1HV%!i=L6=q`8*)=vmBhR1n<-&s%_W4=3|@qb
z<Cz%ZKL$3NYw#kK!>uO33KTTZCPvA4FFY7*%6iyO5D8i*^Cwlrm}|#5Mq|dfEvNM&
zndS(}NLq}AQ49SZ+U_j|Qi0Ec%(BN#j_!#s_Nlq{e`)2gsj(;jUjzi_STn<54gHU&
Fe*q6<1N8s^

literal 0
HcmV?d00001

diff --git a/locales/de_DE/LC_MESSAGES/messages.po b/locales/de_DE/LC_MESSAGES/messages.po
new file mode 100644
index 0000000..7974ca7
--- /dev/null
+++ b/locales/de_DE/LC_MESSAGES/messages.po
@@ -0,0 +1,180 @@
+# German language of WeatherClock.
+# Copyright (C) 2021 Eli's weatherClock
+# FIRST AUTHOR: Vierlijner/Naglafarn, 2021.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2021-11-12 00:41+0100\n"
+"PO-Revision-Date: 2021-11-11 22:05+0100\n"
+"Last-Translator: Naglafarn\n"
+"Language: de_DE\n"
+"Language-Team: German Naglafarn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.1\n"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:37
+msgid "Starting WeatherClock..."
+msgstr "Anfangen WeatherClock..."
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:42
+msgid "Remaining arguments will not be used: {0}"
+msgstr "Verbleibende Argumente werden nicht verwendet: {0}"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:44
+msgid "Options: {0}"
+msgstr "Optionen: {0}"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:67
+msgid "WeatherClock"
+msgstr "WeatherClock"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:94
+#: /home/pi/GitHub/weatherClock/weatherClock.py:177
+msgid "must be one of:"
+msgstr "muss einer von sein:"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:97
+#: /home/pi/GitHub/weatherClock/weatherClock.py:99
+#: /home/pi/GitHub/weatherClock/weatherClock.py:105
+msgid ""
+"usage:\n"
+"weatherClock.py [-a|--apikey] <YourApiKey> [[-l|--loglevel] "
+"[Debug|Info|Warn|Error]|]"
+msgstr ""
+"Verwendungszweck:\n"
+"weatherClock.py [-a|--apikey] <YourApiKey> [[-l|--loglevel] "
+"[Debug|Info|Warn|Error]|]"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:107
+msgid "Missing one or more parameters."
+msgstr "Es fehlen ein oder mehrere Parameter."
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:159
+msgid "'settings.json' file not found. Using command line parameters."
+msgstr "'settings.json' nicht gefunden. Verwenden von Befehlszeilenparametern."
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:163
+msgid ""
+"No ApiKey given. Use ApiKey in settings.json or use parameter: "
+"[-a|--apikey]."
+msgstr ""
+"Kein ApiKey angegeben. Verwenden Sie ApiKey in settings.json oder "
+"verwenden Sie parameter: [-a|--apikey]."
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:175
+msgid "Log Level set to invalid value: {0}"
+msgstr "Protokollebene auf ungültigen Wert festgelegt: {0}"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:182
+msgid "Language changed to {0}"
+msgstr "Sprache in {0} geändert"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:264
+msgid "cursor pressed: x, y"
+msgstr "Cursor gedrückt: x, y"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:278
+msgid "hour {0} WAS TOUCHED !"
+msgstr "Stunde {0} wurde berührt!"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:295
+msgid "Touched hour is {0} hours ahead"
+msgstr "Berührte Stunde ist {0} Stunden voraus"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:311
+msgid "Day"
+msgstr "Tag"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:323
+msgid "Hour"
+msgstr "Uhrzeit"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:331
+msgid "Temp"
+msgstr "Temperatur"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:339
+msgid "Feels like"
+msgstr "Gefuehlt"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:348
+msgid "POP"
+msgstr "Regenchance"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:356
+msgid "Rain"
+msgstr "Regenmenge"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:367
+msgid "Wind"
+msgstr "Wind"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:411
+msgid "current hour: "
+msgstr "Aktuelle Stunde: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:414
+msgid "forecast hour: "
+msgstr "Prognosestunde: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:416
+msgid "temperature: "
+msgstr "Temperatur: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:418
+msgid "feels like: "
+msgstr "Gefuehlt: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:420
+msgid "wind speed: "
+msgstr "Windgeschwindigkeit: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:423
+msgid "weather ID: "
+msgstr "Wetter-ID: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:425
+msgid "POP: "
+msgstr "Regenchance: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:429
+msgid "no rain data"
+msgstr "Keine Regendaten"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:432
+msgid "Rain: "
+msgstr "Regenmenge: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:465
+msgid "Invalid weather ID"
+msgstr "Ungültige Wetter-ID"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:579
+msgid ""
+"\n"
+"... Main Loop Start ...\n"
+msgstr ""
+"\n"
+"... Start der Hauptschleife ...\n"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:597
+msgid "** FETCHED NEW DATA **"
+msgstr "** NEUE DATEN ABGERUFEN **"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:664
+msgid "MODE: "
+msgstr "MODUS: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:669
+msgid "screen was touched"
+msgstr "Bildschirm wurde berührt"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:676
+msgid "Exiting WeatherClock."
+msgstr "WeatherClock beenden."
+
diff --git a/locales/en_GB/LC_MESSAGES/messages.mo b/locales/en_GB/LC_MESSAGES/messages.mo
new file mode 100644
index 0000000000000000000000000000000000000000..7c293c064767c2fb126c746133d237763ee52878
GIT binary patch
literal 2591
zcmeH|&u<$=6vv0sQZN)y#E*iIcu|E)1G}{is?sf~aBL^BV#ikOCPE=X6MJlLvYuJZ
z?j|u!1qV<i#DxO~az_IG1%$+jOD`Ni;y@8_;fA;&E{N}2yGcVOgt#CfEbo4H_RYL`
z?>jSZzneJzzQFGpTu<RD-NmiLUvNx_C(s;#m%;1cW8fFy-QZ2|QSb*a1O5sg2amxx
z0iFaO2cHDbfO+s9a0PrCTnB65HShuO28h4-2DcO7w;=ob5#(_{f#<-V!PDSr7}=h~
zjs0B!+0V-OeH(lb?LPPjxHGoD3qFMQ2O#J3@wol@*#0HR@!tebfxm#Sg1?XLYY2|#
z>4W>wECE@khfj`lngZFc4<c0YCdfLy1+q^2AY6$LL7wLmkahYDJOh3Wa=yQToR_$F
zq!WQWuLjxgRgiUh17v@1gFNmXkac<wWSu?*?+3pE+28jd`w{nz#+?FLrwNdCngrQ?
z0c4$uAm`H@w>QW3*Flc|I><WhgRIj>WBUmt%YG&}>5S{TRFl4@sxcuoV`*c;yNoy+
zsW|p^FLE~{qt8;;4-{z=Q`aQA<I<G~MrxbEK<W+!zE%`UD+el8Hgd((6wQ@e#f5T-
zmddMCDzpkTH6==ND9XD&JEm17<G!-Rz_hnqF{e}z!OxZw3nsCmqPJz>cW7tSiz+2i
zmAaS6o}zXiPpU()p{v<zqH20nRof~c#LO@K@mP3Bl$Z9Y)k|fMM9q)VxDCQJmIlTi
z4SUH@A@mp3kb3^M(wwHc^#&px(S#i&FdwAt(V8Ro97l%8Vz};#dKmjgN23TD^@hNO
zAeNzbdgEs`K#S#&wwDZ)jw9OfgCLc9L-7Qi(fD+2?$FJ3MN17r(K1Q94@vsaj{Jyo
zPM;%^eI+~McCp2(uREfhSc~b>UI+xu2nmH&Md_5g&(lzJ4;BSIx)7@^qk|FYR6NgW
zp-HX!m2|Nu#UMc!M4n3A^@KKLd4qLiEJf6|N@?1W5!NY<Si}flSs5o5OC^#B3+!da
zt3KKr;qa)i^wKNHa<opDX>H93AbMbW0q=ozS}UoIq_<bmU9-0;t==nJYwY^ox;WfR
zm}v(hP!uZGS2V2IRPETQbet9JU#yx(jY4s;FkhyX@^Z6MU&<`2(Ae0iMLoac%qG3a
zX&H~owL+!(a-mdOE;pN*M!n?}Ew(H?I3*b)rF=G@b8`6SDVz0P%srRQWwYq$EURsw
zXZmx$7bttt%TJH`RUx?3vQkHZjE(hZ#aA})H?^{vTj#+erC*z$J!m^EB?pLXX}(%%
zF3_UchWv|4g{{6Hwfy#$iqGHXrV%7o2F{$Z18h|trp;(3e~CtqGtX+8oT1#gOs!HY
zAL^5HvzemNF*cFY8iq(UR=e@}Fu-bG;xlS-TxOEE>r5Z^<4n5BI%VB99qeY0rZ@aJ
zGp~>k<btq6k7nft4s+hU=;kv2m#F_pi5j2re^9B4f1^?zem-!Tv6YWhD*m9P74fet
T6^j31rE1<;skqSo>y_#cXym^=

literal 0
HcmV?d00001

diff --git a/locales/en_GB/LC_MESSAGES/messages.po b/locales/en_GB/LC_MESSAGES/messages.po
new file mode 100644
index 0000000..58c4ae8
--- /dev/null
+++ b/locales/en_GB/LC_MESSAGES/messages.po
@@ -0,0 +1,180 @@
+# English UK language of WeatherClock.
+# Copyright (C) 2021 Eli's weatherClock
+# FIRST AUTHOR: KeepThisTicket/Vierlijner, 2021.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2021-11-12 00:41+0100\n"
+"PO-Revision-Date: 2021-11-13 09:28+0100\n"
+"Last-Translator: Vierlijner\n"
+"Language: en_GB\n"
+"Language-Team: ENGLISH Kovin KeepThisTicket/Vierlijner\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.1\n"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:37
+msgid "Starting WeatherClock..."
+msgstr "Starting WeatherClock..."
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:42
+msgid "Remaining arguments will not be used: {0}"
+msgstr "Remaining arguments will not be used: {0}"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:44
+msgid "Options: {0}"
+msgstr "Options: {0}"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:67
+msgid "WeatherClock"
+msgstr "WeatherClock"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:94
+#: /home/pi/GitHub/weatherClock/weatherClock.py:177
+msgid "must be one of:"
+msgstr "must be one of:"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:97
+#: /home/pi/GitHub/weatherClock/weatherClock.py:99
+#: /home/pi/GitHub/weatherClock/weatherClock.py:105
+msgid ""
+"usage:\n"
+"weatherClock.py [-a|--apikey] <YourApiKey> [[-l|--loglevel] "
+"[Debug|Info|Warn|Error]|]"
+msgstr ""
+"usage:\n"
+"weatherClock.py [-a|--apikey] <YourApiKey> [[-l|--loglevel] "
+"[Debug|Info|Warn|Error]|]"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:107
+msgid "Missing one or more parameters."
+msgstr "Missing one or more parameters."
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:159
+msgid "'settings.json' file not found. Using command line parameters."
+msgstr "'settings.json' file not found. Using command line parameters."
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:163
+msgid ""
+"No ApiKey given. Use ApiKey in settings.json or use parameter: "
+"[-a|--apikey]."
+msgstr ""
+"No ApiKey given. Use ApiKey in settings.json or use parameter: "
+"[-a|--apikey]."
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:175
+msgid "Log Level set to invalid value: {0}"
+msgstr "Log Level set to invalid value: {0}"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:182
+msgid "Language changed to {0}"
+msgstr "Language changed to {0}"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:264
+msgid "cursor pressed: x, y"
+msgstr "cursor pressed: x, y"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:278
+msgid "hour {0} WAS TOUCHED !"
+msgstr "Hour {0} WAS TOUCHED !"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:295
+msgid "Touched hour is {0} hours ahead"
+msgstr "Touched hour is {0} hours ahead"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:311
+msgid "Day"
+msgstr "Day"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:323
+msgid "Hour"
+msgstr "Hour"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:331
+msgid "Temp"
+msgstr "Temperature"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:339
+msgid "Feels like"
+msgstr "Feels like"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:348
+msgid "POP"
+msgstr "POP"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:356
+msgid "Rain"
+msgstr "Rain"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:367
+msgid "Wind"
+msgstr "Wind"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:411
+msgid "current hour: "
+msgstr "Current hour: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:414
+msgid "forecast hour: "
+msgstr "Forecast hour: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:416
+msgid "temperature: "
+msgstr "Temperature: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:418
+msgid "feels like: "
+msgstr "Feels like: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:420
+msgid "wind speed: "
+msgstr "wind speed: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:423
+msgid "weather ID: "
+msgstr "weather ID: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:425
+msgid "POP: "
+msgstr "POP: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:429
+msgid "no rain data"
+msgstr "No rain data"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:432
+msgid "Rain: "
+msgstr "Rain: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:465
+msgid "Invalid weather ID"
+msgstr "Invalid weather ID"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:579
+msgid ""
+"\n"
+"... Main Loop Start ...\n"
+msgstr ""
+"\n"
+"... Main Loop Start ...\n"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:597
+msgid "** FETCHED NEW DATA **"
+msgstr "** FETCHED NEW DATA **"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:664
+msgid "MODE: "
+msgstr "MODE: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:669
+msgid "screen was touched"
+msgstr "Screen was touched"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:676
+msgid "Exiting WeatherClock."
+msgstr "Exiting WeatherClock."
+
diff --git a/locales/en_US/LC_MESSAGES/messages.mo b/locales/en_US/LC_MESSAGES/messages.mo
new file mode 100644
index 0000000000000000000000000000000000000000..724492c5e17553d0d19b76c6c0494f3b2f7f2faf
GIT binary patch
literal 2591
zcmeH|&u<$=6vv0sQZN)y#E*iIcu|E)1G}{is?sf~aBU~CV#ikOBtjuV6MJlLvYuJZ
z?j|u!1qV<i#DxO~az_IG1%$+jOD`Ni;y@8_;fA;&E{N}2yGcVOgt#CfEbo4H_RYL`
z?>jSZzneJzzQFGpTu<RD-NmiLUvNx_C(s;#m%;1cW8fFy-QZ2|QSb*a1O5sg2amxx
z0iFaO2cHDbfO+s9a0PrCTnB65HShuO28h4-2DcO7w;=ob5#(_{f#<-V!PDSr7}=h~
zjs0B!+0V-OeH(lb?LPPjxHGoD3qFMQ2O#J3@wol@*#0HR@!tebfxm#Sg1?XLYY2|#
z>4W>wECE@khfj`lngZFc4<c0YCdfLy1+q^2AY6$LL7wLmkahYDJOh3Wa=yQToR_$F
zq!WQWuLjxgRgiUh17v@1gFNmXkac<wWSu?*?+3pE+28jd`w{nz#+?FLrwNdCngrQ?
z0c4$uAm`H@w>QW3*Flc|I><WhgRIj>WBUmt%YG&}>5S{TRFl4@sxcuoV`*c;yNoy+
zsW|p^FLE~{qt8;;4-{z=Q`aQA<I-{jBel(7Aa#cVUn>fwl>-$k8@Xa?ie}5L;(WP8
zi{(`+6<P(Fni3^B6y;r?9n-3kabMYDVA@-*m{lr>;AcyTd6QUC(c3ccJG3+EMU|4M
zO5ICjPf@#%C)J_Y(ADfUQ8hiPs%;ezV&<3rcq}|5%1isy>ZP(rqUJ|w+y>zqO9Nw%
zhP`O05c&&hNIidBX--q!dIOP;Xu=K>m=DtSXw8v(jw3^4F<f^=J&b*$qfrEndPCqs
z5KGWIz45aepv7`X+e-#Y#}V!LL6Azlp?HGMXneXhcj)H2qNN6*Xqlwlha`PyM}EXP
zr_T||zLFhryVzpY*B#MLti^O`F9d>SgoHw?qIAmL=V>Uq2aAFpU5M3|(ZPsxDxPPx
z(4<y<IbG~YF-Xt_k*5-OJ)sR*-e4UWOA)oLQkr&Tgmp?I7BRwCR>q0NQi&wO0(+V9
zs*m<YI6NvWz4QvQ9Iex3T3d4hh#r_;z<Xew)=Fw4>Frf?*X*rItM|&*8oR!?E)Mq+
zX4-)W6orcQ6%A`PRXcVn9cKmm7pvw`qflHZ%#~@Sywt4J7c)yLG&Xi>QP1x<SCU@j
zw2VjPTA@;Xxlk%Cm7C2>quz3g7F!k`oRW-@Qa+o{IXV3El+AiC=AO&uvRQO=mejV-
zGyS>W3zWU+<)=sesu0|1S*fEy#>RTI;wu~Yn_Ah-t@GfK(yuKy586&k$pIo;oU2xv
z^R!^LA^(C>VXN;)Ex)~`;`6t;X#|Otfir9D09#duX)~J1U!u|D%(I#%XDD|rQ>)a<
zhx+8)Y^G>*j7{XUh9Odo)oy$~46xdl_>5W{mzgB)I@5>!IFqijPFc522fNv$=?y>5
z%qb)UxghM&qbqU)hdJ+FbaR>iOVod)M2*k*Kd4m2zfq|UKOZ>F*vdyL6@O6Diul)+
T3dR4hQZ?_aR9tBP^-A>z;p@L#

literal 0
HcmV?d00001

diff --git a/locales/en_US/LC_MESSAGES/messages.po b/locales/en_US/LC_MESSAGES/messages.po
new file mode 100644
index 0000000..821b1ca
--- /dev/null
+++ b/locales/en_US/LC_MESSAGES/messages.po
@@ -0,0 +1,180 @@
+# English USA language of WeatherClock.
+# Copyright (C) 2021 Eli's weatherClock
+# FIRST AUTHOR: KeepThisTicket/Vierlijner, 2021.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2021-11-12 00:41+0100\n"
+"PO-Revision-Date: 2021-11-13 09:28+0100\n"
+"Last-Translator: Vierlijner\n"
+"Language: en_US\n"
+"Language-Team: ENGLISH Kovin KeepThisTicket/Vierlijner\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.1\n"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:37
+msgid "Starting WeatherClock..."
+msgstr "Starting WeatherClock..."
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:42
+msgid "Remaining arguments will not be used: {0}"
+msgstr "Remaining arguments will not be used: {0}"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:44
+msgid "Options: {0}"
+msgstr "Options: {0}"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:67
+msgid "WeatherClock"
+msgstr "WeatherClock"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:94
+#: /home/pi/GitHub/weatherClock/weatherClock.py:177
+msgid "must be one of:"
+msgstr "must be one of:"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:97
+#: /home/pi/GitHub/weatherClock/weatherClock.py:99
+#: /home/pi/GitHub/weatherClock/weatherClock.py:105
+msgid ""
+"usage:\n"
+"weatherClock.py [-a|--apikey] <YourApiKey> [[-l|--loglevel] "
+"[Debug|Info|Warn|Error]|]"
+msgstr ""
+"usage:\n"
+"weatherClock.py [-a|--apikey] <YourApiKey> [[-l|--loglevel] "
+"[Debug|Info|Warn|Error]|]"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:107
+msgid "Missing one or more parameters."
+msgstr "Missing one or more parameters."
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:159
+msgid "'settings.json' file not found. Using command line parameters."
+msgstr "'settings.json' file not found. Using command line parameters."
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:163
+msgid ""
+"No ApiKey given. Use ApiKey in settings.json or use parameter: "
+"[-a|--apikey]."
+msgstr ""
+"No ApiKey given. Use ApiKey in settings.json or use parameter: "
+"[-a|--apikey]."
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:175
+msgid "Log Level set to invalid value: {0}"
+msgstr "Log Level set to invalid value: {0}"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:182
+msgid "Language changed to {0}"
+msgstr "Language changed to {0}"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:264
+msgid "cursor pressed: x, y"
+msgstr "cursor pressed: x, y"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:278
+msgid "hour {0} WAS TOUCHED !"
+msgstr "Hour {0} WAS TOUCHED !"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:295
+msgid "Touched hour is {0} hours ahead"
+msgstr "Touched hour is {0} hours ahead"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:311
+msgid "Day"
+msgstr "Day"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:323
+msgid "Hour"
+msgstr "Hour"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:331
+msgid "Temp"
+msgstr "Temperature"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:339
+msgid "Feels like"
+msgstr "Feels like"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:348
+msgid "POP"
+msgstr "POP"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:356
+msgid "Rain"
+msgstr "Rain"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:367
+msgid "Wind"
+msgstr "Wind"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:411
+msgid "current hour: "
+msgstr "Current hour: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:414
+msgid "forecast hour: "
+msgstr "Forecast hour: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:416
+msgid "temperature: "
+msgstr "Temperature: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:418
+msgid "feels like: "
+msgstr "Feels like: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:420
+msgid "wind speed: "
+msgstr "wind speed: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:423
+msgid "weather ID: "
+msgstr "weather ID: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:425
+msgid "POP: "
+msgstr "POP: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:429
+msgid "no rain data"
+msgstr "No rain data"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:432
+msgid "Rain: "
+msgstr "Rain: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:465
+msgid "Invalid weather ID"
+msgstr "Invalid weather ID"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:579
+msgid ""
+"\n"
+"... Main Loop Start ...\n"
+msgstr ""
+"\n"
+"... Main Loop Start ...\n"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:597
+msgid "** FETCHED NEW DATA **"
+msgstr "** FETCHED NEW DATA **"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:664
+msgid "MODE: "
+msgstr "MODE: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:669
+msgid "screen was touched"
+msgstr "Screen was touched"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:676
+msgid "Exiting WeatherClock."
+msgstr "Exiting WeatherClock."
+
diff --git a/locales/messages.pot b/locales/messages.pot
new file mode 100644
index 0000000..16f2065
--- /dev/null
+++ b/locales/messages.pot
@@ -0,0 +1,168 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR ORGANIZATION
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2021-11-12 00:41+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: pygettext.py 1.5\n"
+
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:37
+msgid "Starting WeatherClock..."
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:42
+msgid "Remaining arguments will not be used: {0}"
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:44
+msgid "Options: {0}"
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:67
+msgid "WeatherClock"
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:94
+#: /home/pi/GitHub/weatherClock/weatherClock.py:177
+msgid "must be one of:"
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:97
+#: /home/pi/GitHub/weatherClock/weatherClock.py:99
+#: /home/pi/GitHub/weatherClock/weatherClock.py:105
+msgid ""
+"usage:\n"
+"weatherClock.py [-a|--apikey] <YourApiKey> [[-l|--loglevel] [Debug|Info|Warn|Error]|]"
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:107
+msgid "Missing one or more parameters."
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:159
+msgid "'settings.json' file not found. Using command line parameters."
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:163
+msgid "No ApiKey given. Use ApiKey in settings.json or use parameter: [-a|--apikey]."
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:175
+msgid "Log Level set to invalid value: {0}"
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:182
+msgid "Language changed to {0}"
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:264
+msgid "cursor pressed: x, y"
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:278
+msgid "hour {0} WAS TOUCHED !"
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:295
+msgid "Touched hour is {0} hours ahead"
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:311
+msgid "Day"
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:323
+msgid "Hour"
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:331
+msgid "Temp"
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:339
+msgid "Feels like"
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:348
+msgid "POP"
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:356
+msgid "Rain"
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:367
+msgid "Wind"
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:411
+msgid "current hour: "
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:414
+msgid "forecast hour: "
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:416
+msgid "temperature: "
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:418
+msgid "feels like: "
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:420
+msgid "wind speed: "
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:423
+msgid "weather ID: "
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:425
+msgid "POP: "
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:429
+msgid "no rain data"
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:432
+msgid "Rain: "
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:465
+msgid "Invalid weather ID"
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:579
+msgid ""
+"\n"
+"... Main Loop Start ...\n"
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:597
+msgid "** FETCHED NEW DATA **"
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:664
+msgid "MODE: "
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:669
+msgid "screen was touched"
+msgstr ""
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:676
+msgid "Exiting WeatherClock."
+msgstr ""
+
diff --git a/locales/nl_NL/LC_MESSAGES/messages.mo b/locales/nl_NL/LC_MESSAGES/messages.mo
new file mode 100644
index 0000000000000000000000000000000000000000..e0d3d6769d68923aa9e5d93888a3088ca5e78a7e
GIT binary patch
literal 2737
zcmcJQOKclO7{>=Fw3v5!m4d|A@@N~n#tsOjE~#+iZDQ4qBgb)6g@7jB@p|LknbqvB
z-IVkU2QCPqiX%saICAI-P8{fk3lb6(DO?a2#El!`Kf9YaEtNQ7+5YY9d^7XC_P@Uz
zKJW>{=Oz4}!>@Li8BIR^-HbhhVE~>3-v^%pzXk6BZ-P&PJ759)3p@bcjmg8{LGWqt
zDEI<64c-TK!RNtsunArT9|UiJ__81IcQ5!eX!iRRH0yo?Pl11cN5CVPH1lQrnf=}X
z%|6}yeh+*Y;{o^tIL_xk1RufpQ_#foc|QIopZ^{-{@(;20{;Zx2LI0I*WjEvX8?YL
zoFyP(eDEM+i{MG{S#S)(RrWFXICu@bAN(S}{}uQc#@9iU#~WY^+yPCz<wM!NGoZlu
z68Hf4HE8y^0pe)(L(ZQ-EM+@j3H%*A4jzTESvL!saUH}I^Ff5f641nX1$+_w05tYr
zf{%jNL6fKNz?Z=t(B$tBif;Tr0-E(x;5*<92orV<G<KhXtWYc#smVP_4W&X_j=7Er
z_X_MpB;weUZdBZilsrLw&le<BOnsF|r${RiCaI@_fJ=vbPYMdT=7ETXj*4t*iZ0ll
zxdppMi}otjs+}rLO|cr^V)kXvY)q?y#{;3~eAOEk*##l|2>T2LTTqE+bvfd`=g>H_
zqI!)rxO5Zl3hE7TB^-(sy;r)*8p@@H7zv-?v$^TzYq3KjDydDgRkJI^nqHLpt>CWG
z6exYG+lz{-p?6Vik?W0wG+~O}J4n(kIWZd~nBEJ!LTeV^wk#eZimmk`YlX3=WR!WZ
z)LLTr!HG8Vo&K3?5nyD}!L^$NLdFq|J>O4Ly&=p2PPRU+&A;+iEV7OWLe^19Z-A5x
zkUR1s6LWeU5g!Qdu>HwqtDbaNFVPyurB-kR!w3O|T14rQmrv6c>+cl>7JVeE$D_R!
z=~3pK)#@^JS}SR>kFg+u2|Q0z+^;aHNSg+8c+6SU(?UoZ^9XfHJ!Uc77n;Y3MyXg5
zp}>_wUiGXu!mV2qOK)C6lv$n5(b}5jBk8_!ebWQ$v{n-viMw5weYL&HwcNI~R(gGV
zolSZPCykK=ib7%X%a*j-6usE0J60F{i>g&<sXBMDI&V|gZZFqci-oobm5!}u<a&;E
zK5-+fqbg)KtM$fP)mp7>FE1CCS{-Xnqh+y!RpT*2nl4S3tunsTR4P?oFTYYMmr5|S
z+G6CHlWw<rjY?-K(=(Y}0|~b}n#;)NvC<W4E6II_x}MO!w<(1#>^>G1lK#7kjlHqe
z5j?0+Es1-BJ1krB6U}|=g3<vxREFs=nw>sN+2!m>NylcXe5%l_H|<GU%EeM)PRSU(
zV|BJdL>P<9@vEVaBA+#nrp8k;o5X!<W@2Xo=nHMxvZow0afN0!ytptg5CF1-d~Q|f
zJm0`GJY76fEEh6mT2QL*gj%@}mVlEhqW=;o4+`Llk&=#idYhaNG2GCJH>44lyLzP{
zG@Ekr<Yt1kShrVJ?M$m$OY`<Zwc4m<s^zk3Kk^d~QA4+c9{LKJ)m6feiTe>-fnv4f
zh8PMQ49ybS2v&!4A7Yd~jIJ1an^!#7*(X;JOB!J_n449c1E(nfjnlh6n+L}D4wI4c
z-Sh+nWf8fsOr$L)W2^cUq&wcGZS!U_S2q>90%<Zi>Lz}EcNV^$HvZlwbN#&(=5ntl
znY*Lr?RwV68FGly?+Tw8L-O#CXRfv{o?Y>Shhv2-NRnA4)6&KJ6wp}Y1)$^mRqZ%l
zTd5YNVuE^9%}Zj4H%bf{ov5O@94UpCh@pyEDKkY}NIb{G>jf5YFBe2Kt8jEOj0x|@
z9@e3KIfqB7K<;$_7IZNQJ@HYeY=;$`Wb_eo%=dhOKq{2|PDRZcAfhYi%?eA)rA@9f
q>0E}s>mb`nqp#!r!Q%M&tj+%~?KG)EPvao-_Mk`#e;_=go&NwCo%{{}

literal 0
HcmV?d00001

diff --git a/locales/nl_NL/LC_MESSAGES/messages.po b/locales/nl_NL/LC_MESSAGES/messages.po
new file mode 100644
index 0000000..a6cf6d5
--- /dev/null
+++ b/locales/nl_NL/LC_MESSAGES/messages.po
@@ -0,0 +1,184 @@
+# Dutch language of WeatherClock.
+# Copyright (C) 2021 Eli's weatherClock
+# FIRST AUTHOR: Vierlijner, 2021.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2021-11-12 00:41+0100\n"
+"PO-Revision-Date: 2021-11-13 09:28+0100\n"
+"Last-Translator: Ronald Vierlijner\n"
+"Language: nl_NL\n"
+"Language-Team: Dutch Ronald Vierlijner\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.1\n"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:37
+msgid "Starting WeatherClock..."
+msgstr "Starten weerklok \"WeatherClock\"..."
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:42
+msgid "Remaining arguments will not be used: {0}"
+msgstr "De volgende argumenten worden niet gebruikt: {0}"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:44
+msgid "Options: {0}"
+msgstr "Opties: {0}"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:67
+msgid "WeatherClock"
+msgstr "Weerklok"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:94
+#: /home/pi/GitHub/weatherClock/weatherClock.py:177
+msgid "must be one of:"
+msgstr "moet een van de volgende waardes zijn:"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:97
+#: /home/pi/GitHub/weatherClock/weatherClock.py:99
+#: /home/pi/GitHub/weatherClock/weatherClock.py:105
+msgid ""
+"usage:\n"
+"weatherClock.py [-a|--apikey] <YourApiKey> [[-l|--loglevel] "
+"[Debug|Info|Warn|Error]|]"
+msgstr ""
+"Gebruik:\n"
+"weatherClock.py [-a|--apikey] <YourApiKey> [[-l|--loglevel] "
+"[Debug|Info|Warn|Error]|]"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:107
+msgid "Missing one or more parameters."
+msgstr "Mist een of meerdere parameters."
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:159
+msgid "'settings.json' file not found. Using command line parameters."
+msgstr ""
+"'settings.json' file niet gevonden. Maak gebruik van commando lijn "
+"parameters."
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:163
+msgid ""
+"No ApiKey given. Use ApiKey in settings.json or use parameter: "
+"[-a|--apikey]."
+msgstr ""
+"Geen ApiKey opgegeven. Vul ApiKey= in, in settings.json of gebruik "
+"commando parameter: [-a|--apikey]."
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:175
+msgid "Log Level set to invalid value: {0}"
+msgstr ""
+"Log Level met verkeerde waarde, maar gebuik van een van de volgende "
+"opties: {0}"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:182
+msgid "Language changed to {0}"
+msgstr "Taal in {0} gewijzigd"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:264
+msgid "cursor pressed: x, y"
+msgstr "cursor ingedrukt op coordinaat: x, y"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:278
+msgid "hour {0} WAS TOUCHED !"
+msgstr "Uur {0} is aangeklikt!"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:295
+msgid "Touched hour is {0} hours ahead"
+msgstr "Aangeklikte uur is {0} uur vooruit"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:311
+msgid "Day"
+msgstr "Dag"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:323
+msgid "Hour"
+msgstr "Uur"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:331
+msgid "Temp"
+msgstr "Temperatuur"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:339
+msgid "Feels like"
+msgstr "Voelt als"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:348
+msgid "POP"
+msgstr "Regenkans"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:356
+msgid "Rain"
+msgstr "Regen"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:367
+msgid "Wind"
+msgstr "Wind"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:411
+msgid "current hour: "
+msgstr "Huidige uur: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:414
+msgid "forecast hour: "
+msgstr "Voorspelde uur: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:416
+msgid "temperature: "
+msgstr "Temperatuur: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:418
+msgid "feels like: "
+msgstr "Voelt als: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:420
+msgid "wind speed: "
+msgstr "Wind snelheid: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:423
+msgid "weather ID: "
+msgstr "Weer ID: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:425
+msgid "POP: "
+msgstr "POP: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:429
+msgid "no rain data"
+msgstr "Geen regen data"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:432
+msgid "Rain: "
+msgstr "Regen: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:465
+msgid "Invalid weather ID"
+msgstr "Onbekende weer ID"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:579
+msgid ""
+"\n"
+"... Main Loop Start ...\n"
+msgstr ""
+"\n"
+"... Hoofdprogramma gestart ...\n"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:597
+msgid "** FETCHED NEW DATA **"
+msgstr "** NIEUWE DATA OPGEHAALD **"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:664
+msgid "MODE: "
+msgstr "MODE: "
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:669
+msgid "screen was touched"
+msgstr "Scherm aangeraakt"
+
+#: /home/pi/GitHub/weatherClock/weatherClock.py:676
+msgid "Exiting WeatherClock."
+msgstr "Afsluiten Weerklok."
+
diff --git a/settings.json b/settings.json
index c020aed..3aba28e 100644
--- a/settings.json
+++ b/settings.json
@@ -1,6 +1,7 @@
 {
   "ApiKey": "",
   "Theme": "default",
+  "Language": "en_US",
   "Title": "Vancouver, BC CANADA",
   "LogLevel": "Information",
   "Latitude": "49.2827",
@@ -32,4 +33,4 @@
   "WindTextLeftShift": "50",
   "WindTextRightShift": "65",
   "WindTextNoMeasureText": "False"
-}
\ No newline at end of file
+}
diff --git a/settings_320_240.json b/settings_320_240.json
index 06be5cc..1d0acdd 100644
--- a/settings_320_240.json
+++ b/settings_320_240.json
@@ -1,6 +1,7 @@
 {
   "ApiKey": "",
   "Theme": "default",
+  "Language": "en_US",
   "Title": "Vancouver, BC CANADA",
   "LogLevel": "Information",
   "Latitude": "49.2827",
diff --git a/weatherClock.py b/weatherClock.py
index d0c872f..d71e3f0 100644
--- a/weatherClock.py
+++ b/weatherClock.py
@@ -7,12 +7,26 @@
 import logging
 import sys
 import os
+import locale
 import getopt
 from datetime import datetime, timedelta
-from pynput.keyboard import Key
-from pynput.keyboard import Controller as KController
-from pynput.mouse import Button
-from pynput.mouse import Controller as MController
+try:
+    from pynput.keyboard import Key
+    from pynput.keyboard import Controller as KController
+    from pynput.mouse import Button
+    from pynput.mouse import Controller as MController
+except ImportError:
+    print("Install python 'pynput' module")
+import gettext
+#from gettext import gettext
+#from gettext import dgettext #Can't use because it don't generate lose error.pot/ logging.pot files
+# set current language default to english USA
+lang_translations = gettext.translation('messages', localedir='locales', languages=['en_US'])
+lang_translations.install()
+# define _() shortcut for translations
+_ = lang_translations.gettext
+#_d = dgettext
+#print(locale("nl"))
 
 keyboard = KController()
 mouse = MController()
@@ -23,16 +37,17 @@
 path = os.path.dirname(os.path.realpath(__file__))
 
 
-print("Starting WeatherClock...")
+print(_("Starting WeatherClock..."))
 try:
     options, remaining = getopt.getopt(sys.argv[1:], 'a:l:h', [
         "apikey=", "loglevel=", "latitude=", "longitude=" "help"])
     if remaining:
-        print(f"Remaining arguments will not be used:{remaining}")
+        print(_("Remaining arguments will not be used: {0}").format(remaining))
     if options:
-        print(f"Options: {options}")
+        print(_("Options: {0}").format(options))
     api_key = False
     theme = "default"
+    language = "en_US"
     log_level = False
     latitude = False
     longitude = False
@@ -52,7 +67,7 @@
     weather_text_data_font_size = 19
     hourly_touch_size = 50
     radius = 265
-    wn_title = "WeatherClock 0.0.0"
+    wn_title = _("WeatherClock") + "\n0.0.0"
     divider_start = -125
     divider_end = 275
     hour_hand = 100
@@ -78,15 +93,21 @@
             if arg.lower() in ['metric', 'imperial']:
                 units = arg
             else:
-                raise ValueError("[-u|--units] must be one of: metric, imperial")
+                #raise ValueError('[-u|--units] ' + _d('error', 'must be one of:') + "metric, imperial")
+                raise ValueError('[-u|--units] ' + _("must be one of:") + "metric, imperial")
         elif opt in ['-h', '--help']:
-            print('usage:\nweatherClock.py [-a|--apikey] <YourApiKey> [[-l|--loglevel] [Debug|Info|Warn|Error]|]')
+            #logging.error(_d("logging",'usage:\nweatherClock.py [-a|--apikey] <YourApiKey> [[-l|--loglevel] [Debug|Info|Warn|Error]|]'))
+            logging.error(_('usage:\nweatherClock.py [-a|--apikey] <YourApiKey> [[-l|--loglevel] [Debug|Info|Warn|Error]|]'))
+            #print(_d("logging",'usage:\nweatherClock.py [-a|--apikey] <YourApiKey> [[-l|--loglevel] [Debug|Info|Warn|Error]|]'))
+            print(_('usage:\nweatherClock.py [-a|--apikey] <YourApiKey> [[-l|--loglevel] [Debug|Info|Warn|Error]|]'))
             exit(0)
         else:
             print(f"Parameter unused: {opt}={arg}")
 except getopt.GetoptError:
-    print('usage:\nweatherClock.py [-a|--apikey] <YourApiKey> [[-l|--loglevel] [Debug|Info|Warn|Error]|]')
-    raise ValueError("Missing one or more parameters.")
+    #print(_d("logging",'usage:\nweatherClock.py [-a|--apikey] <YourApiKey> [[-l|--loglevel] [Debug|Info|Warn|Error]|]'))
+    print(_('usage:\nweatherClock.py [-a|--apikey] <YourApiKey> [[-l|--loglevel] [Debug|Info|Warn|Error]|]'))
+    #raise ValueError(_d("error","Missing one or more parameters."))
+    raise ValueError(_("Missing one or more parameters."))
 
 try:
     with open('settings.json', 'r') as settings_json:
@@ -107,6 +128,7 @@
             temperature_values = settings.get('TemperatureValues').lower() in ['1', 'true']
         if not wind_values:
             wind_values = settings.get('WindValues').lower() in ['1', 'true']
+        language = settings.get('Language')
         values_color = settings.get('ValuesColor')
         global_x_shift = int(settings.get('GlobalXShift'))
         global_y_shift = int(settings.get('GlobalYShift'))
@@ -136,10 +158,12 @@
         wind_text_no_measure_text = settings.get('WindTextNoMeasureText').lower() in ['1', 'true']
         
 except FileNotFoundError:
-    print("'settings.json' file not found. Using command line parameters.")
+    #print(_d("error","'settings.json' file not found. Using command line parameters."))
+    print(_("'settings.json' file not found. Using command line parameters."))
 
 if not api_key:
-    raise ValueError("No ApiKey given. Use ApiKey in settings.json or use parameter: [-a|--apikey].")
+    #raise ValueError(_d("error","No ApiKey given. Use ApiKey in settings.json or use parameter: [-a|--apikey]."))
+    raise ValueError(_("No ApiKey given. Use ApiKey in settings.json or use parameter: [-a|--apikey]."))
 
 if log_level.lower() == 'debug':
     logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.DEBUG)
@@ -150,15 +174,28 @@
 elif log_level.lower() == 'error':
     logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.ERROR)
 else:
-    logging.error(f"Log Level set to invalid value: {log_level}")
-    raise ValueError("LogLevel (--loglevel) must be one of: [Debug|Info|Information|Warn|Warning|Error]")
+    #logging.error(_d("logging","Log Level set to invalid value: {0}").format(log_level))
+    logging.error(_("Log Level set to invalid value: {0}").format(log_level))
+    #raise ValueError(_d("error","LogLevel (--loglevel) must be one of: ") + "[Debug|Info|Information|Warn|Warning|Error]")
+    raise ValueError("LogLevel (--loglevel) " + _("must be one of:") + " [Debug|Info|Information|Warn|Warning|Error]")
+
+language_list = ['en_US','en_GB','nl_NL','de_DE']
+for l in language_list:
+    if l.lower() == language.lower():
+        logging.info(_("Language changed to {0}").format(l))
+        lang_translations = gettext.translation('messages', localedir='locales', languages=[l])
+        lang_translations.install()
+        _ = lang_translations.gettext
+        logging.info(_("Language changed to {0}").format(l))
+        £locale.setlocale(locale.LC_ALL, locale.normalize(l))
+del language_list
 
 
 url_params = f'lat={latitude}&lon={longitude}&exclude=current,minutely,daily,alerts,flags&appid={api_key}'
 if units:
     url_params += f"&units={units}"
 else:
-    logging.info(f"Units not set. OpenWeatherMap.org defaults to 'standard'.")
+    logging.info("Units not set. OpenWeatherMap.org defaults to 'standard'.")
 url = f'http://api.openweathermap.org/data/2.5/onecall?{url_params}'
 
 weatherUpdatePeriod = 10
@@ -230,7 +267,8 @@ def get_mouse_click_coordinate(x, y):
 
     cursor_x = x
     cursor_y = y
-    logging.debug("cursor pressed: x, y")
+    #logging.debug(_d("logging","cursor pressed: x, y"))
+    logging.debug(_("cursor pressed: x, y"))
     logging.debug(cursor_x, cursor_y)
 
     hour_cursor = int(time.strftime("%I"))
@@ -243,7 +281,8 @@ def get_mouse_click_coordinate(x, y):
             hour_touched = i + 1
     tomorrow_date = None
     if hour_touched >= 0:
-        logging.debug(f"hour {hour_touched} WAS TOUCHED !")
+        #logging.debug(_d("logging","hour {0} WAS TOUCHED !").format(str(hour_touched)))
+        logging.debug(_("hour {0} WAS TOUCHED !").format(str(hour_touched)))
 
         if hour_touched < hour_cursor and not hour_cursor == 12:
             hours_ahead = 12-hour_cursor+hour_touched
@@ -259,7 +298,8 @@ def get_mouse_click_coordinate(x, y):
                 hours_ahead = hour_touched - hour_cursor
             touched_meridiem = current_meridiem
         if hours_ahead >= 0:
-            logging.info(f"Touched hour is {str(hours_ahead)} hours ahead")
+            #logging.info(_d("logging","Touched hour is {0} hours ahead").format(str(hours_ahead)))
+            logging.info(_("Touched hour is {0} hours ahead").format(str(hours_ahead)))
 
     if mode == 0 and hour_touched != -1:
         # go to hourly detail mode
@@ -275,7 +315,7 @@ def get_mouse_click_coordinate(x, y):
         weatherText.goto(weather_text_description + global_x_shift, weather_text_vert_spacing * 3 + global_y_shift)
         weatherText.color("white")
         # day of the week
-        weatherText.write("Day", align="right", font=("Verdana", weather_text_description_font_size, "bold"))
+        weatherText.write(_("Day"), align="right", font=("Verdana", weather_text_description_font_size, "bold"))
 
         weatherText.goto(weather_text_data + global_x_shift, weather_text_vert_spacing * 3 + global_y_shift)
         if not tomorrow_date:
@@ -287,7 +327,7 @@ def get_mouse_click_coordinate(x, y):
 
         # hour of the day
         weatherText.goto(weather_text_description + global_x_shift, weather_text_vert_spacing * 2 + global_y_shift)
-        weatherText.write("hour", align="right", font=("Verdana", weather_text_description_font_size, "bold"))
+        weatherText.write(_("Hour"), align="right", font=("Verdana", weather_text_description_font_size, "bold"))
 
         weatherText.goto(weather_text_data + global_x_shift, weather_text_vert_spacing * 2 + global_y_shift)
         weatherText.write(str(hour_touched) + " " + touched_meridiem,
@@ -295,7 +335,7 @@ def get_mouse_click_coordinate(x, y):
 
         # temperature
         weatherText.goto(weather_text_description + global_x_shift, weather_text_vert_spacing + global_y_shift)
-        weatherText.write("temp", align="right", font=("Verdana", weather_text_description_font_size, "bold"))
+        weatherText.write(_("Temp"), align="right", font=("Verdana", weather_text_description_font_size, "bold"))
 
         weatherText.goto(weather_text_data + global_x_shift, weather_text_vert_spacing + global_y_shift)
         weatherText.write(str(round_half_up(data["hourly"][hours_ahead]["temp"], 1)) + degree_sign,
@@ -303,16 +343,16 @@ def get_mouse_click_coordinate(x, y):
 
         # Feels like
         weatherText.goto(weather_text_description + global_x_shift, global_y_shift)
-        weatherText.write("Feels like", align="right",
+        weatherText.write(_("Feels like"), align="right",
                           font=("Verdana", weather_text_description_font_size, "bold"))
 
         weatherText.goto(weather_text_data + global_x_shift, global_y_shift)
         weatherText.write(str(round_half_up(data["hourly"][hours_ahead]["feels_like"], 1)) + degree_sign,
                           align="left", font=("Verdana", weather_text_data_font_size, "bold"))
 
-        # POP
+        # POP - Probability of precipitation
         weatherText.goto(weather_text_description + global_x_shift, -weather_text_vert_spacing + global_y_shift)
-        weatherText.write("POP", align="right", font=("Verdana", weather_text_description_font_size, "bold"))
+        weatherText.write(_("POP"), align="right", font=("Verdana", weather_text_description_font_size, "bold"))
 
         weatherText.goto(weather_text_data + global_x_shift, -weather_text_vert_spacing + global_y_shift)
         weatherText.write(str(int(data["hourly"][hours_ahead]["pop"]*100)) + " %",
@@ -320,7 +360,7 @@ def get_mouse_click_coordinate(x, y):
 
         # Rain
         weatherText.goto(weather_text_description + global_x_shift, -weather_text_vert_spacing * 2 + global_y_shift)
-        weatherText.write("Rain", align="right", font=("Verdana", weather_text_description_font_size, "bold"))
+        weatherText.write(_("Rain"), align="right", font=("Verdana", weather_text_description_font_size, "bold"))
 
         weatherText.goto(weather_text_data + global_x_shift, -weather_text_vert_spacing * 2 + global_y_shift)
         if 'rain' not in data["hourly"][hours_ahead]:
@@ -331,7 +371,7 @@ def get_mouse_click_coordinate(x, y):
 
         # Wind
         weatherText.goto(weather_text_description + global_x_shift, -weather_text_vert_spacing * 3 + global_y_shift)
-        weatherText.write("Wind", align="right", font=("Verdana", weather_text_description_font_size, "bold"))
+        weatherText.write(_("Wind"), align="right", font=("Verdana", weather_text_description_font_size, "bold"))
 
         weatherText.goto(weather_text_data + global_x_shift, -weather_text_vert_spacing * 3 + global_y_shift)
         weatherText.write(str(data["hourly"][hours_ahead]["wind_speed"]) + " km/h",
@@ -374,20 +414,29 @@ def update_forecast():
 
     for num in range(12):
         # current hour
-        logging.debug("current hour: " + str(hour_cursor) + " " + meridiem)
+        #logging.debug(_d("logging","current hour: ") + str(hour_cursor) + " " + meridiem)
+        logging.debug(_("current hour: ") + str(hour_cursor) + " " + meridiem)
         # forecast hour
-        logging.debug("forecast hour: " + str(int(hour_cursor)+num))
-        logging.debug("temperature: " + str(data["hourly"][num]["temp"]))
-        logging.debug("feels like: " + str(data["hourly"][num]["feels_like"]))
-        logging.debug("wind speed: " + str(data["hourly"][num]["wind_speed"]))
+        #logging.debug(_d("logging","forecast hour: ") + str(int(hour_cursor)+num))
+        logging.debug(_("forecast hour: ") + str(int(hour_cursor)+num))
+        #logging.debug(_d("logging","temperature: ") + str(data["hourly"][num]["temp"]))
+        logging.debug(_("temperature: ") + str(data["hourly"][num]["temp"]))
+        #logging.debug(_d("logging","feels like: ") + str(data["hourly"][num]["feels_like"]))
+        logging.debug(_("feels like: ") + str(data["hourly"][num]["feels_like"]))
+        #logging.debug(_d("logging","wind speed: ") + str(data["hourly"][num]["wind_speed"]))
+        logging.debug(_("wind speed: ") + str(data["hourly"][num]["wind_speed"]))
         logging.debug(data["hourly"][num]["weather"][0]["description"])
-        logging.debug("weather ID: " + str(data["hourly"][num]["weather"][0]["id"]))
-        logging.debug("POP: " + str(data["hourly"][num]["pop"]))
+        #logging.debug(_d("logging","weather ID: ") + str(data["hourly"][num]["weather"][0]["id"]))
+        logging.debug(_("weather ID: ") + str(data["hourly"][num]["weather"][0]["id"]))
+        #logging.debug(_d("logging","POP: ") + str(data["hourly"][num]["pop"]))
+        logging.debug(_("POP: ") + str(data["hourly"][num]["pop"]))
 
         if 'rain' not in data["hourly"][num]:
-            logging.debug("no rain data")
+            #logging.debug(_d("logging","no rain data"))
+            logging.debug(_("no rain data"))
         else:
-            logging.debug("rain: " + str(data["hourly"][num]["rain"]))
+            #logging.debug(_d("logging","Rain: ") + str(data["hourly"][num]["rain"]))
+            logging.debug(_("Rain: ") + str(data["hourly"][num]["rain"]))
 
         temp_array[num] = data["hourly"][num]["temp"]
         temp_feel_array[num] = data["hourly"][num]["feels_like"]
@@ -419,7 +468,8 @@ def update_forecast():
         elif id_array[num] == 803 or id_array[num] == 804:
             idImage_array[num] = os.path.join(path_theme, "04d@2x.gif")
         else:
-            logging.error("Invalid weather ID")
+            #logging.error(_d("error","Invalid weather ID"))
+            logging.error(_("Invalid weather ID"))
 
     logging.debug(temp_array)
     logging.debug(id_array)
@@ -529,9 +579,11 @@ def on_close():
 
 needUpdate1 = True    
 
+#def main():
 while running:
     try:
-        logging.debug("\n... Main Loop Start ...\n")
+        #logging.debug(_d("logging","\n... Main Loop Start ...\n"))
+        logging.debug(_("\n... Main Loop Start ...\n"))
 
         h = int(time.strftime("%I"))
         m = int(time.strftime("%M"))
@@ -548,14 +600,15 @@ def on_close():
         if m % weatherUpdatePeriod == 0 and s == 0:
             res = requests.get(url)
             data = res.json()
-            logging.debug("** FETCHED NEW DATA **")
+            #logging.debug(_d("logging","** FETCHED NEW DATA **"))
+            logging.debug(_("** FETCHED NEW DATA **"))
             needUpdate = True
 
         if mode == 0:
             draw_clock(h, m, s, pen)
             update_forecast()
 
-            logging.debug(f"hour_cursor: {str(hour_cursor)}")
+            logging.debug(f"hour_cursor: {hour_cursor}")
             
             for i in range(1, 13):
                 if (i - hour_cursor < 0):
@@ -614,20 +667,28 @@ def on_close():
         # cursor / touch logic
         # this returns the coordinate of the press !
         turtle.onscreenclick(get_mouse_click_coordinate)
-        logging.debug("MODE:" + str(mode))
+        #logging.debug(_d("logging","MODE: ") + str(mode))
+        logging.debug(_("MODE: ") + str(mode))
         logging.debug("cursor_x: " + str(cursor_x) + "; cursor_y: " + str(cursor_y))
 
         if cursor_x != -1 and cursor_y != -1:
-            logging.debug("screen was touched")
+            #logging.debug(_d("logging","screen was touched"))
+            logging.debug(_("screen was touched"))
 
         time.sleep(1)
 
         pen.clear()
 
     except KeyboardInterrupt:
-        print("Exiting WeatherClock.")
+        print(_("Exiting WeatherClock."))
         exit(0)
 
 # if you don't do this, window will open and close immediately, should be the last line of your program
 # this line is technically unreachable code since the above while loop also closes the script.
 # wn.mainloop()
+
+# if __name__=="__main__":
+#     logging.debug(_d("logging","weatherClock.py is running directly"))
+#     main()
+# else:
+#     logging.debug(_d("logging","weatherClock.py is being imported"))

From 63b128ee62fd75bae48ecd75efa1404b1b912338 Mon Sep 17 00:00:00 2001
From: vierlijner <68417202+vierlijner@users.noreply.github.com>
Date: Sun, 14 Nov 2021 16:44:59 +0100
Subject: [PATCH 04/15] Create Translate.sh

Automatic generate a pot file and make of update the language po file
---
 Translate.sh | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 Translate.sh

diff --git a/Translate.sh b/Translate.sh
new file mode 100644
index 0000000..26a196d
--- /dev/null
+++ b/Translate.sh
@@ -0,0 +1,43 @@
+#! /bin/bash
+
+#full_path=$(realpath $0) 
+#dir_path=$(dirname $full_path)
+dir_path=$(pwd)
+echo $dir_path
+dir_gettext=/home/pi/Python-3.10.0/Tools/i18n
+echo $dir_gettext
+
+# make pot file
+$dir_gettext/pygettext.py -a -p $dir_path/locales/ $dir_path/weatherClock.py
+echo "pot file generated"
+sleep 1s
+
+languages=("en_US" "en_GB" "nl_NL" "de_DE")
+
+cd locales
+for f in *.pot
+do 
+    fn="$(basename -s .pot $f)"
+    echo "Filename is: $f"
+    for lang in "${languages[@]}"
+    do
+        # Generate or upgrade po file
+        if [[ -f "./$lang/LC_MESSAGES/$fn.po" ]]; then
+            # it exist, so update po file
+            pybabel update -i $fn.pot -d $dir_path/locales/ -l $lang
+            #echo "po file updated" #above command already gives a message
+        else
+            # not available, so "generate" po file
+            if [[ ! -e "./$lang/" ]]; then
+                # make the directories
+                mkdir $lang
+                mkdir $lang/LC_MESSAGES
+                echo "Language dir: $lang generated"
+            fi
+            # copy the pot file as po file in right dir
+            cp -v "$f" ./$lang/LC_MESSAGES/$fn.po
+            echo "Made po file"
+        fi
+    done
+done
+exit

From fd877a1c08db350742a5408a182d52000d945fba Mon Sep 17 00:00:00 2001
From: vierlijner <68417202+vierlijner@users.noreply.github.com>
Date: Sun, 12 Dec 2021 09:27:35 +0100
Subject: [PATCH 05/15] 24 hours

make setting for 24 hours and a small optimalisation
---
 settings.json         |  1 +
 settings_320_240.json |  1 +
 weatherClock.py       | 98 +++++++++++++++++++++++++++++--------------
 3 files changed, 69 insertions(+), 31 deletions(-)

diff --git a/settings.json b/settings.json
index 3aba28e..61fd1ca 100644
--- a/settings.json
+++ b/settings.json
@@ -9,6 +9,7 @@
   "Units": "metric",
   "TemperatureValues": "False", 
   "WindValues": "False", 
+  "UseHour24": "False",
   "ValuesColor": "gray",
   "GlobalXShift": "0",
   "GlobalYShift": "0",
diff --git a/settings_320_240.json b/settings_320_240.json
index 1d0acdd..92e8364 100644
--- a/settings_320_240.json
+++ b/settings_320_240.json
@@ -9,6 +9,7 @@
   "Units": "metric",
   "TemperatureValues": "True", 
   "WindValues": "True", 
+  "UseHour24": "False",
   "ValuesColor": "gray",
   "GlobalXShift": "-32",
   "GlobalYShift": "5",
diff --git a/weatherClock.py b/weatherClock.py
index 15d3ad5..f85557a 100644
--- a/weatherClock.py
+++ b/weatherClock.py
@@ -26,7 +26,6 @@
 # define _() shortcut for translations
 _ = lang_translations.gettext
 #_d = dgettext
-#print(locale("nl"))
 
 keyboard = KController()
 mouse = MController()
@@ -36,7 +35,6 @@
 
 path = os.path.dirname(os.path.realpath(__file__))
 
-
 print(_("Starting WeatherClock..."))
 try:
     options, remaining = getopt.getopt(sys.argv[1:], 'a:l:h', [
@@ -125,9 +123,11 @@
         if not units:
             units = settings.get('Units')
         if not temperature_values:
-            temperature_values = settings.get('TemperatureValues').lower() in ['1', 'true']
+            temperature_values = settings.get('TemperatureValues').lower() in ['1', 'true', 'on']
         if not wind_values:
-            wind_values = settings.get('WindValues').lower() in ['1', 'true']
+            wind_values = settings.get('WindValues').lower() in ['1', 'true', 'on']
+        if not use_hour24:
+            use_hour24 = settings.get('UseHour24').lower() in ['1', 'true', 'on']
         language = settings.get('Language')
         values_color = settings.get('ValuesColor')
         global_x_shift = int(settings.get('GlobalXShift'))
@@ -144,7 +144,7 @@
         hourly_touch_size = int(settings.get('HourlyTouchSize'))
         # determines how big clock is
         radius = int(settings.get('Radius'))
-        wn_title = settings.get('Title')
+        wn_title += settings.get('Title')
         divider_start = int(settings.get('DividerStart'))
         divider_end = int(settings.get('DividerEnd'))
         hour_hand = int(settings.get('HourHand'))
@@ -167,9 +167,9 @@
 
 if log_level.lower() == 'debug':
     logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.DEBUG)
-elif log_level.lower() == 'info' or log_level.lower() == 'information':
+elif log_level.lower()[:4] == 'info': #'info' or 'information'
     logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.INFO)
-elif log_level.lower() == 'warn' or log_level.lower() == 'warning':
+elif log_level.lower()[:4] == 'warn': #'warn' or 'warning'
     logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.WARNING)
 elif log_level.lower() == 'error':
     logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.ERROR)
@@ -279,6 +279,7 @@ def get_mouse_click_coordinate(x, y):
     for i in range(0, 12):
         if touch_in_box(cursor_x, cursor_y, hour_x[i], hour_y[i], hourly_touch_size, hourly_touch_size):
             hour_touched = i + 1
+            break
     tomorrow_date = None
     if hour_touched >= 0:
         #logging.debug(_d("logging","hour {0} WAS TOUCHED !").format(str(hour_touched)))
@@ -292,29 +293,37 @@ def get_mouse_click_coordinate(x, y):
             else:
                 touched_meridiem = "PM"
         else:
+            touched_meridiem = current_meridiem
             if hour_cursor == 12:
                 hours_ahead = hour_touched
             else:
                 hours_ahead = hour_touched - hour_cursor
-            touched_meridiem = current_meridiem
+                if hour_touched == 12:
+                    if current_meridiem == "PM":
+                        tomorrow_date = datetime.today() + timedelta(days=1)
+                        touched_meridiem = "AM"
+                    else:
+                        touched_meridiem = "PM"
         if hours_ahead >= 0:
             #logging.info(_d("logging","Touched hour is {0} hours ahead").format(str(hours_ahead)))
             logging.info(_("Touched hour is {0} hours ahead").format(str(hours_ahead)))
 
-    if mode == 0 and hour_touched != -1:
+    if hour_touched != -1:
+        if mode == 1:
+            weatherText.clear()  # remove hourly details from screen
+            weatherDividerPen.clear()
+        else:
+            pen.clear() # remove the clock hands from showing
         # go to hourly detail mode
         mode = 1
-        # ? to do?: add the button touches for different hours
-
-        # remove the clock hands from showing
-        pen.clear()
 
         # without this there is some weird line
         weatherText.penup()
 
-        weatherText.goto(weather_text_description + global_x_shift, weather_text_vert_spacing * 3 + global_y_shift)
         weatherText.color("white")
+
         # day of the week
+        weatherText.goto(weather_text_description + global_x_shift, weather_text_vert_spacing * 3 + global_y_shift)
         weatherText.write(_("Day"), align="right", font=("Verdana", weather_text_description_font_size, "bold"))
 
         weatherText.goto(weather_text_data + global_x_shift, weather_text_vert_spacing * 3 + global_y_shift)
@@ -330,7 +339,20 @@ def get_mouse_click_coordinate(x, y):
         weatherText.write(_("Hour"), align="right", font=("Verdana", weather_text_description_font_size, "bold"))
 
         weatherText.goto(weather_text_data + global_x_shift, weather_text_vert_spacing * 2 + global_y_shift)
-        weatherText.write(str(hour_touched) + " " + touched_meridiem,
+        if use_hour24:
+            current_hour24 = int(time.strftime("%H"))
+            if current_hour24 + hours_ahead > 23:
+                if hour_touched == 12:
+                    weatherText.write("0",
+                                    align="left", font=("Verdana", weather_text_data_font_size, "bold"))
+                else:
+                    weatherText.write(str(hour_touched),
+                                    align="left", font=("Verdana", weather_text_data_font_size, "bold"))
+            else:
+                weatherText.write(str(current_hour24 + hours_ahead),
+                                align="left", font=("Verdana", weather_text_data_font_size, "bold"))
+        else:
+            weatherText.write(str(hour_touched) + " " + touched_meridiem,
                           align="left", font=("Verdana", weather_text_data_font_size, "bold"))
 
         # temperature
@@ -413,12 +435,23 @@ def update_forecast():
     logging.debug("hour_cursor: " + str(hour_cursor))
 
     for num in range(12):
-        # current hour
-        #logging.debug(_d("logging","current hour: ") + str(hour_cursor) + " " + meridiem)
-        logging.debug(_("current hour: ") + str(hour_cursor) + " " + meridiem)
-        # forecast hour
-        #logging.debug(_d("logging","forecast hour: ") + str(int(hour_cursor)+num))
-        logging.debug(_("forecast hour: ") + str(int(hour_cursor)+num))
+ 
+        if use_hour24:
+            current_hour24 = int(time.strftime("%H"))
+            #logging.debug(_d("logging","current hour: ") + str(current_hour24)) # current hour 24
+            logging.debug(_("current hour: ") + str(current_hour24)) # current hour 24
+            if current_hour24 + num < 24:
+                #logging.debug(_d("logging","forecast hour: ") + str(current_hour24+num)) # forecast hour 24
+                logging.debug(_("forecast hour: ") + str(current_hour24+num)) # forecast hour 24
+            else:
+                #logging.debug(_d("logging","forecast hour: ") + str(current_hour24+num-24)) # forecast hour 24
+                logging.debug(_("forecast hour: ") + str(current_hour24+num-24)) # forecast hour 24
+        else:
+            #logging.debug(_d("logging","current hour: ") + str(hour_cursor) + " " + meridiem)
+            logging.debug(_("current hour: ") + str(hour_cursor) + " " + meridiem)
+            #logging.debug(_d("logging","forecast hour: ") + str(int(hour_cursor)+num))
+            logging.debug(_("forecast hour: ") + str(int(hour_cursor)+num))
+
         #logging.debug(_d("logging","temperature: ") + str(data["hourly"][num]["temp"]))
         logging.debug(_("temperature: ") + str(data["hourly"][num]["temp"]))
         #logging.debug(_d("logging","feels like: ") + str(data["hourly"][num]["feels_like"]))
@@ -431,7 +464,7 @@ def update_forecast():
         #logging.debug(_d("logging","POP: ") + str(data["hourly"][num]["pop"]))
         logging.debug(_("POP: ") + str(data["hourly"][num]["pop"]))
 
-        if 'rain' not in data["hourly"][num]:
+        if 'rain' not in data["hourly"][num]: #check rain
             #logging.debug(_d("logging","no rain data"))
             logging.debug(_("no rain data"))
         else:
@@ -445,19 +478,19 @@ def update_forecast():
 
         path_theme = os.path.join(path, theme)
 
-        if 232 >= id_array[num] >= 200:
+        if   200 <= id_array[num] <= 232:
             idImage_array[num] = os.path.join(path_theme, "11d@2x.gif")
-        elif 321 >= id_array[num] >= 300:
+        elif 300 <= id_array[num] <= 321:
             idImage_array[num] = os.path.join(path_theme, "09d@2x.gif")
-        elif 504 >= id_array[num] >= 500:
+        elif 500 <= id_array[num] <= 504:
             idImage_array[num] = os.path.join(path_theme, "10d@2x.gif")
         elif id_array[num] == 511:
             idImage_array[num] = os.path.join(path_theme, "13d@2x.gif")
-        elif 531 >= id_array[num] >= 520:
+        elif 520 <= id_array[num] <= 531:
             idImage_array[num] = os.path.join(path_theme, "09d@2x.gif")
-        elif 622 >= id_array[num] >= 600:
+        elif 600 <= id_array[num] <= 622:
             idImage_array[num] = os.path.join(path_theme, "13d@2x.gif")
-        elif 781 >= id_array[num] >= 701:
+        elif 701 <= id_array[num] <= 781:
             idImage_array[num] = os.path.join(path_theme, "50d@2x.gif")
         elif id_array[num] == 800:
             idImage_array[num] = os.path.join(path_theme, "01d@2x.gif")
@@ -465,7 +498,7 @@ def update_forecast():
             idImage_array[num] = os.path.join(path_theme, "02d@2x.gif")
         elif id_array[num] == 802:
             idImage_array[num] = os.path.join(path_theme, "03d@2x.gif")
-        elif id_array[num] == 803 or id_array[num] == 804:
+        elif 803 <= id_array[num] <= 804:
             idImage_array[num] = os.path.join(path_theme, "04d@2x.gif")
         else:
             #logging.error(_d("error","Invalid weather ID"))
@@ -589,7 +622,10 @@ def on_close():
         m = int(time.strftime("%M"))
         s = int(time.strftime("%S"))
 
-        logging.debug(f"{str(h)}:{str(m)}:{str(s)}")
+        if use_hour24:
+            logging.debug(f"{time.strftime("%H")}:{str(m)}:{str(s)}")
+        else:
+            logging.debug(f"{str(h)}:{str(m)}:{str(s)}")
 
         needUpdate = False
         if (needUpdate1):
@@ -680,7 +716,7 @@ def on_close():
         pen.clear()
 
     except KeyboardInterrupt:
-        print(_("Exiting WeatherClock."))
+        logging.info(_("Exiting WeatherClock."))
         exit(0)
 
 # if you don't do this, window will open and close immediately, should be the last line of your program

From 2314a0982c24211404c0610d5197dd31363b47cc Mon Sep 17 00:00:00 2001
From: vierlijner <68417202+vierlijner@users.noreply.github.com>
Date: Sun, 12 Dec 2021 10:26:40 +0100
Subject: [PATCH 06/15] Initialize

Added initialize (ini_done)
---
 weatherClock.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/weatherClock.py b/weatherClock.py
index f85557a..7dae12f 100644
--- a/weatherClock.py
+++ b/weatherClock.py
@@ -198,6 +198,7 @@
     logging.info("Units not set. OpenWeatherMap.org defaults to 'standard'.")
 url = f'http://api.openweathermap.org/data/2.5/onecall?{url_params}'
 
+ini_done = False
 weatherUpdatePeriod = 10
 
 temp_array = [0] * 12
@@ -615,12 +616,15 @@ def on_close():
 #def main():
 while running:
     try:
-        #logging.debug(_d("logging","\n... Main Loop Start ...\n"))
-        logging.debug(_("\n... Main Loop Start ...\n"))
+        if ini_done == False
+            #logging.debug(_d("logging","\n... Main Loop Start ...\n"))
+            logging.debug(_("\n... Main Loop Start ...\n"))
 
-        h = int(time.strftime("%I"))
-        m = int(time.strftime("%M"))
         s = int(time.strftime("%S"))
+        if s == 0 or ini_done == False:
+            m = int(time.strftime("%M"))
+        if m == 0 or ini_done == False:
+            h = int(time.strftime("%I"))
 
         if use_hour24:
             logging.debug(f"{time.strftime("%H")}:{str(m)}:{str(s)}")
@@ -633,16 +637,16 @@ def on_close():
             needUpdate1 = False
         
         # every x minutes, fetch new weather data
-        if m % weatherUpdatePeriod == 0 and s == 0:
+        if (m % weatherUpdatePeriod == 0 and s == 0) or ini_done == False:
             res = requests.get(url)
             data = res.json()
             #logging.debug(_d("logging","** FETCHED NEW DATA **"))
             logging.debug(_("** FETCHED NEW DATA **"))
             needUpdate = True
+            update_forecast()
 
         if mode == 0:
             draw_clock(h, m, s, pen)
-            update_forecast()
 
             logging.debug(f"hour_cursor: {hour_cursor}")
             
@@ -711,6 +715,8 @@ def on_close():
             #logging.debug(_d("logging","screen was touched"))
             logging.debug(_("screen was touched"))
 
+        ini_done = True
+
         time.sleep(1)
 
         pen.clear()

From 26ad2a801540a72c28445c2bcf10a3b933c87d04 Mon Sep 17 00:00:00 2001
From: vierlijner <68417202+vierlijner@users.noreply.github.com>
Date: Sun, 12 Dec 2021 21:35:28 +0100
Subject: [PATCH 07/15] update rime

Make time and also update forecast more efficient
---
 weatherClock.py | 78 +++++++++++++++++++++----------------------------
 1 file changed, 33 insertions(+), 45 deletions(-)

diff --git a/weatherClock.py b/weatherClock.py
index 7dae12f..6b3c72a 100644
--- a/weatherClock.py
+++ b/weatherClock.py
@@ -52,6 +52,7 @@
     units = False
     temperature_values = False 
     wind_values = False
+    use_hour24 = False
     values_color = "gray"
     global_x_shift = 0
     global_y_shift = 0
@@ -187,7 +188,7 @@
         lang_translations.install()
         _ = lang_translations.gettext
         logging.info(_("Language changed to {0}").format(l))
-        £locale.setlocale(locale.LC_ALL, locale.normalize(l))
+        locale.setlocale(locale.LC_ALL, locale.normalize(l))
 del language_list
 
 
@@ -200,6 +201,10 @@
 
 ini_done = False
 weatherUpdatePeriod = 10
+current_hour12 = 0
+current_hour24 = 0
+current_meridiem = ""
+tomorrow_date = datetime.today() + timedelta(days=1)
 
 temp_array = [0] * 12
 temp_feel_array = [0] * 12
@@ -210,7 +215,6 @@
 id_array = [0] * 12
 idImage_array = [""] * 12
 idImage_array_was = [""] * 12
-hour_cursor = int(time.strftime('%I'))
 
 res = requests.get(url)
 if res.ok:
@@ -264,44 +268,40 @@ def get_mouse_click_coordinate(x, y):
     global cursor_y
     # 0 = clock, 1 = hourly detail
     global mode
-    global hour_cursor
-
+ 
     cursor_x = x
     cursor_y = y
     #logging.debug(_d("logging","cursor pressed: x, y"))
     logging.debug(_("cursor pressed: x, y"))
     logging.debug(cursor_x, cursor_y)
 
-    hour_cursor = int(time.strftime("%I"))
-    current_meridiem = str(time.strftime('%p'))
-
     hour_touched = -1
 
     for i in range(0, 12):
         if touch_in_box(cursor_x, cursor_y, hour_x[i], hour_y[i], hourly_touch_size, hourly_touch_size):
             hour_touched = i + 1
             break
-    tomorrow_date = None
     if hour_touched >= 0:
         #logging.debug(_d("logging","hour {0} WAS TOUCHED !").format(str(hour_touched)))
         logging.debug(_("hour {0} WAS TOUCHED !").format(str(hour_touched)))
-
-        if hour_touched < hour_cursor and not hour_cursor == 12:
-            hours_ahead = 12-hour_cursor+hour_touched
+        
+        tomorrow = False
+        if hour_touched < current_hour12 and not current_hour12 == 12:
+            hours_ahead = 12-current_hour12+hour_touched
             if current_meridiem == "PM":
-                tomorrow_date = datetime.today() + timedelta(days=1)
+                tomorrow = True
                 touched_meridiem = "AM"
             else:
                 touched_meridiem = "PM"
         else:
             touched_meridiem = current_meridiem
-            if hour_cursor == 12:
+            if current_hour12 == 12:
                 hours_ahead = hour_touched
             else:
-                hours_ahead = hour_touched - hour_cursor
+                hours_ahead = hour_touched - current_hour12
                 if hour_touched == 12:
                     if current_meridiem == "PM":
-                        tomorrow_date = datetime.today() + timedelta(days=1)
+                        tomorrow = True
                         touched_meridiem = "AM"
                     else:
                         touched_meridiem = "PM"
@@ -328,7 +328,7 @@ def get_mouse_click_coordinate(x, y):
         weatherText.write(_("Day"), align="right", font=("Verdana", weather_text_description_font_size, "bold"))
 
         weatherText.goto(weather_text_data + global_x_shift, weather_text_vert_spacing * 3 + global_y_shift)
-        if not tomorrow_date:
+        if not tomorrow:
             weatherText.write(datetime.today().strftime('%A'),
                               align="left", font=("Verdana", weather_text_data_font_size, "bold"))
         else:
@@ -423,22 +423,14 @@ def get_mouse_click_coordinate(x, y):
 
 def update_forecast():
 
-    global hour_cursor
-
     # weather ID breakdown https://openweathermap.org/weather-conditions
     # use https://ezgif.com/maker for gif conversion
 
     logging.debug("---- update_forecast() ----")
 
-    hour_cursor = int(time.strftime("%I"))
-    meridiem = time.strftime('%p')
-
-    logging.debug("hour_cursor: " + str(hour_cursor))
-
     for num in range(12):
  
         if use_hour24:
-            current_hour24 = int(time.strftime("%H"))
             #logging.debug(_d("logging","current hour: ") + str(current_hour24)) # current hour 24
             logging.debug(_("current hour: ") + str(current_hour24)) # current hour 24
             if current_hour24 + num < 24:
@@ -448,10 +440,10 @@ def update_forecast():
                 #logging.debug(_d("logging","forecast hour: ") + str(current_hour24+num-24)) # forecast hour 24
                 logging.debug(_("forecast hour: ") + str(current_hour24+num-24)) # forecast hour 24
         else:
-            #logging.debug(_d("logging","current hour: ") + str(hour_cursor) + " " + meridiem)
-            logging.debug(_("current hour: ") + str(hour_cursor) + " " + meridiem)
-            #logging.debug(_d("logging","forecast hour: ") + str(int(hour_cursor)+num))
-            logging.debug(_("forecast hour: ") + str(int(hour_cursor)+num))
+            #logging.debug(_d("logging","current hour: ") + str(current_hour12) + " " + current_meridiem)
+            logging.debug(_("current hour: ") + str(current_hour12) + " " + current_meridiem)
+            #logging.debug(_d("logging","forecast hour: ") + str(int(current_hour12)+num))
+            logging.debug(_("forecast hour: ") + str(int(current_hour12)+num))
 
         #logging.debug(_d("logging","temperature: ") + str(data["hourly"][num]["temp"]))
         logging.debug(_("temperature: ") + str(data["hourly"][num]["temp"]))
@@ -611,12 +603,10 @@ def on_close():
 top_window.overrideredirect(True)
 wn.listen()
 
-needUpdate1 = True    
-
 #def main():
 while running:
     try:
-        if ini_done == False
+        if ini_done == False:
             #logging.debug(_d("logging","\n... Main Loop Start ...\n"))
             logging.debug(_("\n... Main Loop Start ...\n"))
 
@@ -624,42 +614,40 @@ def on_close():
         if s == 0 or ini_done == False:
             m = int(time.strftime("%M"))
         if m == 0 or ini_done == False:
-            h = int(time.strftime("%I"))
+            current_hour12 = int(time.strftime("%I"))
+            current_hour24 = int(time.strftime("%H"))
+            current_meridiem = time.strftime('%p')
+            h = current_hour12
+            tomorrow_date = datetime.today() + timedelta(days=1)
 
         if use_hour24:
-            logging.debug(f"{time.strftime("%H")}:{str(m)}:{str(s)}")
+            logging.debug(f"{str(current_hour24)}:{str(m)}:{str(s)}")
         else:
-            logging.debug(f"{str(h)}:{str(m)}:{str(s)}")
+            logging.debug(f"{str(current_hour12)}:{str(m)}:{str(s)} " + current_meridiem)
 
-        needUpdate = False
-        if (needUpdate1):
-            needUpdate = True
-            needUpdate1 = False
-        
         # every x minutes, fetch new weather data
         if (m % weatherUpdatePeriod == 0 and s == 0) or ini_done == False:
             res = requests.get(url)
             data = res.json()
             #logging.debug(_d("logging","** FETCHED NEW DATA **"))
             logging.debug(_("** FETCHED NEW DATA **"))
-            needUpdate = True
             update_forecast()
 
         if mode == 0:
             draw_clock(h, m, s, pen)
 
-            logging.debug(f"hour_cursor: {hour_cursor}")
+            logging.debug(f"current_hour12: {current_hour12}")
             
             for i in range(1, 13):
-                if (i - hour_cursor < 0):
-                    j = 12 - abs(i - hour_cursor)
+                if (i - current_hour12 < 0):
+                    j = 12 - abs(i - current_hour12)
                 else:
-                    j = i - hour_cursor
+                    j = i - current_hour12
                 if(idImage_array[j] != idImage_array_was[j]):
                     bg_hour[i-1].shape(idImage_array[j])
                     idImage_array_was[j] = idImage_array[j]
                     
-                if ((needUpdate) or (temp_array[j] != temp_array_was[j]) or (temp_feel_array[j] != temp_feel_array_was[j]) or
+                if ((temp_array[j] != temp_array_was[j]) or (temp_feel_array[j] != temp_feel_array_was[j]) or
                         (wind_array[j] != wind_array_was[j])):
                     if (temperature_values):
                         bg_hourtext[i-1].clear()

From d88f8f3c3963d5e750ff9712e9d53fa3990351f9 Mon Sep 17 00:00:00 2001
From: vierlijner <68417202+vierlijner@users.noreply.github.com>
Date: Wed, 22 Jun 2022 22:29:22 +0200
Subject: [PATCH 08/15] Create LICENSE.md

---
 LICENSE.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 LICENSE.md

diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 0000000..631c34e
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 KeepThisTicket - WeatherClock
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

From 51566881d408082b8c7e2e4a5b54e7a5f0ea99ae Mon Sep 17 00:00:00 2001
From: vierlijner <zeilfanaat@hotmail.com>
Date: Thu, 13 Oct 2022 21:41:25 +0200
Subject: [PATCH 09/15] system settings + meridiem

Try to change system settings to match language that is shown.
Set meridiem and tomorrow easier.
Make bg_windtext code shorter.
---
 weatherClock.py | 86 ++++++++++++++++++++++++++++---------------------
 1 file changed, 50 insertions(+), 36 deletions(-)

diff --git a/weatherClock.py b/weatherClock.py
index 6b3c72a..6c55fa9 100644
--- a/weatherClock.py
+++ b/weatherClock.py
@@ -13,7 +13,7 @@
 try:
     from pynput.keyboard import Key
     from pynput.keyboard import Controller as KController
-    from pynput.mouse import Button
+    #from pynput.mouse import Button # not used
     from pynput.mouse import Controller as MController
 except ImportError:
     print("Install python 'pynput' module")
@@ -38,18 +38,18 @@
 print(_("Starting WeatherClock..."))
 try:
     options, remaining = getopt.getopt(sys.argv[1:], 'a:l:h', [
-        "apikey=", "loglevel=", "latitude=", "longitude=" "help"])
+        "apikey=", "loglevel=", "latitude=", "longitude=", "help"])
     if remaining:
         print(_("Remaining arguments will not be used: {0}").format(remaining))
     if options:
         print(_("Options: {0}").format(options))
-    api_key = False
+    api_key = None
     theme = "default"
     language = "en_US"
-    log_level = False
-    latitude = False
-    longitude = False
-    units = False
+    log_level = None
+    latitude = None
+    longitude = None
+    units = "metric"
     temperature_values = False 
     wind_values = False
     use_hour24 = False
@@ -156,7 +156,7 @@
         second_color = settings.get('SecondColor')
         wind_text_left_shift = int(settings.get('WindTextLeftShift'))
         wind_text_right_shift = int(settings.get('WindTextRightShift'))
-        wind_text_no_measure_text = settings.get('WindTextNoMeasureText').lower() in ['1', 'true']
+        wind_text_no_measure_text = settings.get('WindTextNoMeasureText').lower() in ['1', 'true', 'on']
         
 except FileNotFoundError:
     #print(_d("error","'settings.json' file not found. Using command line parameters."))
@@ -183,13 +183,35 @@
 language_list = ['en_US','en_GB','nl_NL','de_DE']
 for l in language_list:
     if l.lower() == language.lower():
+        # Change i18n translation language
         logging.info(_("Language changed to {0}").format(l))
         lang_translations = gettext.translation('messages', localedir='locales', languages=[l])
         lang_translations.install()
         _ = lang_translations.gettext
         logging.info(_("Language changed to {0}").format(l))
-        locale.setlocale(locale.LC_ALL, locale.normalize(l))
-del language_list
+        
+        # Get current language
+        ext = "UTF-8"
+        lang, enc = locale.getlocale()
+        if lang == None:
+            lang, enc = locale.getdefaultlocale()
+        lang = lang or 'en_US'
+        enc = enc or ext
+        lang_now = locale.normalize(".".join((lang, enc)))
+        
+        # Try to set system settings to new language
+        lang_new = locale.normalize(".".join((l, ext)))
+        if lang_new != lang_now:
+            try:
+                #locale.setlocale(locale.LC_ALL, '')
+                locale.setlocale(locale.LC_ALL, locale.normalize(".".join((l, ext))))
+            except locale.Error:
+                logging.error(_("Failed to change system language."))
+                logging.error(_("Make sure locale '" + str(l) + ".UTF8' is generated on your system" ))
+                locale.setlocale(locale.LC_ALL, None)
+                continue
+        break #exit for loop
+del language_list, lang, enc, ext, lang_now, lang_new
 
 
 url_params = f'lat={latitude}&lon={longitude}&exclude=current,minutely,daily,alerts,flags&appid={api_key}'
@@ -225,8 +247,8 @@
 
 logging.debug(data)
 
-cursor_x = 0
-cursor_y = 0
+cursor_x = -1
+cursor_y = -1
 
 weatherText = turtle.Turtle()
 weatherText.hideturtle()
@@ -273,7 +295,7 @@ def get_mouse_click_coordinate(x, y):
     cursor_y = y
     #logging.debug(_d("logging","cursor pressed: x, y"))
     logging.debug(_("cursor pressed: x, y"))
-    logging.debug(cursor_x, cursor_y)
+    logging.debug(f'{cursor_x}, {cursor_y}')
 
     hour_touched = -1
 
@@ -286,28 +308,20 @@ def get_mouse_click_coordinate(x, y):
         logging.debug(_("hour {0} WAS TOUCHED !").format(str(hour_touched)))
         
         tomorrow = False
+        touched_meridiem = current_meridiem
         if hour_touched < current_hour12 and not current_hour12 == 12:
             hours_ahead = 12-current_hour12+hour_touched
-            if current_meridiem == "PM":
-                tomorrow = True
-                touched_meridiem = "AM"
-            else:
-                touched_meridiem = "PM"
         else:
-            touched_meridiem = current_meridiem
             if current_hour12 == 12:
                 hours_ahead = hour_touched
             else:
                 hours_ahead = hour_touched - current_hour12
-                if hour_touched == 12:
-                    if current_meridiem == "PM":
-                        tomorrow = True
-                        touched_meridiem = "AM"
-                    else:
-                        touched_meridiem = "PM"
         if hours_ahead >= 0:
             #logging.info(_d("logging","Touched hour is {0} hours ahead").format(str(hours_ahead)))
             logging.info(_("Touched hour is {0} hours ahead").format(str(hours_ahead)))
+            touched_meridiem = (datetime.today() + timedelta(hours=hours_ahead)).strftime("%p")
+            if current_meridiem == "PM" and touched_meridiem == "AM":
+                tomorrow = True
 
     if hour_touched != -1:
         if mode == 1:
@@ -341,7 +355,7 @@ def get_mouse_click_coordinate(x, y):
 
         weatherText.goto(weather_text_data + global_x_shift, weather_text_vert_spacing * 2 + global_y_shift)
         if use_hour24:
-            current_hour24 = int(time.strftime("%H"))
+													 
             if current_hour24 + hours_ahead > 23:
                 if hour_touched == 12:
                     weatherText.write("0",
@@ -579,6 +593,8 @@ def draw_clock(hour, minute, second, pen):
     pen.rt(angle)
     pen.pendown()
     pen.fd(second_hand)
+    
+    return pen
 
 # makes the program fullscreen when you launch it
 keyboard.press(Key.alt)
@@ -634,7 +650,7 @@ def on_close():
             update_forecast()
 
         if mode == 0:
-            draw_clock(h, m, s, pen)
+            pen = draw_clock(h, m, s, pen)
 
             logging.debug(f"current_hour12: {current_hour12}")
             
@@ -672,20 +688,18 @@ def on_close():
                         v = int(round(temp_array[j]))
                         v2 = int(round(temp_feel_array[j]))
                         bg_hourtext[i-1].write(str(round(temp_array[j])), align="left", font=("Verdana", temperature_text_font_size, "bold"))
-                    if  (wind_values):   
+                    if (wind_values):   
+                        bg_windtext[i-1].clear()
+                        bg_windtext[i-1].penup()
+                        kmh = " km/h"
+                        if (wind_text_no_measure_text):
+                            kmh = ""
                         if (i in range(1,6)):
-                            bg_windtext[i-1].clear()
-                            bg_windtext[i-1].penup()
-                            kmh = " km/h"
-                            if (wind_text_no_measure_text):
-                                kmh = ""
                             bg_windtext[i-1].goto(hour_x[j] + temperature_text_horz_spacing +  x_shift + wind_text_right_shift + global_x_shift, hour_y[j] + temperature_text_vert_spacing + y_shift + global_y_shift)
                             bg_windtext[i-1].write(str(wind_array[j]) + kmh, align="left", font=("Verdana", temperature_text_font_size, ""))
                         if (i in range(7,12)):
-                            bg_windtext[i-1].clear()
-                            bg_windtext[i-1].penup()
                             bg_windtext[i-1].goto(hour_x[j] + temperature_text_horz_spacing +  x_shift - wind_text_left_shift + global_x_shift, hour_y[j] + temperature_text_vert_spacing + y_shift + global_y_shift)
-                            bg_windtext[i-1].write(str(wind_array[j]), align="right", font=("Verdana", temperature_text_font_size, ""))
+                            bg_windtext[i-1].write(str(wind_array[j]) + kmh, align="right", font=("Verdana", temperature_text_font_size, ""))
                 temp_array_was[j] = temp_array[j]
                 temp_feel_array_was[j] = temp_feel_array[j]
                 wind_array_was[j] = wind_array[j]                    

From 3368122a371d8a7dcec1ac439e76841273660d3b Mon Sep 17 00:00:00 2001
From: vierlijner <zeilfanaat@hotmail.com>
Date: Thu, 13 Oct 2022 21:58:55 +0200
Subject: [PATCH 10/15] comments

Add more comments and regions.
---
 weatherClock.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/weatherClock.py b/weatherClock.py
index 6c55fa9..67149d5 100644
--- a/weatherClock.py
+++ b/weatherClock.py
@@ -36,6 +36,7 @@
 path = os.path.dirname(os.path.realpath(__file__))
 
 print(_("Starting WeatherClock..."))
+#region Get command parameters and initialize tags
 try:
     options, remaining = getopt.getopt(sys.argv[1:], 'a:l:h', [
         "apikey=", "loglevel=", "latitude=", "longitude=", "help"])
@@ -107,7 +108,9 @@
     print(_('usage:\nweatherClock.py [-a|--apikey] <YourApiKey> [[-l|--loglevel] [Debug|Info|Warn|Error]|]'))
     #raise ValueError(_d("error","Missing one or more parameters."))
     raise ValueError(_("Missing one or more parameters."))
+#endregion
 
+#region Get settings parameters
 try:
     with open('settings.json', 'r') as settings_json:
         settings = json.loads(settings_json.read())
@@ -161,6 +164,7 @@
 except FileNotFoundError:
     #print(_d("error","'settings.json' file not found. Using command line parameters."))
     print(_("'settings.json' file not found. Using command line parameters."))
+#endregion
 
 if not api_key:
     #raise ValueError(_d("error","No ApiKey given. Use ApiKey in settings.json or use parameter: [-a|--apikey]."))
@@ -180,6 +184,7 @@
     #raise ValueError(_d("error","LogLevel (--loglevel) must be one of: ") + "[Debug|Info|Information|Warn|Warning|Error]")
     raise ValueError("LogLevel (--loglevel) " + _("must be one of:") + " [Debug|Info|Information|Warn|Warning|Error]")
 
+#region Change language
 language_list = ['en_US','en_GB','nl_NL','de_DE']
 for l in language_list:
     if l.lower() == language.lower():
@@ -212,7 +217,7 @@
                 continue
         break #exit for loop
 del language_list, lang, enc, ext, lang_now, lang_new
-
+#endregion
 
 url_params = f'lat={latitude}&lon={longitude}&exclude=current,minutely,daily,alerts,flags&appid={api_key}'
 if units:
@@ -298,7 +303,7 @@ def get_mouse_click_coordinate(x, y):
     logging.debug(f'{cursor_x}, {cursor_y}')
 
     hour_touched = -1
-
+	#determines which hour was touched
     for i in range(0, 12):
         if touch_in_box(cursor_x, cursor_y, hour_x[i], hour_y[i], hourly_touch_size, hourly_touch_size):
             hour_touched = i + 1
@@ -323,6 +328,7 @@ def get_mouse_click_coordinate(x, y):
             if current_meridiem == "PM" and touched_meridiem == "AM":
                 tomorrow = True
 
+	# goto right mode (detail or not)
     if hour_touched != -1:
         if mode == 1:
             weatherText.clear()  # remove hourly details from screen
@@ -649,7 +655,7 @@ def on_close():
             logging.debug(_("** FETCHED NEW DATA **"))
             update_forecast()
 
-        if mode == 0:
+        if mode == 0: #clock
             pen = draw_clock(h, m, s, pen)
 
             logging.debug(f"current_hour12: {current_hour12}")

From c3ede25a61bdb76db42b51da83b8cd70b11b133d Mon Sep 17 00:00:00 2001
From: vierlijner <zeilfanaat@hotmail.com>
Date: Wed, 19 Oct 2022 21:26:41 +0200
Subject: [PATCH 11/15] Temperature symbol

Added temperature symbol to display in detail mode.
---
 weatherClock.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/weatherClock.py b/weatherClock.py
index d0c872f..fedb553 100644
--- a/weatherClock.py
+++ b/weatherClock.py
@@ -192,7 +192,13 @@
 weatherDividerPen = turtle.Turtle()
 weatherDividerPen.hideturtle()
 
-degree_sign = u"\N{DEGREE SIGN}"
+degree_sign = u" \N{DEGREE SIGN}"
+if units.lower() == "imperial":
+	degree_sign += "F"	#Fahrenheit
+elif units.lower() == "metric":
+	degree_sign += "C"	#Celsius
+else:
+	degree_sign += "K"	#Kelvin
 
 # 1 - hourly detail mode, 0 - analog clock face mode
 mode = 0

From 34a8d75d7380ca33a73664ab0dec3ad469149af6 Mon Sep 17 00:00:00 2001
From: vierlijner <zeilfanaat@hotmail.com>
Date: Thu, 20 Oct 2022 21:52:57 +0200
Subject: [PATCH 12/15] Parameter weatherTextColor

Added the weather text color as a parameter in the settings file and to the code (weather_text_color), so the user can change it.
---
 settings.json         | 1 +
 settings_320_240.json | 1 +
 weatherClock.py       | 6 ++++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/settings.json b/settings.json
index c020aed..9fe0525 100644
--- a/settings.json
+++ b/settings.json
@@ -14,6 +14,7 @@
   "WeatherTextDescription": "-30",
   "WeatherTextData": "30",
   "WeatherTextVertSpacing": "40",
+  "WeatherTextColor": "white",
   "TemperatureTextVertSpacing": "-9",
   "TemperatureTextHorzSpacing": "11",
   "TemperatureTextFontSize": "11",
diff --git a/settings_320_240.json b/settings_320_240.json
index 06be5cc..6b66111 100644
--- a/settings_320_240.json
+++ b/settings_320_240.json
@@ -14,6 +14,7 @@
   "WeatherTextDescription": "-10",
   "WeatherTextData": "10",
   "WeatherTextVertSpacing": "17",
+  "WeatherTextColor": "white",
   "TemperatureTextVertSpacing": "-9",
   "TemperatureTextHorzSpacing": "11",
   "TemperatureTextFontSize": "11",
diff --git a/weatherClock.py b/weatherClock.py
index d0c872f..98a8333 100644
--- a/weatherClock.py
+++ b/weatherClock.py
@@ -45,6 +45,7 @@
     weather_text_description = -30
     weather_text_data = 30
     weather_text_vert_spacing = 40
+	weather_text_color = "white"
     temperature_text_vert_spacing = -9
     temperature_text_horz_spacing = 11
     temperature_text_font_size = 11
@@ -113,7 +114,8 @@
         weather_text_description = int(settings.get('WeatherTextDescription'))
         weather_text_data = int(settings.get('WeatherTextData'))
         weather_text_vert_spacing = int(settings.get('WeatherTextVertSpacing'))
-        temperature_text_vert_spacing = int(settings.get('TemperatureTextVertSpacing'))
+        weather_text_color = settings.get('WeatherTextColor')
+		temperature_text_vert_spacing = int(settings.get('TemperatureTextVertSpacing'))
         temperature_text_horz_spacing = int(settings.get('TemperatureTextHorzSpacing'))
         temperature_text_font_size = int(settings.get('TemperatureTextFontSize'))
         weather_text_description_font_size = int(settings.get('WeatherTextDataFontSize'))
@@ -273,7 +275,7 @@ def get_mouse_click_coordinate(x, y):
         weatherText.penup()
 
         weatherText.goto(weather_text_description + global_x_shift, weather_text_vert_spacing * 3 + global_y_shift)
-        weatherText.color("white")
+        weatherText.color(weather_text_color)
         # day of the week
         weatherText.write("Day", align="right", font=("Verdana", weather_text_description_font_size, "bold"))
 

From dd9adb5776e8b8ebe4a749fb11d3787b24ef3682 Mon Sep 17 00:00:00 2001
From: vierlijner <zeilfanaat@hotmail.com>
Date: Thu, 20 Oct 2022 23:27:47 +0200
Subject: [PATCH 13/15] Undo #12

undo my changes, I need to figure out on what time it goes wrong.
---
 weatherClock.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/weatherClock.py b/weatherClock.py
index d4639c9..073c3b5 100644
--- a/weatherClock.py
+++ b/weatherClock.py
@@ -697,7 +697,7 @@ def on_close():
                             y_shift = -5
                         if (temp_array[j] < 10):
                             x_shift = x_shift + 4
-                        bg_hourtext[i-1].goto(hour_x[j] + temperature_text_horz_spacing + x_shift - 20 + global_x_shift, hour_y[j] + temperature_text_vert_spacing + y_shift + global_y_shift)
+                        bg_hourtext[i-1].goto(hour_x[i-1] + temperature_text_horz_spacing + x_shift - 20 + global_x_shift, hour_y[i-1] + temperature_text_vert_spacing + y_shift + global_y_shift)
                         v = int(round(temp_array[j]))
                         v2 = int(round(temp_feel_array[j]))
                         bg_hourtext[i-1].write(str(round(temp_array[j])), align="left", font=("Verdana", temperature_text_font_size, "bold"))
@@ -708,10 +708,10 @@ def on_close():
                         if (wind_text_no_measure_text):
                             kmh = ""
                         if (i in range(1,6)):
-                            bg_windtext[i-1].goto(hour_x[j] + temperature_text_horz_spacing +  x_shift + wind_text_right_shift + global_x_shift, hour_y[j] + temperature_text_vert_spacing + y_shift + global_y_shift)
+                            bg_windtext[i-1].goto(hour_x[i-1] + temperature_text_horz_spacing +  x_shift + wind_text_right_shift + global_x_shift, hour_y[i-1] + temperature_text_vert_spacing + y_shift + global_y_shift)
                             bg_windtext[i-1].write(str(wind_array[j]) + kmh, align="left", font=("Verdana", temperature_text_font_size, ""))
                         if (i in range(7,12)):
-                            bg_windtext[i-1].goto(hour_x[j] + temperature_text_horz_spacing +  x_shift - wind_text_left_shift + global_x_shift, hour_y[j] + temperature_text_vert_spacing + y_shift + global_y_shift)
+                            bg_windtext[i-1].goto(hour_x[i-1] + temperature_text_horz_spacing +  x_shift - wind_text_left_shift + global_x_shift, hour_y[i-1] + temperature_text_vert_spacing + y_shift + global_y_shift)
                             bg_windtext[i-1].write(str(wind_array[j]) + kmh, align="right", font=("Verdana", temperature_text_font_size, ""))
                 temp_array_was[j] = temp_array[j]
                 temp_feel_array_was[j] = temp_feel_array[j]

From ab0c78278afb6f8d85fbe61fa45aa8c51b50dfd9 Mon Sep 17 00:00:00 2001
From: vierlijner <zeilfanaat@hotmail.com>
Date: Thu, 20 Oct 2022 23:31:46 +0200
Subject: [PATCH 14/15] tabToSpaces

Format document so convert tab to spaces.
---
 weatherClock.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/weatherClock.py b/weatherClock.py
index 073c3b5..bbc2330 100644
--- a/weatherClock.py
+++ b/weatherClock.py
@@ -60,7 +60,7 @@
     weather_text_description = -30
     weather_text_data = 30
     weather_text_vert_spacing = 40
-	weather_text_color = "white"
+    weather_text_color = "white"
     temperature_text_vert_spacing = -9
     temperature_text_horz_spacing = 11
     temperature_text_font_size = 11
@@ -141,7 +141,7 @@
         weather_text_data = int(settings.get('WeatherTextData'))
         weather_text_vert_spacing = int(settings.get('WeatherTextVertSpacing'))
         weather_text_color = settings.get('WeatherTextColor')
-		temperature_text_vert_spacing = int(settings.get('TemperatureTextVertSpacing'))
+        temperature_text_vert_spacing = int(settings.get('TemperatureTextVertSpacing'))
         temperature_text_horz_spacing = int(settings.get('TemperatureTextHorzSpacing'))
         temperature_text_font_size = int(settings.get('TemperatureTextFontSize'))
         weather_text_description_font_size = int(settings.get('WeatherTextDataFontSize'))
@@ -265,11 +265,11 @@
 
 degree_sign = u" \N{DEGREE SIGN}"
 if units.lower() == "imperial":
-	degree_sign += "F"	#Fahrenheit
+    degree_sign += "F"  #Fahrenheit
 elif units.lower() == "metric":
-	degree_sign += "C"	#Celsius
+    degree_sign += "C"  #Celsius
 else:
-	degree_sign += "K"	#Kelvin
+    degree_sign += "K"  #Kelvin
 
 # 1 - hourly detail mode, 0 - analog clock face mode
 mode = 0
@@ -311,7 +311,7 @@ def get_mouse_click_coordinate(x, y):
     logging.debug(f'{cursor_x}, {cursor_y}')
 
     hour_touched = -1
-	#determines which hour was touched
+    #determines which hour was touched
     for i in range(0, 12):
         if touch_in_box(cursor_x, cursor_y, hour_x[i], hour_y[i], hourly_touch_size, hourly_touch_size):
             hour_touched = i + 1
@@ -336,7 +336,7 @@ def get_mouse_click_coordinate(x, y):
             if current_meridiem == "PM" and touched_meridiem == "AM":
                 tomorrow = True
 
-	# goto right mode (detail or not)
+    # goto right mode (detail or not)
     if hour_touched != -1:
         if mode == 1:
             weatherText.clear()  # remove hourly details from screen
@@ -368,7 +368,7 @@ def get_mouse_click_coordinate(x, y):
 
         weatherText.goto(weather_text_data + global_x_shift, weather_text_vert_spacing * 2 + global_y_shift)
         if use_hour24:
-													 
+                                                     
             if current_hour24 + hours_ahead > 23:
                 if hour_touched == 12:
                     weatherText.write("0",

From 20368a4be5c6cf9f28705491fd66ec6aa027631b Mon Sep 17 00:00:00 2001
From: vierlijner <zeilfanaat@hotmail.com>
Date: Fri, 21 Oct 2022 00:37:59 +0200
Subject: [PATCH 15/15] bug/24hr

When current_hour12 = 12 then when 12 is touched it was set to 12 hours ahead, but it's 0 hours ahead.
Fixes #12
---
 weatherClock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/weatherClock.py b/weatherClock.py
index bbc2330..8bf1be3 100644
--- a/weatherClock.py
+++ b/weatherClock.py
@@ -325,7 +325,7 @@ def get_mouse_click_coordinate(x, y):
         if hour_touched < current_hour12 and not current_hour12 == 12:
             hours_ahead = 12-current_hour12+hour_touched
         else:
-            if current_hour12 == 12:
+            if current_hour12 == 12 and not hour_touched == 12:
                 hours_ahead = hour_touched
             else:
                 hours_ahead = hour_touched - current_hour12