bug fixes: setting screen not controlling language

- wrong screen version used for bangle 2

apps/slidingtext/slidingtext.dtfmt.js

@@ -7,6 +7,7 @@ class DateFormatter {
      * to the lines of text on the screen
      */
     name(){return "no name";}
+    shortName(){return "no short name"}
     formatDate(date){
         return ["no","date","defined"];
     }

apps/slidingtext/slidingtext.js

@@ -9,13 +9,13 @@ const color_schemes = [
     name: "white",
     background : [1.0,1.0,1.0],
     main_bar: [0.0,0.0,0.0],
-    other_bars: [0.25,0.25,0.25],
+    other_bars: [0.1,0.1,0.1],
   },
   {
     name: "black",
     background : [0.0,0.0,0.0],
     main_bar: [1.0,1.0,1.0],
-    other_bars: [1.0,1.0,1.0],
+    other_bars: [0.9,0.9,0.9],
   },
   {
     name: "red",
@@ -255,7 +255,7 @@ function bangleVersion(){
   return (g.getHeight()>200)? 1 : 2;
 }
 
-if (bangleVersion()>1)
+if (bangleVersion()<2)
   setRowDisplays(50, [40,30,30,30,40]);
 else
   setRowDisplays(34, [35,25,25,25,35]);
@@ -505,7 +505,7 @@ function set_colorscheme(colorscheme_name){
 function set_dateformat(dateformat_name){
   console.log("setting date format:" + dateformat_name);
   for (var i=0; i < date_formatters.length; i++) {
-    if(date_formatters[i].name() == dateformat_name){
+    if(date_formatters[i].shortName() == dateformat_name){
       date_formatter_idx = i;
       date_formatter = date_formatters[date_formatter_idx];
       console.log("match");
@@ -551,7 +551,7 @@ function load_settings(){
  */
 function save_settings(){
   var settings = {
-    date_format : date_formatter.name(),
+    date_format : date_formatter.shortName(),
     color_scheme : color_schemes[color_scheme_index].name,
     enable_live_controls: enable_live_controls
   };

apps/slidingtext/slidingtext.locale.de.js

@@ -66,6 +66,7 @@ function germanMinsToText(mins) {
 class GermanDateFormatter extends DateFormatter {
     constructor() { super();}
     name(){return "German";}
+    shortName(){return "de"}
     formatDate(date){
         var mins = date.getMinutes();
         var hourOfDay = date.getHours();

apps/slidingtext/slidingtext.locale.en.js

@@ -5,6 +5,7 @@ const numberToText = require("slidingtext.utils.en.js").numberToText;
 class EnglishDateFormatter extends DateFormatter {
     constructor() { super();}
     name(){return "English";}
+    shortName(){return "en"}
     formatDate(date){
         var hours_txt = hoursToText(date.getHours());
         var mins_txt = numberToText(date.getMinutes());

apps/slidingtext/slidingtext.locale.en2.js

@@ -7,6 +7,7 @@ class EnglishTraditionalDateFormatter extends DateFormatter {
         super();
     }
     name(){return "English (Traditional)";}
+    shortName(){return "en2"}
     formatDate(date){
         var mins = date.getMinutes();
         var hourOfDay = date.getHours();

apps/slidingtext/slidingtext.locale.es.js

@@ -47,6 +47,7 @@ function spanishMinsToText(mins){
 class SpanishDateFormatter extends DateFormatter {
     constructor() { super();}
     name(){return "Spanish";}
+    shortName(){return "es"}
     formatDate(date){
         var mins = date.getMinutes();
         var hourOfDay = date.getHours();

apps/slidingtext/slidingtext.locale.fr.js

@@ -31,6 +31,8 @@ function frenchHeures(hours){
 class FrenchDateFormatter extends DateFormatter {
     constructor() { super(); }
     name(){return "French";}
+    shortName(){return "fr"}
+    shortName(){return "jp"}
     formatDate(date){
         var hours = frenchHoursToText(date.getHours());
         var heures = frenchHeures(date.getHours());

apps/slidingtext/slidingtext.settings.js

@@ -53,7 +53,7 @@
             value: (settings.enable_live_controls !== undefined ? settings.enable_live_controls : true),
             format: v => v ? "On" : "Off",
             onchange: v => {
-                settings.enable_live_controls = v;
+                settings.enable_live_controls = (v == "On");
                 writeSettings();
             }
         },