From 52647e7a8a9650e7e22389aedc3cfae80a92ecc0 Mon Sep 17 00:00:00 2001 From: Danny <31635744+DDDanny@users.noreply.github.com> Date: Tue, 11 Jan 2022 00:08:06 +0100 Subject: [PATCH 1/4] fixed typo in readme.md --- apps/antonclk/README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/antonclk/README.md b/apps/antonclk/README.md index fa4cc4919..c2c8b917e 100644 --- a/apps/antonclk/README.md +++ b/apps/antonclk/README.md @@ -40,7 +40,10 @@ The main menu contains several settings covering Anton clock in general. * **Show Weekday** - Weekday is shown in the time presentation without seconds. Weekday name depends on the current locale. If seconds are shown, the weekday is never shown as there is not enough space on the watch face. -**Show Weeknumber** - Weeknumber (ISO-8601) is shown. +* **Show Weeknumber** - Week-number (ISO-8601) is shown. (default: Off) +when weekday name "Off" it displays week #: +when weekday name "On": weekday name is cut at 6th position and .# is added +If seconds are shown, the week number is never shown as there is not enough space on the watch face. * **Vector font** - Use the built-in vector font for dates and weekday. This can improve readability. Otherwise, a scaled version of the built-in 6x8 pixels font is used. From 1a21358f2be7fe4f5dcdddb324c14e1f698aa610 Mon Sep 17 00:00:00 2001 From: Danny <31635744+DDDanny@users.noreply.github.com> Date: Tue, 11 Jan 2022 00:12:04 +0100 Subject: [PATCH 2/4] Updated readme.md typo / format --- apps/antonclk/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/antonclk/README.md b/apps/antonclk/README.md index c2c8b917e..38a42aa22 100644 --- a/apps/antonclk/README.md +++ b/apps/antonclk/README.md @@ -41,8 +41,8 @@ The main menu contains several settings covering Anton clock in general. Weekday name depends on the current locale. If seconds are shown, the weekday is never shown as there is not enough space on the watch face. * **Show Weeknumber** - Week-number (ISO-8601) is shown. (default: Off) -when weekday name "Off" it displays week #: -when weekday name "On": weekday name is cut at 6th position and .# is added +If "Show Weekday" is "Off" the week-number is displayed as week #:. +If "Show Weekday" is "On" the weekday name is cut at 6th position and .# is added. If seconds are shown, the week number is never shown as there is not enough space on the watch face. * **Vector font** - Use the built-in vector font for dates and weekday. This can improve readability. From 3e458115046ec7182edb00871ca3077f1253728d Mon Sep 17 00:00:00 2001 From: Danny <31635744+DDDanny@users.noreply.github.com> Date: Tue, 11 Jan 2022 00:13:34 +0100 Subject: [PATCH 3/4] Updated readme.md type / format --- apps/antonclk/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/antonclk/README.md b/apps/antonclk/README.md index 38a42aa22..85c03788d 100644 --- a/apps/antonclk/README.md +++ b/apps/antonclk/README.md @@ -41,8 +41,8 @@ The main menu contains several settings covering Anton clock in general. Weekday name depends on the current locale. If seconds are shown, the weekday is never shown as there is not enough space on the watch face. * **Show Weeknumber** - Week-number (ISO-8601) is shown. (default: Off) -If "Show Weekday" is "Off" the week-number is displayed as week #:. -If "Show Weekday" is "On" the weekday name is cut at 6th position and .# is added. +If "Show Weekday" is "Off" the week-number is displayed as "week #:". +If "Show Weekday" is "On" the weekday name is cut at 6th position and suffixed with ".#". If seconds are shown, the week number is never shown as there is not enough space on the watch face. * **Vector font** - Use the built-in vector font for dates and weekday. This can improve readability. From dcc4dc8e66c43eaf7bc0d54128e790572d904ee8 Mon Sep 17 00:00:00 2001 From: Danny <31635744+DDDanny@users.noreply.github.com> Date: Tue, 11 Jan 2022 00:16:40 +0100 Subject: [PATCH 4/4] app.js - bugfix: removed codefragement testdata "thursday" added todo for locale "week" --- apps/antonclk/app.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/antonclk/app.js b/apps/antonclk/app.js index be6c23789..05758cbfd 100644 --- a/apps/antonclk/app.js +++ b/apps/antonclk/app.js @@ -188,9 +188,8 @@ function draw() { g.drawString(dateStr, x, y); if (weekDay || calWeek) { var dowwumStr = require("locale").dow(date); - dowwumStr = "thursday"; if (calWeek) - dowwumStr = (weekDay ? dowwumStr.substr(0,Math.min(dowwumStr.length,6)) + (dowwumStr.length>=6 ? "." : "") : "week ") + "#" + ISO8601calWeek(date); + dowwumStr = (weekDay ? dowwumStr.substr(0,Math.min(dowwumStr.length,6)) + (dowwumStr.length>=6 ? "." : "") : "week ") + "#" + ISO8601calWeek(date); //TODO: locale for "week" if (upperCase) dowwumStr = dowwumStr.toUpperCase(); g.drawString(dowwumStr, x, y + (vectorFont ? 26 : 16));