diff --git a/apps.json b/apps.json index 2852016d1..d136900f7 100644 --- a/apps.json +++ b/apps.json @@ -4722,7 +4722,7 @@ { "id": "weatherClock", "name": "Weather Clock", - "version": "0.02", + "version": "0.03", "description": "A clock which displays current weather conditions (requires Gadgetbridge and Weather apps).", "icon": "app.png", "screenshots": [{"url":"screens/screen1.png"}], diff --git a/apps/locale/locales.js b/apps/locale/locales.js index 2e29eb82a..034e7205e 100644 --- a/apps/locale/locales.js +++ b/apps/locale/locales.js @@ -191,6 +191,23 @@ var locales = { month: "januari,februari,maart,april,mei,juni,juli,augustus,september,oktober,november,december", trans: { yes: "ja", Yes: "Ja", no: "nee", No: "Nee", ok: "ok", on: "aan", off: "uit", "< Back": "< Terug" } }, + "en_NL": { // English date units with Dutch number, currency and navigation units. + lang: "en_NL", + decimal_point: ",", + thousands_sep: ".", + currency_symbol: "€", + int_curr_symbol: "EUR", + speed: "km/h", + distance: { 0: "m", 1: "km" }, + temperature: "°C", + ampm: { 0: "am", 1: "pm" }, + timePattern: { 0: "%HH:%MM:%SS ", 1: "%HH:%MM" }, + datePattern: { 0: "%b %d %Y", 1: "%d/%m/%Y" }, // Feb 28 2020" // "01/03/2020"(short) + abmonth: "Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec", + month: "January,February,March,April,May,June,July,August,September,October,November,December", + abday: "Sun,Mon,Tue,Wed,Thu,Fri,Sat", + day: "Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday", + }, "en_CA": { lang: "en_CA", decimal_point: ".", diff --git a/apps/weatherClock/ChangeLog b/apps/weatherClock/ChangeLog index f4a63e976..600f93be2 100644 --- a/apps/weatherClock/ChangeLog +++ b/apps/weatherClock/ChangeLog @@ -1,2 +1,3 @@ 0.01: New App! 0.02: Minor layout format tweak so it uses less memory and draws ok on Bangle.js 1 (#1012) +0.03: Minor layout extra spaces. diff --git a/apps/weatherClock/app.js b/apps/weatherClock/app.js index 46cc38312..9dd49427f 100644 --- a/apps/weatherClock/app.js +++ b/apps/weatherClock/app.js @@ -101,7 +101,7 @@ function draw() { var date = new Date(); clockLayout.time.label = locale.time(date, 1); clockLayout.date.label = locale.date(date, 1).toUpperCase(); - clockLayout.dow.label = locale.dow(date, 1).toUpperCase(); + clockLayout.dow.label = locale.dow(date, 1).toUpperCase() + " "; var weatherJson = getWeather(); if(weatherJson && weatherJson.weather){ var currentWeather = weatherJson.weather; @@ -110,7 +110,7 @@ function draw() { clockLayout.tempUnit.label = temp[2]; clockLayout.weatherIcon.src = chooseIcon(currentWeather.txt); const wind = locale.speed(currentWeather.wind).match(/^(\D*\d*)(.*)$/); - clockLayout.wind.label = wind[1] + " "; + clockLayout.wind.label = wind[1] + " ".repeat(wind[2].length-1); clockLayout.windUnit.label = wind[2] + " " + (currentWeather.wrose||'').toUpperCase(); } else{