From 1332cba725dc837aa49ed861adc1d4a62b33332f Mon Sep 17 00:00:00 2001 From: Gordon Williams Date: Wed, 20 Mar 2024 09:09:25 +0000 Subject: [PATCH] 0.18: Fix lint warnings, change anv->janv for fr_BE and fr_CH --- apps/lint_exemptions.js | 13 ------------- apps/locale/ChangeLog | 1 + apps/locale/locales.js | 16 ++++++++++++++-- apps/locale/metadata.json | 2 +- apps/sleepphasealarm/ChangeLog | 1 + apps/sleepphasealarm/app.js | 6 +++--- apps/sleepphasealarm/metadata.json | 2 +- 7 files changed, 21 insertions(+), 20 deletions(-) diff --git a/apps/lint_exemptions.js b/apps/lint_exemptions.js index 83ab5cc02..d6fd6510d 100644 --- a/apps/lint_exemptions.js +++ b/apps/lint_exemptions.js @@ -59,13 +59,6 @@ module.exports = { "no-unused-vars" ] }, - "sleepphasealarm/app.js": { - "hash": "d234fea5d711ae5a149879e53b28bc9002860c6b6a75285e1fc04093fe400a88", - "rules": [ - "no-unused-vars", - "no-undef" - ] - }, "sleeplog/settings.js": { "hash": "bd5e3e1382321df6682ef1cb718b0e15ab355422bef77278eb086f213f643021", "rules": [ @@ -582,12 +575,6 @@ module.exports = { "no-undef" ] }, - "locale/locales.js": { - "hash": "bf2fd659e673b34a1ffa98c7ae7ca89de86a4ff9f823244d028e85bc465ed3c7", - "rules": [ - "no-unused-vars" - ] - }, "sleeplog/lib.js": { "hash": "755e0d4c02b92181281fd6990df39c9446c73ff896b50b64d7e14cb1c0188556", "rules": [ diff --git a/apps/locale/ChangeLog b/apps/locale/ChangeLog index d21cb1a56..b8b52d0af 100644 --- a/apps/locale/ChangeLog +++ b/apps/locale/ChangeLog @@ -19,3 +19,4 @@ 0.16: Remove global variables that used RAM Add second 'dp' argument for decimal places in distance/speed/temp (fix #1523) 0.17: Fix regression where long month names were 'undefined' (fix #1641) +0.18: Fix lint warnings, change anv->janv for fr_BE and fr_CH diff --git a/apps/locale/locales.js b/apps/locale/locales.js index 937bb5b44..a03c9c8d1 100644 --- a/apps/locale/locales.js +++ b/apps/locale/locales.js @@ -1,4 +1,8 @@ /* jshint esversion: 6 */ +/* exported distanceUnits */ +/* exported speedUnits */ +/* exported codePages */ +/* exported locales */ const distanceUnits = { // how many meters per X? "m": 1, "ft": 0.3048, @@ -59,6 +63,14 @@ timePattern / datePattern: %S second (00..60) %p locale's equivalent of either AM or PM; blank if not known %P like %p, but lower case + + +in locales: + + abmonth: short months (must be <5 chars, ideally 3) + month: normal month names + abday: short days (must be <5 chars, ideally 3) + day: normal day names */ var locales = { @@ -459,7 +471,7 @@ var locales = { ampm: { 0: "", 1: "" }, timePattern: { 0: "%HH:%MM:%SS", 1: "%HH:%MM" }, datePattern: { 0: "%A %B %d %Y", "1": "%d/%m/%y" }, // dimanche 1 mars 2020 // 01/03/20 - abmonth: "anv.,févr.,mars,avril,mai,juin,juil.,août,sept.,oct.,nov.,déc.", + abmonth: "janv.,févr.,mars,avril,mai,juin,juil.,août,sept.,oct.,nov.,déc.", month: "janvier,février,mars,avril,mai,juin,juillet,août,septembre,octobre,novembre,décembre", abday: "dim,lun,mar,mer,jeu,ven,sam", day: "dimanche,lundi,mardi,mercredi,jeudi,vendredi,samedi", @@ -513,7 +525,7 @@ var locales = { ampm: { 0: "AM", 1: "PM" }, timePattern: { 0: "%HH:%MM:%SS", 1: "%HH:%MM" }, datePattern: { 0: "%A %d %B %Y", "1": "%d/%m/%y" }, // dimanche 1 mars 2020 // 01/03/20 - abmonth: "anv.,févr.,mars,avril,mai,juin,juil.,août,sept.,oct.,nov.,déc.", + abmonth: "janv.,févr.,mars,avril,mai,juin,juil.,août,sept.,oct.,nov.,déc.", month: "janvier,février,mars,avril,mai,juin,juillet,août,septembre,octobre,novembre,décembre", abday: "dim,lun,mar,mer,jeu,ven,sam", day: "dimanche,lundi,mardi,mercredi,jeudi,vendredi,samedi", diff --git a/apps/locale/metadata.json b/apps/locale/metadata.json index 54ad64e80..cb45f0622 100644 --- a/apps/locale/metadata.json +++ b/apps/locale/metadata.json @@ -1,7 +1,7 @@ { "id": "locale", "name": "Languages", - "version": "0.17", + "version": "0.18", "description": "Translations for different countries", "icon": "locale.png", "type": "locale", diff --git a/apps/sleepphasealarm/ChangeLog b/apps/sleepphasealarm/ChangeLog index a836cac23..7dfd96bdd 100644 --- a/apps/sleepphasealarm/ChangeLog +++ b/apps/sleepphasealarm/ChangeLog @@ -20,3 +20,4 @@ 0.15: Convert Yes/No On/Off in settings to checkboxes 0.16: Fix Keep alarm enabled inverted settings 0.17: Fix handle dates saved as object with milliseconds +0.18: Fix lint warnings diff --git a/apps/sleepphasealarm/app.js b/apps/sleepphasealarm/app.js index 9560d9c8d..a9580fd47 100644 --- a/apps/sleepphasealarm/app.js +++ b/apps/sleepphasealarm/app.js @@ -105,8 +105,8 @@ function drawApp() { } const period = drawSeconds ? 1000 : 60000; - if (this.drawTimeTimeout !== undefined) { - clearTimeout(this.drawTimeTimeout); + if (drawTimeTimeout !== undefined) { + clearTimeout(drawTimeTimeout); } drawTimeTimeout = setTimeout(()=>{ drawTimeTimeout = undefined; @@ -156,7 +156,7 @@ if (nextAlarmDate !== undefined) { // minimum alert 30 minutes early minAlarm.setTime(nextAlarmDate.getTime() - (30*60*1000)); - run = () => { + let run = () => { layout.state.label = /*LANG*/"Start"; layout.render(); Bangle.setOptions({powerSave: false}); // do not dynamically change accelerometer poll interval diff --git a/apps/sleepphasealarm/metadata.json b/apps/sleepphasealarm/metadata.json index 667c1259b..2ba003cf7 100644 --- a/apps/sleepphasealarm/metadata.json +++ b/apps/sleepphasealarm/metadata.json @@ -2,7 +2,7 @@ "id": "sleepphasealarm", "name": "SleepPhaseAlarm", "shortName": "SleepPhaseAlarm", - "version": "0.17", + "version": "0.18", "description": "Uses the accelerometer to estimate sleep and wake states with the principle of Estimation of Stationary Sleep-segments (ESS, see https://ubicomp.eti.uni-siegen.de/home/datasets/ichi14/index.html.en). This app will read the next alarm from the alarm application and will wake you up to 30 minutes early at the best guessed time when you are almost already awake.", "icon": "app.png", "tags": "tool,alarm",