migrating en to v2, first step

uhr-en.js

@@ -12,9 +12,20 @@ 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_isch": {1:[1,2,4,5,6,7]},
+	"_ab": {4:[1,2]},
+	"_vor": {3:[9,10,11]},
+	"_haubi": {4:[4,5,6,7,8]},
+	"_5": {1:[9,10,11]},
+	"_10": {2:[9,10,11]},
+	"_15": {2:[1,2,3,4,5,6]},
+	"_20": {3:[1,2,3,4,5,6]}
+};
 var layout = {
-	language: 'English',
+	"version": 2,
-	values: [
+	"language": 'English',
+	/*
 		[l('I', 'on'), l('T', 'on'),l('L'),l('I', 'on'),l('S', 'on'),l('B'),l('F'),l('A'),l('M'),l('P'),l('M')],
 		[m('A', 15, 45), l('C'),m('Q', 15, 45),m('U', 15, 45),m('A', 15, 45),m('R', 15, 45),m('T', 15, 45),m('E', 15, 45),m('R', 15, 45),l('D'),l('C')],
 		[m('T', 20, 25, 35, 40), m('W', 20, 25, 35, 40),m('E', 20, 25, 35, 40),m('N', 20, 25, 35, 40),m('T', 20, 25, 35, 40),m('Y', 20, 25, 35, 40),m('F', 5, 25, 35, 55),m('I', 5, 25, 35, 55),m('V', 5, 25, 35, 55),m('E', 5, 25, 35, 55),l('X')],
@@ -25,8 +36,48 @@ var layout = {
 		[h('E', 8), h('I', 8),h('G', 8),h('H', 8),h('T', 8),h('E', 11),h('L', 11),h('E', 11),h('V', 11),h('E', 11),h('N', 11)],
 		[h('S', 7), h('E', 7),h('V', 7),h('E', 7),h('N', 7),h('T', 12),h('W', 12),h('E', 12),h('L', 12),h('V', 12),h('E', 12)],
 		[h('T', 10), h('E', 10),h('N', 10),l('S'),l('E'),l('O', 'sharphour'),l('C', 'sharphour'),l('L', 'sharphour'),l('O', 'sharphour'),l('C', 'sharphour'),l('K', 'sharphour')]
+	*/
+	"letters": [
+		'ITLISBFAMPM',
+		'ACQUARTERDC',
+		'TWENTYFIVEX',
+		'HALFBTENFTO',
+		'PASTERUNINE',
+		'ONESIXTHREE',
+		'FOURFIVETWO',
+		'EIGHTELEVEN',
+		'SEVENTWELVE',
+		'TENSEOCLOCK'
 		],
-	getHour: function(date) {
+	"permanent": h._es_isch,
+	"minutes": {
+		"5,6,7,8,9": [h._5, h._ab],
+		"10,11,12,13,14": [h._10, h._ab],
+		"15,16,17,18,19": [h._15, h._ab],
+		"20,21,22,23,24": [h._20, h._ab],
+		"25,26,27,28,29": [h._5, h._vor, h._haubi],
+		"30,31,32,33,34": [h._haubi],
+		"35,36,37,38,39": [h._5, h._ab, h._haubi],
+		"40,41,42,43,44": [h._20, h._vor],
+		"45,46,47,48,49": [h._15, h._vor],
+		"50,51,52,53,54": [h._10, h._vor],
+		"55,56,57,58,59": [h._5, h._vor]
+	},
+	"hours": {
+		"1": {5:[1,2,3]},
+		"2": {5:[4,5,6,7]},
+		"3": {5:[9,10,11]},
+		"4": {6:[1,2,3,4,5]},
+		"5": {6:[6,7,8,9]},
+		"6": {7:[1,2,3,4,5,6]},
+		"7": {7:[7,8,9,10,11]},
+		"8": {8:[1,2,3,4,5]},
+		"9": {8:[6,7,8,9]},
+		"10": {9:[1,2,3,4]},
+		"11": {9:[8,9,10,11]},
+		"12": {10:[1,2,3,4,5,6]}
+	},
+	"getHour": function(date) {
 		var hour = date.getHours();
 		if (date.getMinutes() >= 35) {
 			return hour + 1;