manuel/uhr
1
0
Fork 0
Code Issues 5 Pull requests Releases Wiki Activity

Merge branch 'feature/lang-fr' into 'develop'

Browse source 
Feature/Lang Fr
This commit is contained in:
Manuel Friedli 2014-06-28 22:16:52 +02:00
commit ff850fca64
10 changed files with 143 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -27,8 +27,12 @@ Beim Einbinden muss das attribut `data-class` angegeben werden, welches die CSS-
* uhr.js * uhr.js
* Binde mindestens eine der folgenden Javascript-Dateien im HTML ein, je nach dem, welche Sprachen deine Uhr unterstützen soll: * Binde mindestens eine der folgenden Javascript-Dateien im HTML ein, je nach dem, welche Sprachen deine Uhr unterstützen soll:
* uhr-de_CH.js * uhr-de_CH.js
* uhr-de_CH_genau.js
* uhr-de.js * uhr-de.js
* uhr-en.js * uhr-en.js
* uhr-fr.js
`uhr-de_CH_genau.js` ist eine Variante von Berndeutsch, bei der zur vollen Stunde zusätlich das Wort "genau" angezeigt wird (also z.B. "ES ISCH GENAU DRÜ").
2. Uhr-Element im HTML-Dokument einfügen 2. Uhr-Element im HTML-Dokument einfügen
---------------------------------------- ----------------------------------------

5
info/index.html
View file

@ -88,10 +88,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
&lt;script type="text/javascript" src="jquery-cookie-1.4.0.js"&gt;&lt;/script&gt; &lt;script type="text/javascript" src="jquery-cookie-1.4.0.js"&gt;&lt;/script&gt;
&lt;script type="text/javascript" src="uhr.js"&gt;&lt;/script&gt; &lt;script type="text/javascript" src="uhr.js"&gt;&lt;/script&gt;
&lt;script type="text/javascript" src="uhr-de_CH.js"&gt;&lt;/script&gt; &lt;script type="text/javascript" src="uhr-de_CH.js"&gt;&lt;/script&gt;
&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-de.js"&gt;&lt;/script&gt;
&lt;script type="text/javascript" src="uhr-en.js"&gt;&lt;/script&gt;</code> &lt;script type="text/javascript" src="uhr-en.js"&gt;&lt;/script&gt;
&lt;script type="text/javascript" src="uhr-fr.js"&gt;&lt;/script&gt;</code>
</p> </p>
<p>Von den Stylesheets zwingend ist <code>uhr.css</code> und mindestens eines der Farbschema-Stylesheets. Die Attribute <code>data-class</code> bzw. <code>data-name</code> definieren dabei die im Stylesheet deklarierte Klasse bzw. den im Auswahlmenu anzuzeigenden Namen. Der Name kann frei gewählt werden, die Style-Klasse muss mit der im Stylesheet definierten übereinstimmen.</p> <p>Von den Stylesheets zwingend ist <code>uhr.css</code> und mindestens eines der Farbschema-Stylesheets. Die Attribute <code>data-class</code> bzw. <code>data-name</code> definieren dabei die im Stylesheet deklarierte Klasse bzw. den im Auswahlmenu anzuzeigenden Namen. Der Name kann frei gewählt werden, die Style-Klasse muss mit der im Stylesheet definierten übereinstimmen.</p>
<p><code>uhr-de_CH_genau.js</code> ist eine Variante von Berndeutsch, bei der zur vollen Stunde zusätlich das Wort <tt>genau</tt> angezeigt wird (also z.B. <tt>ES ISCH GENAU DRÜ</tt>).</p>
<h4 id="clock-element">Uhr-Element auf der Seite</h4> <h4 id="clock-element">Uhr-Element auf der Seite</h4>
<p>Definiere an der Stelle, wo die Uhr angezeigt werden soll, ein leeres <code>&lt;div&gt;</code>-Element:<br/> <p>Definiere an der Stelle, wo die Uhr angezeigt werden soll, ein leeres <code>&lt;div&gt;</code>-Element:<br/>
<code>&lt;div id="meine-uhr"&gt;&lt;/div&gt;</code> <code>&lt;div id="meine-uhr"&gt;&lt;/div&gt;</code>

3
manifest.appcache
View file

@ -1,5 +1,5 @@
CACHE MANIFEST CACHE MANIFEST
# 6.0.0.1 # 6.1
COPYING COPYING
README.md README.md
@ -15,6 +15,7 @@ uhr-de.js
uhr-de_CH.js uhr-de_CH.js
uhr-de_CH_genau.js uhr-de_CH_genau.js
uhr-en.js uhr-en.js
uhr-fr.js
uhr-green.css uhr-green.css
uhr-pink.css uhr-pink.css
uhr-red.css uhr-red.css

1
showcase/index.html
View file

@ -43,6 +43,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<script type="text/javascript" src="../uhr-de_CH_genau.js"></script> <script type="text/javascript" src="../uhr-de_CH_genau.js"></script>
<script type="text/javascript" src="../uhr-de.js"></script> <script type="text/javascript" src="../uhr-de.js"></script>
<script type="text/javascript" src="../uhr-en.js"></script> <script type="text/javascript" src="../uhr-en.js"></script>
<script type="text/javascript" src="../uhr-fr.js"></script>
<script type="text/javascript"> <script type="text/javascript">
(function($) { (function($) {
var width = $(window).width(); var width = $(window).width();

26
uhr-de.js
View file

@ -37,7 +37,7 @@ var layout = {
'SECHSNLACHT', 'SECHSNLACHT',
'SIEBENZWÖLF', 'SIEBENZWÖLF',
'ZEHNEUNKUHR' 'ZEHNEUNKUHR'
], ],
"permanent": h._es_ist, "permanent": h._es_ist,
"minutes": { "minutes": {
"5,6,7,8,9": [h._5, h._nach], "5,6,7,8,9": [h._5, h._nach],
@ -53,18 +53,18 @@ var layout = {
"55,56,57,58,59": [h._5, h._vor] "55,56,57,58,59": [h._5, h._vor]
}, },
"hours": { "hours": {
"1": {6:[1,2,3,4]}, "0,12": {9:[7,8,9,10,11]},
"2": {6:[8,9,10,11]}, "1,13": {6:[1,2,3,4]},
"3": {7:[1,2,3,4]}, "2,14": {6:[8,9,10,11]},
"4": {7:[8,9,10,11]}, "3,15": {7:[1,2,3,4]},
"5": {5:[8,9,10,11]}, "4,16": {7:[8,9,10,11]},
"6": {8:[1,2,3,4,5]}, "5,17": {5:[8,9,10,11]},
"7": {9:[1,2,3,4,5,6]}, "6,18": {8:[1,2,3,4,5]},
"8": {8:[8,9,10,11]}, "7,19": {9:[1,2,3,4,5,6]},
"9": {10:[4,5,6,7]}, "8,20": {8:[8,9,10,11]},
"10": {10:[1,2,3,4]}, "9,21": {10:[4,5,6,7]},
"11": {5:[6,7,8]}, "10,22": {10:[1,2,3,4]},
"12": {9:[7,8,9,10,11]} "11,23": {5:[6,7,8]}
} }
}; };
window,_uhr.register('de', layout); window,_uhr.register('de', layout);

26
uhr-de_CH.js
View file

@ -40,7 +40,7 @@ var layout = {
'ACHTINÜNIEL', 'ACHTINÜNIEL',
'ZÄNIERBEUFI', 'ZÄNIERBEUFI',
'ZWÖUFINAUHR' 'ZWÖUFINAUHR'
], ],
// Permanent aktive Buchstaben. <array-or-object>, vgl. ausführliche Beschreibung bei "minutes". // Permanent aktive Buchstaben. <array-or-object>, vgl. ausführliche Beschreibung bei "minutes".
"permanent": h._es_isch, "permanent": h._es_isch,
/* /*
@ -78,18 +78,18 @@ var layout = {
}, },
// Die Stunden; gleiches Format wie bei den Minuten // Die Stunden; gleiches Format wie bei den Minuten
"hours": { "hours": {
"1": {5:[1,2,3]}, "0,12": {10:[1,2,3,4,5,6]},
"2": {5:[4,5,6,7]}, "1,13": {5:[1,2,3]},
"3": {5:[9,10,11]}, "2,14": {5:[4,5,6,7]},
"4": {6:[1,2,3,4,5]}, "3,15": {5:[9,10,11]},
"5": {6:[6,7,8,9]}, "4,16": {6:[1,2,3,4,5]},
"6": {7:[1,2,3,4,5,6]}, "5,17": {6:[6,7,8,9]},
"7": {7:[7,8,9,10,11]}, "6,18": {7:[1,2,3,4,5,6]},
"8": {8:[1,2,3,4,5]}, "7,19": {7:[7,8,9,10,11]},
"9": {8:[6,7,8,9]}, "8,20": {8:[1,2,3,4,5]},
"10": {9:[1,2,3,4]}, "9,21": {8:[6,7,8,9]},
"11": {9:[8,9,10,11]}, "10,22": {9:[1,2,3,4]},
"12": {10:[1,2,3,4,5,6]} "11,23": {9:[8,9,10,11]}
} }
}; };
// Das Layout bei der Uhr unter dem Code "de_CH" registrieren. // Das Layout bei der Uhr unter dem Code "de_CH" registrieren.

26
uhr-de_CH_genau.js
View file

@ -37,7 +37,7 @@ var layout = {
'ACHTINÜNIEL', 'ACHTINÜNIEL',
'ZÄNIERBEUFI', 'ZÄNIERBEUFI',
'ZWÖUFINAUHR' 'ZWÖUFINAUHR'
], ],
"permanent": h._es_isch, "permanent": h._es_isch,
"minutes": { "minutes": {
"0": h._genau, "0": h._genau,
@ -54,18 +54,18 @@ var layout = {
"55,56,57,58,59": [h._5, h._vor] "55,56,57,58,59": [h._5, h._vor]
}, },
"hours": { "hours": {
"1": {5:[1,2,3]}, "0,12": {10:[1,2,3,4,5,6]},
"2": {5:[4,5,6,7]}, "1,13": {5:[1,2,3]},
"3": {5:[9,10,11]}, "2,14": {5:[4,5,6,7]},
"4": {6:[1,2,3,4,5]}, "3,15": {5:[9,10,11]},
"5": {6:[6,7,8,9]}, "4,16": {6:[1,2,3,4,5]},
"6": {7:[1,2,3,4,5,6]}, "5,17": {6:[6,7,8,9]},
"7": {7:[7,8,9,10,11]}, "6,18": {7:[1,2,3,4,5,6]},
"8": {8:[1,2,3,4,5]}, "7,19": {7:[7,8,9,10,11]},
"9": {8:[6,7,8,9]}, "8,20": {8:[1,2,3,4,5]},
"10": {9:[1,2,3,4]}, "9,21": {8:[6,7,8,9]},
"11": {9:[8,9,10,11]}, "10,22": {9:[1,2,3,4]},
"12": {10:[1,2,3,4,5,6]} "11,23": {9:[8,9,10,11]}
} }
}; };
window,_uhr.register('de_CH_genau', layout); window,_uhr.register('de_CH_genau', layout);

26
uhr-en.js
View file

@ -38,7 +38,7 @@ var layout = {
'EIGHTELEVEN', 'EIGHTELEVEN',
'SEVENTWELVE', 'SEVENTWELVE',
'TENSEOCLOCK' 'TENSEOCLOCK'
], ],
"permanent": h._it_is, "permanent": h._it_is,
"minutes": { "minutes": {
"0,1,2,3,4": h._o_clock, "0,1,2,3,4": h._o_clock,
@ -55,18 +55,18 @@ var layout = {
"55,56,57,58,59": [h._5, h._to] "55,56,57,58,59": [h._5, h._to]
}, },
"hours": { "hours": {
"1": {6:[1,2,3]}, "0,12": {9:[6,7,8,9,10,11]},
"2": {7:[9,10,11]}, "1,13": {6:[1,2,3]},
"3": {6:[7,8,9,10,11]}, "2,14": {7:[9,10,11]},
"4": {7:[1,2,3,4]}, "3,15": {6:[7,8,9,10,11]},
"5": {7:[5,6,7,8]}, "4,16": {7:[1,2,3,4]},
"6": {6:[4,5,6]}, "5,17": {7:[5,6,7,8]},
"7": {9:[1,2,3,4,5]}, "6,18": {6:[4,5,6]},
"8": {8:[1,2,3,4,5]}, "7,19": {9:[1,2,3,4,5]},
"9": {5:[8,9,10,11]}, "8,20": {8:[1,2,3,4,5]},
"10": {10:[1,2,3]}, "9,21": {5:[8,9,10,11]},
"11": {8:[6,7,8,9,10,11]}, "10,22": {10:[1,2,3]},
"12": {9:[6,7,8,9,10,11]} "11,23": {8:[6,7,8,9,10,11]}
}, },
"getHour": function(date) { "getHour": function(date) {
var hour = date.getHours(); var hour = date.getHours();

80
uhr-fr.js Normal file
View file

@ -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/>.
*/
var h = {
"_il_est": {1:[1,2,4,5,6]},
"_et": {8:[1,2]},
"_moins": {7:[1,2,3,4,5]},
"_demie": {10:[4,5,6,7,8]},
"_heures": {6:[6,7,8,9,10,11]},
"_le": {7:[7,8]},
"_5": {9:[7,8,9,10]},
"_10": {7:[9,10,11]},
"_15": {8:[4,5,6,7,8]},
"_20": {9:[1,2,3,4,5]},
"_25": {9:[1,2,3,4,5,6,7,8,9,10]}
};
var layout = {
"version": 2,
"language": 'Français',
"letters": [
'ILNESTODEUX',
'QUATRETROIS',
'NEUFUNESEPT',
'HUITSIXCINQ',
'MIDIXMINUIT',
'ONZERHEURES',
'MOINSOLEDIX',
'ETRQUARTPMD',
'VINGT-CINQU',
'ETSDEMIEPAM'
],
"permanent": h._il_est,
"minutes": {
"5,6,7,8,9": h._5,
"10,11,12,13,14": h._10,
"15,16,17,18,19": [h._et, h._15],
"20,21,22,23,24": h._20,
"25,26,27,28,29": h._25,
"30,31,32,33,34": [h._et, h._demie],
"35,36,37,38,39": [h._moins, h._25],
"40,41,42,43,44": [h._moins, h._20],
"45,46,47,48,49": [h._moins, h._le, h._15],
"50,51,52,53,54": [h._moins, h._10],
"55,56,57,58,59": [h._moins, h._5]
},
"hours": {
"0": {5:[6,7,8,9,10,11]},
"1,13": [{3:[5,6,7]}, h._heures],
"2,14": [{1:[8,9,10,11]}, h._heures],
"3,15": [{2:[7,8,9,10,11]}, h._heures],
"4,16": [{2:[1,2,3,4,5,6]}, h._heures],
"5,17": [{4:[8,9,10,11]}, h._heures],
"6,18": [{4:[5,6,7]}, h._heures],
"7,19": [{3:[8,9,10,11]}, h._heures],
"8,20": [{4:[1,2,3,4]}, h._heures],
"9,21": [{3:[1,2,3,4]}, h._heures],
"10,22": [{5:[3,4,5]}, h._heures],
"11,23": [{6:[1,2,3,4]}, h._heures],
"12": {5:[1,2,3,4]}
},
"getHour": function(date) {
var hour = date.getHours();
if (date.getMinutes() >= 35) {
return hour + 1;
}
return hour;
}
};
window,_uhr.register('fr', layout);

13
uhr.js
View file

@ -151,11 +151,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
this._highlight('dot' + i); this._highlight('dot' + i);
} }
this._highlight('minute' + coarseMinute); this._highlight('minute' + coarseMinute);
hour = this._normalizeHour(hour);
this._highlight('hour' + hour); this._highlight('hour' + hour);
if (coarseMinute == 0) {
this._highlight('sharphour');
}
}, },
_language: function() { _language: function() {
for (var i = 0; i < window._uhr.languages.length; i++) { for (var i = 0; i < window._uhr.languages.length; i++) {
@ -196,15 +192,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
var minutes = date.getMinutes(); var minutes = date.getMinutes();
return minutes % 5; return minutes % 5;
}, },
_normalizeHour: function(hour) {
if (hour > 12) {
hour %= 12;
}
if (hour == 0) {
return 12;
}
return hour;
},
_create: function() { _create: function() {
this._id = window._uhr.id++; this._id = window._uhr.id++;
var userTime = this.options.time; var userTime = this.options.time;