FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3520 from Athemis/niftypp 

ffcniftyapp: Fix weather icon on non-English locale
pull/3532/head
Rob Pilling 2024-08-02 18:38:04 +01:00 committed by GitHub
parent 8a25931f53 e9d2478e81
commit da526bbd04
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/ffcniftyapp/ChangeLog
View File

@ -1,3 +1,4 @@
0.01: New Clock Nifty A ++ >> adding more information on the right side of the clock
0.02: Fix weather icon for languages other than English

42
apps/ffcniftyapp/app.js
View File

@ -1,5 +1,5 @@
const w = require("weather");
//const locale = require("locale");
const locale = require("locale");
// Weather icons from https://icons8.com/icon/set/weather/color
function getSun() {
@ -67,6 +67,33 @@ function chooseIcon(condition) {
return getPartSun;
} else return getErr;
}
/*
* Choose weather icon to display based on weather conditition code
* https://openweathermap.org/weather-conditions#Weather-Condition-Codes-2
*/
function chooseIconByCode(code) {
const codeGroup = Math.round(code / 100);
switch (codeGroup) {
case 2: return getStorm;
case 3: return getRain;
case 5:
switch (code) {
case 511: return getSnow;
default: return getRain;
}
case 6: return getSnow;
case 7: return getPartSun;
case 8:
switch (code) {
case 800: return getSun;
case 804: return getCloud;
default: return getPartSun;
}
default: return getCloud;
}
}
/*function condenseWeather(condition) {
condition = condition.toLowerCase();
if (condition.includes("thunderstorm") ||
@ -143,8 +170,17 @@ const clock = new ClockFace({
//let cWea =(curr === "no data" ? "no data" : curr.txt);
let cTemp= (curr === "no data" ? 273 : curr.temp);
// const temp = locale.temp(curr.temp - 273.15).match(/^(\D*\d*)(.*)$/);
let w_icon = chooseIcon(curr.txt === undefined ? "no data" : curr.txt );
//let w_icon = chooseIcon(curr.txt);
let w_icon = getErr;
if (locale.name === "en" || locale.name === "en_GB" || locale.name === "en_US") {
w_icon = chooseIcon(curr.txt === undefined ? "no data" : curr.txt);
} else {
// cannot use condition string to determine icon if language is not English; use weather code instead
const code = curr.code || -1;
if (code > 0) {
w_icon = chooseIconByCode(curr.code);
}
}
g.setFontAlign(1, 0).setFont("Vector", 90 * this.scale);
g.drawString(format(hour), this.centerTimeScaleX, this.center.y - 31 * this.scale);

2
apps/ffcniftyapp/metadata.json
View File

@ -1,7 +1,7 @@
{
"id": "ffcniftyapp",
"name": "Nifty-A Clock ++",
"version": "0.01",
"version": "0.02",
"description": "A nifty clock with time and date and more",
"dependencies": {"weather":"app"},
"icon": "app.png",