From e3721a96009daa990ebc84038194e005b7ae5426 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Mon, 25 Nov 2013 14:06:18 +0100 Subject: [PATCH] =?UTF-8?q?englische=20=C3=BCbersetzung=20gemacht,=20"uhr"?= =?UTF-8?q?=20bzw.=20"o'clock"=20aktiviert=20zur=20vollen=20stunde?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 2 ++ uhr-de.js | 4 ++-- uhr-de_CH.js | 2 +- uhr-en.js | 16 ++++++++++++++++ uhr.js | 3 +++ 5 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 uhr-en.js diff --git a/index.html b/index.html index 05d035f..f3e1dc8 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,7 @@ + @@ -30,6 +31,7 @@
diff --git a/uhr-de.js b/uhr-de.js index 93af349..efe2bf8 100644 --- a/uhr-de.js +++ b/uhr-de.js @@ -1,5 +1,5 @@ layout['de'] = { - language: "Deutsch", + 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)], @@ -10,7 +10,7 @@ layout['de'] = { [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')] + [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', 'sharphour'),l('H', 'sharphour'),l('R', 'sharphour')] ] }; diff --git a/uhr-de_CH.js b/uhr-de_CH.js index 5e8c3ba..59f63df 100644 --- a/uhr-de_CH.js +++ b/uhr-de_CH.js @@ -1,5 +1,5 @@ layout['de_CH'] = { - language: "Bärndütsch", + language: 'Bärndütsch', values: [ [l('E', 'on'), l('S', 'on'),l('K'),l('I', 'on'),l('S', 'on'),l('C', 'on'),l('H', 'on'),l('A'),m('F', 5, 25, 35, 55),m('Ü', 5, 25, 35, 55),m('F', 5, 25, 35, 55)], [m('V', 15, 45), m('I', 15, 45),m('E', 15, 45),m('R', 15, 45),m('T', 15, 45),m('U', 15, 45),l('B'),l('F'),m('Z', 10, 50),m('Ä', 10, 50),m('Ä', 10, 50)], diff --git a/uhr-en.js b/uhr-en.js new file mode 100644 index 0000000..c2d7714 --- /dev/null +++ b/uhr-en.js @@ -0,0 +1,16 @@ +layout['en'] = { + language: 'English', + values: [ + [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')], + [m('H', 30), m('A', 30),m('L', 30),m('F', 30),l('B'),m('T', 10, 50),m('E', 10, 50),m('N', 10, 50),l('F'),m('T', 35, 40, 45, 50, 55),m('O', 35, 40, 45, 50, 55)], + [m('P', 5, 10, 15, 20, 25, 30),m('A', 5, 10, 15, 20, 25, 30),m('S', 5, 10, 15, 20, 25, 30),m('T', 5, 10, 15, 20, 25, 30),l('E'),l('R'),l('U'),h('N', 9),h('I', 9),h('N', 9),h('E', 9)], + [h('O', 1), h('N', 1),h('E', 1),h('S', 6),h('I', 6),h('X', 6),h('T', 3),h('H', 3),h('R', 3),h('E', 3),h('E', 3)], + [h('F', 4), h('O', 4),h('U', 4),h('R', 4),h('F', 5),h('I', 5),h('V', 5),h('E', 5),h('T', 2),h('W', 2),h('O', 2)], + [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('V', 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')] + ] +}; + diff --git a/uhr.js b/uhr.js index 676dc35..4aec6ac 100644 --- a/uhr.js +++ b/uhr.js @@ -23,6 +23,9 @@ function highlightCurrentTime() { highlight('minute' + coarseMinute); hour = normalizeHour(hour); highlight('hour' + hour); + if (coarseMinute == 0) { + highlight('sharphour'); + } } function getHour(date) { if (typeof currentLayout.getHour === 'function') {