Merge remote-tracking branch 'upstream/master'

apps.json

@@ -65,7 +65,7 @@
   { "id": "locale",
     "name": "Languages",
     "icon": "locale.png",
-    "version":"0.05",
+    "version":"0.06",
     "description": "Translations for different countries",
     "tags": "tool,system,locale,translate",
     "type": "locale",
@@ -318,9 +318,9 @@
   { "id": "files",
     "name": "App Manager",
     "icon": "files.png",
-    "version":"0.01",
+    "version":"0.02",
     "description": "Show currently installed apps, free space, and allow their deletion from the watch",
-    "tags": "tool,system",
+    "tags": "tool,system,files",
     "storage": [
       {"name":"files.app.js","url":"files.js"},
       {"name":"files.img","url":"files-icon.js","evaluate":true}

apps/files/files.js

@@ -32,9 +32,7 @@ function showMainMenu() {
 
 function eraseApp(app) {
   E.showMessage('Erasing\n' + app.name + '...');
-  storage.erase(app['']);
-  storage.erase(app.icon);
-  storage.erase(app.src);
+  app.files.split(",").forEach(f=>storage.erase(f));
 }
 
 function showAppMenu(app) {

apps/locale/ChangeLog

@@ -4,3 +4,5 @@
 0.04: Add function meridian
 0.05: Inline locale details - faster, less memory overhead
       Add correct scaling for speed/distance/temperature
+0.06: Remove translations if not required
+      Ensure 'on' is always supplied for translations

apps/locale/locale.html

@@ -50,6 +50,7 @@ exports = { name : "en_GB", currencySym:"£",
       // do some sanity checks
       Object.keys(locales).forEach(function(localeName) {
         var locale = locales[localeName];
+        if (locale.trans && !locale.trans.on) console.error(localeName+": If translations are provided, 'on' *must* be included");
         if (distanceUnits[locale.distance[0]]===undefined) console.error(localeName+": Unknown distance unit "+locale.distance[0]);
         if (distanceUnits[locale.distance[1]]===undefined) console.error(localeName+": Unknown distance unit "+locale.distance[1]);
         if (speedUnits[locale.speed]===undefined) console.error(localeName+": Unknown speed unit "+locale.speed);
@@ -131,7 +132,7 @@ exports  = {
   distance: n => (n < ${distanceUnits[locale.distance[1]]}) ? Math.round(n/${distanceUnits[locale.distance[0]]}) + ${js(locale.distance[0])} : Math.round(n/${distanceUnits[locale.distance[1]]}) + ${js(locale.distance[1])},
   speed: s => Math.round(s/${speedUnits[locale.speed]}) + ${js(locale.speed)},
   temp: t => Math.round(${temperature}) + ${js(locale.temperature)},
-  translate: s => {var t=${js(locale.trans)};s=""+s;return t[s]||t[s.toLowerCase()]||s;},
+  translate: s => ${locale.trans?`{var t=${js(locale.trans)};s=""+s;return t[s]||t[s.toLowerCase()]||s;}`:`s`},
   date: (d,short) =>  (short) ? \`${dateS}\`: \`${dateN}\`,
   time: (d,short) =>  (short) ? \`${timeS}\`: \`${timeN}\`,
   meridian: d => (d.getHours() <= 12) ? ${js(locale.ampm[0])}:${js(locale.ampm[1])},

apps/locale/locales.js

@@ -49,7 +49,8 @@ var locales = {
       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",
-      trans: { /*yes: "yes", Yes: "Yes", no: "no", No: "No", ok: "ok", on: "on", off: "off"*/ }},
+      // No translation for english...
+    },
     "de_DE": {
         lang: "de_DE",
         decimal_point: ",",
@@ -83,7 +84,8 @@ var locales = {
         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",
-        trans: { yes: "yes", Yes: "Yes", no: "no", No: "No", ok: "ok", on: "on", off: "off" }},
+        // No translation for english...
+    },
     "en_JP": { // we do not have the font, so it is not ja_JP
         lang: "en_JP",
         decimal_point: ".",
@@ -100,7 +102,8 @@ var locales = {
         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",
-        trans: { yes: "yes", Yes: "Yes", no: "no", No: "No", ok: "ok", on: "on", off: "off" }},
+        // No translation for english...
+    },
     "nl_NL": {
         lang: "nl_NL",
         decimal_point: ",",
@@ -117,7 +120,8 @@ var locales = {
         day: "zondag,maandag,dinsdag,woensdag,donderdag,vrijdag,zaterdag",
         abmonth: "jan,feb,mrt,apr,mei,jun,jul,aug,sep,okt,nov,dec",
         month: "januari,februari,maart,april,mei,juni,juli,augustus,september,oktober,november,december",
-        trans: { yes: "yes", Yes: "Yes", no: "no", No: "No", ok: "ok", on: "on", off: "off" }},
+        // No translation for english...
+    },
     "en_CA": {
         lang: "en_CA",
         decimal_point: ".",
@@ -134,7 +138,8 @@ var locales = {
         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",
-        trans: { yes: "yes", Yes: "Yes", no: "no", No: "No", ok: "ok", on: "on", off: "off" }},
+        // No translation for english...
+    },
     "fr_FR": {
         lang: "fr_FR",
         decimal_point: ",",
@@ -185,7 +190,8 @@ var locales = {
         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",
-        trans: { yes: "yes", Yes: "Yes", no: "no", No: "No", ok: "ok", on: "on", off: "off" }},
+        // No translation for english...
+    },
     "de_AT": {
         lang: "de_AT",
         decimal_point: ",",
@@ -218,7 +224,8 @@ var locales = {
         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",
-        trans: { yes: "yes", Yes: "Yes", no: "no", No: "No", ok: "ok", on: "on", off: "off" }},
+        // No translation for english...
+    },
     "es_ES": {
         lang: "es_ES",
         decimal_point: ",",

apps/widpedom/widget.js

@@ -112,7 +112,7 @@
   });
 
   // add your widget
-  WIDGETS["wpedom"]={area:"tl",width:26,draw:draw,reload:Reload};
+  WIDGETS["wpedom"]={area:"tl",width:26,draw:draw,reload:reload};
   // Load data at startup
   let pedomData = require("Storage").readJSON(PEDOMFILE,1);
   if (pedomData) {