From c1961d7fcaca739040a9d29e817de74ee54ee62f Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Thu, 26 Jun 2014 16:38:30 +0200
Subject: [PATCH] migrated de to v2

---
 uhr-de.js | 66 ++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 53 insertions(+), 13 deletions(-)

diff --git a/uhr-de.js b/uhr-de.js
index 7c0d461..e1f0722 100644
--- a/uhr-de.js
+++ b/uhr-de.js
@@ -12,19 +12,59 @@ 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/>.
 */
+var h = {
+	"_es_ist": {1:[1,2,4,5,6]},
+	"_nach": {4:[8,9,10,11]},
+	"_vor": {4:[1,2,3]},
+	"_halb": {5:[1,2,3,4]},
+	"_5": {1:[8,9,10,11]},
+	"_10": {2:[1,2,3,4]},
+	"_15": {3:[5,6,7,8,9,10,11]},
+	"_20": {2:[5,6,7,8,9,10,11]},
+	"_45": {3:[1,2,3,4,5,6,7,8,9,10,11]}
+};
 var layout = {
-	language: 'Deutsch',
-	values: [
-		[l('E', 'on'), l('S', 'on'),l('K'),l('I', 'on'),l('S', 'on'),l('T', 'on'),l('A'),m('F', 5, 25, 35, 55),m('Ü', 5, 25, 35, 55),m('N', 5, 25, 35, 55),m('F', 5, 25, 35, 55)],
-		[m('Z', 10, 50), m('E', 10, 50),m('H', 10, 50),m('N', 10, 50),m('Z', 20, 40),m('W', 20, 40),m('A', 20, 40),m('N', 20, 40),m('Z', 20, 40),m('I', 20, 40),m('G', 20, 40)],
-		[m('D', 45), m('R', 45),m('E', 45),m('I', 45),m('V', 15, 45),m('I', 15, 45),m('E', 15, 45),m('R', 15, 45),m('T', 15, 45),m('E', 15, 45),m('L', 15, 45)],
-		[m('V', 25, 40, 50, 55), m('O', 25, 40, 50, 55),m('R', 25, 40, 50, 55),l('F'),l('U'),l('N'),l('K'),m('N', 5, 10, 15, 20, 35),m('A', 5, 10, 15, 20, 35),m('C', 5, 10, 15, 20, 35),m('H', 5, 10, 15, 20, 35)],
-		[m('H', 25, 30, 35),m('A', 25, 30, 35),m('L', 25, 30, 35),m('B', 25, 30, 35),l('A'),h('E', 11),h('L', 11),h('F', 5, 11),h('Ü', 5),h('N', 5),h('F', 5)],
-		[h('E', 1), h('I', 1),h('N', 1),h('S', 1),l('X'),l('A'),l('M'),h('Z', 2),h('W', 2),h('E', 2),h('I', 2)],
-		[h('D', 3), h('R', 3),h('E', 3),h('I', 3),l('P'),l('M'),l('J'),h('V', 4),h('I', 4),h('E', 4),h('R', 4)],
-		[h('S', 6), h('E', 6),h('C', 6),h('H', 6),h('S', 6),l('N'),l('L'),h('A', 8),h('C', 8),h('H', 8),h('T', 8)],
-		[h('S', 7), h('I', 7),h('E', 7),h('B', 7),h('E', 7),h('N', 7),h('Z', 12),h('W', 12),h('Ö', 12),h('L', 12),h('F', 12)],
-		[h('Z', 10), h('E', 10),h('H', 10),h('N', 9, 10),h('E', 9),h('U', 9),h('N', 9),l('K'),l('U'),l('H'),l('R')]
-	]
+	"version": 2,
+	"language": 'Deutsch',
+	"letters": [
+		'ESKISTAFÜNF',
+		'ZEHNZWANZIG',
+		'DREIVIERTEL',
+		'VORFUNKNACH',
+		'HALBAELFÜNF',
+		'EINSXAMZWEI',
+		'DREIPMJVIER',
+		'SECHSNLACHT',
+		'SIEBENZWÖLF',
+		'ZEHNEUNKUHR'
+		],
+	"permanent": h._es_ist,
+	"minutes": {
+		"5,6,7,8,9": [h._5, h._nach],
+		"10,11,12,13,14": [h._10, h._nach],
+		"15,16,17,18,19": [h._15, h._nach],
+		"20,21,22,23,24": [h._20, h._nach],
+		"25,26,27,28,29": [h._5, h._vor, h._halb],
+		"30,31,32,33,34": [h._halb],
+		"35,36,37,38,39": [h._5, h._nach, h._halb],
+		"40,41,42,43,44": [h._20, h._vor],
+		"45,46,47,48,49": h._45,
+		"50,51,52,53,54": [h._10, h._vor],
+		"55,56,57,58,59": [h._5, h._vor]
+	},
+	"hours": {
+		"1": {6:[1,2,3,4]},
+		"2": {6:[8,9,10,11]},
+		"3": {3:[1,2,3,4]},
+		"4": {7:[8,9,10,11]},
+		"5": {5:[8,9,10,11]},
+		"6": {8:[1,2,3,4,5]},
+		"7": {9:[1,2,3,4,5,6]},
+		"8": {8:[8,9,10,11]},
+		"9": {10:[4,5,6,7]},
+		"10": {10:[1,2,3,4]},
+		"11": {5:[6,7,8]},
+		"12": {9:[7,8,9,10,11]}
+	}
 };
 window._uhr.languages['de'] = layout;