diff --git a/apps.json b/apps.json index 7ec30b819..f5ffc3430 100644 --- a/apps.json +++ b/apps.json @@ -219,8 +219,8 @@ { "id": "slidingtext", "name": "Sliding Clock", "icon": "slidingtext.png", - "version":"0.03", - "description": "Inspired by the Pebble sliding clock, old times are scrolled off the screen and new times on. You are also able to change language on the fly so you can see the time written in other languages using button 1. Currently English, French, Japanese and Spanish are supported", + "version":"0.04", + "description": "Inspired by the Pebble sliding clock, old times are scrolled off the screen and new times on. You are also able to change language on the fly so you can see the time written in other languages using button 1. Currently English, French, Japanese, Spanish and German are supported", "tags": "clock", "type":"clock", "allow_emulator":true, @@ -235,6 +235,7 @@ {"name":"slidingtext.locale.es.js","url":"slidingtext.locale.es.js"}, {"name":"slidingtext.locale.fr.js","url":"slidingtext.locale.fr.js"}, {"name":"slidingtext.locale.jp.js","url":"slidingtext.locale.jp.js"}, + {"name":"slidingtext.locale.de.js","url":"slidingtext.locale.de.js"}, {"name":"slidingtext.dtfmt.js","url":"slidingtext.dtfmt.js"} ] }, diff --git a/apps/slidingtext/ChangeLog b/apps/slidingtext/ChangeLog index d762e384e..81f950a44 100644 --- a/apps/slidingtext/ChangeLog +++ b/apps/slidingtext/ChangeLog @@ -1,3 +1,4 @@ 0.01: Initial Release 0.02: Color Themes, Smoother scrolling 0.03: Added Spanish Language +0.04: Added German Language diff --git a/apps/slidingtext/README.md b/apps/slidingtext/README.md index cc802638a..d2d2fb5b6 100644 --- a/apps/slidingtext/README.md +++ b/apps/slidingtext/README.md @@ -13,6 +13,8 @@ Use Button 1 (the top right button) to change the language | English | English (Traditional) | French | Japanese (Romanji) | | ---- | ---- | ---- | ---- | | ![](./format-01.jpg) | ![](format-02.jpg) | ![](format-03.jpg) |![](format-04.jpg) | +| **German** | **Spanish** | | | +| ![](./format-05.jpg) | ![](format-06.jpg) | | | ### Button 3 Button 3 (bottom right button) is used to change the colour diff --git a/apps/slidingtext/custom.html b/apps/slidingtext/custom.html index 5023d9a3d..5e89e230b 100644 --- a/apps/slidingtext/custom.html +++ b/apps/slidingtext/custom.html @@ -4,7 +4,7 @@ -

Please select watch languages

+

Please select watch languages (Max 3, only the first 3 selected will be loaded)

@@ -24,7 +24,8 @@ {name:"English(Traditional)",shortname:"en2"}, {name:"French",shortname:"fr"}, {name:"Japanese",shortname:"jp"}, - {name:"Spanish",shortname:"es"} + {name:"Spanish",shortname:"es"}, + {name:"German",shortname:"de"} ]; var selected_languages = ["en","es","jp"]; try{ @@ -51,7 +52,7 @@ for (var i=0; i' + hourOfDay + ' hours text->' + hours) + // Deal with the special times first + if(mins == 0){ + var hours = germanHoursToText(hourOfDay); + return [hours,"UHR", "","",""]; + } /*else if(mins == 30){ + var hours = germanHoursToText(hourOfDay+1); + return ["", "", "HALB","", hours]; + } else if(mins == 15){ + var hours = germanHoursToText(hourOfDay); + return ["", "", "VIERTEL", "NACH",hours]; + } else if(mins == 45) { + var hours = germanHoursToText(hourOfDay+1); + return ["", "", "VIERTEL", "VOR",hours]; + } */ else { + var mins_txt = germanMinsToText(mins); + return [hours, "UHR", mins_txt[0],mins_txt[1]]; + } + } +} + +module.exports = GermanDateFormatter; \ No newline at end of file diff --git a/apps/slidingtext/slidingtext.locale.fr.js b/apps/slidingtext/slidingtext.locale.fr.js index 3cdfe9de1..5844c1a4e 100644 --- a/apps/slidingtext/slidingtext.locale.fr.js +++ b/apps/slidingtext/slidingtext.locale.fr.js @@ -46,12 +46,12 @@ class FrenchDateFormatter extends DateFormatter { } else if(mins == 30){ return [hours, heures,'ET DEMIE']; } else if(mins == 15){ - return [hours, heures,'ET QUERT']; + return [hours, heures,'ET QUART']; } else if(mins == 45){ var next_hour = date.getHours() + 1; hours = frenchHoursToText(next_hour); heures = frenchHeures(next_hour); - return [hours, heures,"MOINS",'LET QUERT']; + return [hours, heures,"MOINS",'LET QUART']; } if(mins > 30){ var to_mins = 60-mins;