Merge branch 'develop' into feature/new-splashscreen

2014-12-05 21:06:59 +01:00 · 2014-12-05 21:06:59 +01:00 · e5b9ab35aa
parent 337fb6f238 78eea9ac1e
commit e5b9ab35aa
7 changed files with 174 additions and 4 deletions
--- a/README.md
+++ b/README.md
@ -31,8 +31,10 @@ Beim Einbinden muss das attribut `data-class` angegeben werden, welches die CSS-
 	* uhr-de_CH_genau.js
 	* uhr-de.js
 	* uhr-en.js
+	* uhr-es.js
 	* uhr-fr.js
 	* uhr-it.js
+	* uhr-nl.js

 `uhr-de_CH_genau.js` ist eine Variante von Berndeutsch, bei der zur vollen Stunde zusätzlich das Wort "genau" angezeigt wird (also z.B. um 15:00 Uhr "ES ISCH GENAU DRÜ").

@ -75,7 +77,7 @@ Der uhr()-Methode kann ein Options-Objekt mitgegeben werden:
 	jQuery('#uhrcontainer').uhr({
 		status: 'on',      // 'on' (default) oder 'off'
 		theme: 'black',    // 'black' (default), 'white', 'red', 'yellow', 'green', 'blue' oder 'pink' (je nach eingebundenen Theme-Stylesheets)
-		language: 'de_CH', // 'de_CH' (default), 'de_CH_genau', 'de', 'en', 'fr' oder 'it' (je nach eingebundenen Sprachdateien)
+		language: 'de_CH', // 'de_CH' (default), 'de_CH_genau', 'de', 'en', 'es', 'fr', 'it' oder 'nl' (je nach eingebundenen Sprachdateien)
 		mode: 'normal',    // 'normal' (default): Die Uhr zeigt die aktuelle Zeit (Stunden und Minuten) in Worten an
 		                   // 'seconds': Die Uhr zeigt die aktuellen Sekunden als grosse Ziffern an
 		width: '100%',     // eine CSS-Grössenangabe (default: 100%)
--- a/2
+++ b/2
@ -1 +1 @@
-6.4
+6.6
--- a/index.html
+++ b/index.html
@ -45,6 +45,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    <script type="text/javascript" src="js/uhr-en.js"></script>
    <script type="text/javascript" src="js/uhr-fr.js"></script>
    <script type="text/javascript" src="js/uhr-it.js"></script>
+    <script type="text/javascript" src="js/uhr-es.js"></script>
+    <script type="text/javascript" src="js/uhr-nl.js"></script>
    <script type="text/javascript">
        function go(url) {
            window.location = url;
--- a/info/index.html
+++ b/info/index.html
@ -108,8 +108,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
        &lt;script type="text/javascript" src="uhr-de_CH_genau.js"&gt;&lt;/script&gt;
        &lt;script type="text/javascript" src="uhr-de.js"&gt;&lt;/script&gt;
        &lt;script type="text/javascript" src="uhr-en.js"&gt;&lt;/script&gt;
+        &lt;script type="text/javascript" src="uhr-es.js"&gt;&lt;/script&gt;
        &lt;script type="text/javascript" src="uhr-fr.js"&gt;&lt;/script&gt;
-        &lt;script type="text/javascript" src="uhr-it.js"&gt;&lt;/script&gt;</code>
+        &lt;script type="text/javascript" src="uhr-it.js"&gt;&lt;/script&gt;
+        &lt;script type="text/javascript" src="uhr-nl.js"&gt;&lt;/script&gt;</code>
 </p>

 <p>Von den Stylesheets zwingend ist <code>uhr.css</code> und mindestens eines der Farbschema-Stylesheets. Die
--- a/js/uhr-es.js
+++ b/js/uhr-es.js
@ -0,0 +1,80 @@
+/*
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+(function($) {
+    'use strict';
+    var es_la = {1: [1, 2, 6, 7]};
+    var son_las = {1: [2, 3, 4, 6, 7, 8]};
+    var y = {7: [6]};
+    var menos = {7: [7, 8, 9, 10, 11]};
+    var media = {10: [1, 2, 3, 4, 5]};
+    var cinco = {9: [7, 8, 9, 10, 11]};
+    var diez = {8: [8, 9, 10, 11]};
+    var cuarto = {10: [6, 7, 8, 9, 10, 11]};
+    var veinte = {8: [2, 3, 4, 5, 6, 7]};
+    var veinticinco = {9: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]};
+
+    var layout = {
+        "version": 2,
+        "language": 'Español',
+        "letters": [
+            'ESONELASUNA',
+            'DOSITRESORE',
+            'CUATROCINCO',
+            'SEISASIETEN',
+            'OCHONUEVEYO',
+            'LADIEZSONCE',
+            'DOCELYMENOS',
+            'OVEINTEDIEZ',
+            'VEINTICINCO',
+            'MEDIACUARTO'
+        ],
+        "permanent": [],
+        "minutes": {
+            "5,6,7,8,9": [y, cinco],
+            "10,11,12,13,14": [y, diez],
+            "15,16,17,18,19": [y, cuarto],
+            "20,21,22,23,24": [y, veinte],
+            "25,26,27,28,29": [y, veinticinco],
+            "30,31,32,33,34": [y, media],
+            "35,36,37,38,39": [menos, veinticinco],
+            "40,41,42,43,44": [menos, veinte],
+            "45,46,47,48,49": [menos, cuarto],
+            "50,51,52,53,54": [menos, diez],
+            "55,56,57,58,59": [menos, cinco]
+        },
+        "hours": {
+            "0,12": [son_las, {7: [1, 2, 3, 4]}],
+            "1,13": [es_la, {1: [9, 10, 11]}],
+            "2,14": [son_las, {2: [1, 2, 3]}],
+            "3,15": [son_las, {2: [5, 6, 7, 8]}],
+            "4,16": [son_las, {3: [1, 2, 3, 4, 5, 6]}],
+            "5,17": [son_las, {3: [7, 8, 9, 10, 11]}],
+            "6,18": [son_las, {4: [1, 2, 3, 4]}],
+            "7,19": [son_las, {4: [6, 7, 8, 9, 10]}],
+            "8,20": [son_las, {5: [1, 2, 3, 4]}],
+            "9,21": [son_las, {5: [5, 6, 7, 8, 9]}],
+            "10,22": [son_las, {6: [3, 4, 5, 6]}],
+            "11,23": [son_las, {6: [8, 9, 10, 11]}]
+        },
+        "getHour": function(date) {
+            var hour = date.getHours();
+            if (date.getMinutes() >= 35) {
+                return (hour + 1) % 24;
+            }
+            return hour;
+        }
+    };
+    $.fritteli.uhr.register('es', layout);
+}(jQuery));
--- a/js/uhr-nl.js
+++ b/js/uhr-nl.js
@ -0,0 +1,82 @@
+/*
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+(function($) {
+    'use strict';
+    var het_is = {1: [1, 2, 3, 5, 6]};
+    var over1 = {3: [1, 2, 3, 4]};
+    var voor1 = {2: [8, 9, 10, 11]};
+    var over2 = {4: [8, 9, 10, 11]};
+    var voor2 = {5: [1, 2, 3, 4]};
+    var half = {4: [1, 2, 3, 4]};
+    var vijf = {1: [8, 9, 10, 11]};
+    var tien = {2: [1, 2, 3, 4]};
+    var kwart = {3: [7, 8, 9, 10, 11]};
+    var vijftien = [vijf, tien];
+    var uur = {10: [9, 10, 11]};
+
+    var layout = {
+        "version": 2,
+        "language": 'Nederlands',
+        "letters": [
+            'HETKISAVIJF',
+            'TIENBTZVOOR',
+            'OVERMEKWART',
+            'HALFSPWOVER',
+            'VOORTHGEENS',
+            'TWEEPVCDRIE',
+            'VIERVIJFZES',
+            'ZEVENONEGEN',
+            'ACHTTIENELF',
+            'TWAALFBFUUR'
+        ],
+        "permanent": het_is,
+        "minutes": {
+            "0,1,2,3,4": uur,
+            "5,6,7,8,9": [vijf, over1],
+            "10,11,12,13,14": [tien, over1],
+            "15,16,17,18,19": [kwart, over2],
+            "20,21,22,23,24": [tien, voor1, half],
+            "25,26,27,28,29": [vijf, voor1, half],
+            "30,31,32,33,34": half,
+            "35,36,37,38,39": [vijf, over1, half],
+            "40,41,42,43,44": [tien, over1, half],
+            "45,46,47,48,49": [kwart, voor2],
+            "50,51,52,53,54": [tien, voor1],
+            "55,56,57,58,59": [vijf, voor1]
+        },
+        "hours": {
+            "0,12": {10: [1, 2, 3, 4, 5, 6]},
+            "1,13": {5: [8, 9, 10]},
+            "2,14": {6: [1, 2, 3, 4]},
+            "3,15": {6: [8, 9, 10, 11]},
+            "4,16": {7: [1, 2, 3, 4]},
+            "5,17": {7: [5, 6, 7, 8]},
+            "6,18": {7: [9, 10, 11]},
+            "7,19": {8: [1, 2, 3, 4, 5]},
+            "8,20": {9: [1, 2, 3, 4]},
+            "9,21": {8: [7, 8, 9, 10, 11]},
+            "10,22": {9: [5, 6, 7, 8]},
+            "11,23": {9: [9, 10, 11]}
+        },
+        "getHour": function(date) {
+            var hour = date.getHours();
+            if (date.getMinutes() >= 20) {
+                return (hour + 1) % 24;
+            }
+            return hour;
+        }
+    };
+    $.fritteli.uhr.register('nl', layout);
+}(jQuery));
--- a/manifest.appcache
+++ b/manifest.appcache
@ -1,5 +1,5 @@
 CACHE MANIFEST
-# 6.4
+# 6.6

 css/uhr.css
 css/uhr-black.css
@ -16,8 +16,10 @@ js/uhr-de.js
 js/uhr-de_CH.js
 js/uhr-de_CH_genau.js
 js/uhr-en.js
+js/uhr-es.js
 js/uhr-fr.js
 js/uhr-it.js
+js/uhr-nl.js
 lib/jquery-2.1.0.min.js
 lib/jquery-cookie-1.4.0.js
 lib/jquery-ui-1.10.4.custom.min.js
 @ -1 +1 @@
 .4
 .6