Skip to content

Commit 8c597e8

Browse files
trentrichardsontrentrichardson
committed
Merge branch 'dev'
2 parents 3c9065e + feafd1f commit 8c597e8

File tree

98 files changed

+371
-66
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+371
-66
lines changed

‎Gruntfile.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,9 @@ module.exports = function(grunt) {
162162
grunt.loadNpmTasks('grunt-contrib-watch');
163163

164164
// Default task.
165-
grunt.registerTask('default', ['jshint', 'jasmine', 'clean', 'copy', 'concat', 'replace', 'uglify', 'cssmin']);
165+
grunt.registerTask('default', ['clean', 'copy', 'concat', 'replace', 'uglify', 'cssmin']);
166+
167+
// Test task.
168+
grunt.registerTask('test', ['jshint', 'jasmine']);
166169

167170
};

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jqueryui-timepicker-addon",
3-
"version": "1.5.0",
3+
"version": "1.5.2",
44
"repository": {
55
"type": "git",
66
"url": "git://github.com/trentrichardson/jQuery-Timepicker-Addon.git"

‎dist/i18n/jquery-ui-timepicker-addon-i18n.js‎

Lines changed: 65 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/*! jQuery Timepicker Addon - v1.5.0 - 2014-09-01
1+
/*! jQuery Timepicker Addon - v1.5.2 - 2015-03-15
22
* http://trentrichardson.com/examples/timepicker
3-
* Copyright (c) 2014 Trent Richardson; Licensed MIT */
3+
* Copyright (c) 2015 Trent Richardson; Licensed MIT */
44

55
(function($){
66

@@ -20,6 +20,7 @@
2020
currentText: 'Huidige Tyd',
2121
closeText: 'Klaar',
2222
timeFormat: 'HH:mm',
23+
timeSuffix: '',
2324
amNames: ['AM', 'A'],
2425
pmNames: ['PM', 'P'],
2526
isRTL: false
@@ -41,6 +42,7 @@
4142
currentText: 'Այժմ',
4243
closeText: 'Փակել',
4344
timeFormat: 'HH:mm',
45+
timeSuffix: '',
4446
amNames: ['AM', 'A'],
4547
pmNames: ['PM', 'P'],
4648
isRTL: false
@@ -62,6 +64,7 @@
6264
currentText: 'Сега',
6365
closeText: 'Затвори',
6466
timeFormat: 'HH:mm',
67+
timeSuffix: '',
6568
amNames: ['AM', 'A'],
6669
pmNames: ['PM', 'P'],
6770
isRTL: false
@@ -83,6 +86,7 @@
8386
currentText: 'Ara',
8487
closeText: 'Tancar',
8588
timeFormat: 'HH:mm',
89+
timeSuffix: '',
8690
amNames: ['AM', 'A'],
8791
pmNames: ['PM', 'P'],
8892
isRTL: false
@@ -104,6 +108,7 @@
104108
currentText: 'Nyní',
105109
closeText: 'Zavřít',
106110
timeFormat: 'HH:mm',
111+
timeSuffix: '',
107112
amNames: ['dop.', 'AM', 'A'],
108113
pmNames: ['odp.', 'PM', 'P'],
109114
isRTL: false
@@ -125,6 +130,7 @@
125130
currentText: 'Nu',
126131
closeText: 'Luk',
127132
timeFormat: 'HH:mm',
133+
timeSuffix: '',
128134
amNames: ['am', 'AM', 'A'],
129135
pmNames: ['pm', 'PM', 'P'],
130136
isRTL: false
@@ -146,6 +152,7 @@
146152
currentText: 'Jetzt',
147153
closeText: 'Fertig',
148154
timeFormat: 'HH:mm',
155+
timeSuffix: '',
149156
amNames: ['vorm.', 'AM', 'A'],
150157
pmNames: ['nachm.', 'PM', 'P'],
151158
isRTL: false
@@ -167,6 +174,7 @@
167174
currentText: 'Τώρα',
168175
closeText: 'Κλείσιμο',
169176
timeFormat: 'HH:mm',
177+
timeSuffix: '',
170178
amNames: ['π.μ.', 'AM', 'A'],
171179
pmNames: ['μ.μ.', 'PM', 'P'],
172180
isRTL: false
@@ -189,6 +197,7 @@
189197
currentText: 'Hoy',
190198
closeText: 'Cerrar',
191199
timeFormat: 'HH:mm',
200+
timeSuffix: '',
192201
amNames: ['a.m.', 'AM', 'A'],
193202
pmNames: ['p.m.', 'PM', 'P'],
194203
isRTL: false
@@ -210,6 +219,7 @@
210219
currentText: 'Praegu',
211220
closeText: 'Valmis',
212221
timeFormat: 'HH:mm',
222+
timeSuffix: '',
213223
amNames: ['AM', 'A'],
214224
pmNames: ['PM', 'P'],
215225
isRTL: false
@@ -232,6 +242,7 @@
232242
currentText: 'Orain',
233243
closeText: 'Itxi',
234244
timeFormat: 'HH:mm',
245+
timeSuffix: '',
235246
amNames: ['a.m.', 'AM', 'A'],
236247
pmNames: ['p.m.', 'PM', 'P'],
237248
isRTL: false
@@ -253,6 +264,7 @@
253264
currentText: 'Nyt',
254265
closeText: 'Sulje',
255266
timeFormat: 'HH:mm',
267+
timeSuffix: '',
256268
amNames: ['ap.', 'AM', 'A'],
257269
pmNames: ['ip.', 'PM', 'P'],
258270
isRTL: false
@@ -274,6 +286,7 @@
274286
currentText: 'Maintenant',
275287
closeText: 'Terminé',
276288
timeFormat: 'HH:mm',
289+
timeSuffix: '',
277290
amNames: ['AM', 'A'],
278291
pmNames: ['PM', 'P'],
279292
isRTL: false
@@ -295,6 +308,7 @@
295308
currentText: 'Agora',
296309
closeText: 'Pechar',
297310
timeFormat: 'HH:mm',
311+
timeSuffix: '',
298312
amNames: ['a.m.', 'AM', 'A'],
299313
pmNames: ['p.m.', 'PM', 'P'],
300314
isRTL: false
@@ -316,6 +330,7 @@
316330
currentText: "עכשיו",
317331
closeText:"סגור",
318332
timeFormat: "HH:mm",
333+
timeSuffix: '',
319334
amNames: ['לפנה"צ', 'AM', 'A'],
320335
pmNames: ['אחה"צ', 'PM', 'P'],
321336
isRTL: true
@@ -337,6 +352,7 @@
337352
currentText: 'Sada',
338353
closeText: 'Gotovo',
339354
timeFormat: 'HH:mm',
355+
timeSuffix: '',
340356
amNames: ['a.m.', 'AM', 'A'],
341357
pmNames: ['p.m.', 'PM', 'P'],
342358
isRTL: false
@@ -358,6 +374,7 @@
358374
currentText: 'Most',
359375
closeText: 'Kész',
360376
timeFormat: 'HH:mm',
377+
timeSuffix: '',
361378
amNames: ['de.', 'AM', 'A'],
362379
pmNames: ['du.', 'PM', 'P'],
363380
isRTL: false
@@ -379,6 +396,7 @@
379396
currentText: 'Sekarang',
380397
closeText: 'OK',
381398
timeFormat: 'HH:mm',
399+
timeSuffix: '',
382400
amNames: ['AM', 'A'],
383401
pmNames: ['PM', 'P'],
384402
isRTL: false
@@ -400,6 +418,7 @@
400418
currentText: 'Adesso',
401419
closeText: 'Chiudi',
402420
timeFormat: 'HH:mm',
421+
timeSuffix: '',
403422
amNames: ['m.', 'AM', 'A'],
404423
pmNames: ['p.', 'PM', 'P'],
405424
isRTL: false
@@ -421,6 +440,7 @@
421440
currentText: '現時刻',
422441
closeText: '閉じる',
423442
timeFormat: 'HH:mm',
443+
timeSuffix: '',
424444
amNames: ['午前', 'AM', 'A'],
425445
pmNames: ['午後', 'PM', 'P'],
426446
isRTL: false
@@ -442,6 +462,7 @@
442462
currentText: '현재 시각',
443463
closeText: '닫기',
444464
timeFormat: 'tt h:mm',
465+
timeSuffix: '',
445466
amNames: ['오전', 'AM', 'A'],
446467
pmNames: ['오후', 'PM', 'P'],
447468
isRTL: false
@@ -463,11 +484,34 @@
463484
currentText: 'Dabar',
464485
closeText: 'Uždaryti',
465486
timeFormat: 'HH:mm',
487+
timeSuffix: '',
466488
amNames: ['priešpiet', 'AM', 'A'],
467489
pmNames: ['popiet', 'PM', 'P'],
468490
isRTL: false
469491
};
470492

493+
// source: src/i18n/jquery-ui-timepicker-lv.js
494+
/* Latvian translation for the jQuery Timepicker Addon */
495+
/* Written by Dmitry Bogatykh */
496+
497+
$.timepicker.regional['lv'] = {
498+
timeOnlyTitle: 'Ievadiet laiku',
499+
timeText: 'Laiks',
500+
hourText: 'Stundas',
501+
minuteText: 'Minūtes',
502+
secondText: 'Sekundes',
503+
millisecText: 'Milisekundes',
504+
microsecText: 'Mikrosekundes',
505+
timezoneText: 'Laika josla',
506+
currentText: 'Tagad',
507+
closeText: 'Aizvērt',
508+
timeFormat: 'HH:mm',
509+
timeSuffix: '',
510+
amNames: ['AM', 'AM', 'A'],
511+
pmNames: ['PM', 'PM', 'P'],
512+
isRTL: false
513+
};
514+
471515
// source: src/i18n/jquery-ui-timepicker-nl.js
472516
/* Dutch translation for the jQuery Timepicker Addon */
473517
/* Written by Martijn van der Lee */
@@ -484,6 +528,7 @@
484528
currentText: 'Vandaag',
485529
closeText: 'Sluiten',
486530
timeFormat: 'HH:mm',
531+
timeSuffix: '',
487532
amNames: ['AM', 'A'],
488533
pmNames: ['PM', 'P'],
489534
isRTL: false
@@ -505,6 +550,7 @@
505550
currentText: 'Nå',
506551
closeText: 'Lukk',
507552
timeFormat: 'HH:mm',
553+
timeSuffix: '',
508554
amNames: ['am', 'AM', 'A'],
509555
pmNames: ['pm', 'PM', 'P'],
510556
isRTL: false
@@ -526,6 +572,7 @@
526572
currentText: 'Teraz',
527573
closeText: 'Gotowe',
528574
timeFormat: 'HH:mm',
575+
timeSuffix: '',
529576
amNames: ['AM', 'A'],
530577
pmNames: ['PM', 'P'],
531578
isRTL: false
@@ -547,6 +594,7 @@
547594
currentText: 'Agora',
548595
closeText: 'Fechar',
549596
timeFormat: 'HH:mm',
597+
timeSuffix: '',
550598
amNames: ['a.m.', 'AM', 'A'],
551599
pmNames: ['p.m.', 'PM', 'P'],
552600
isRTL: false
@@ -568,6 +616,7 @@
568616
currentText: 'Agora',
569617
closeText: 'Fechar',
570618
timeFormat: 'HH:mm',
619+
timeSuffix: '',
571620
amNames: ['a.m.', 'AM', 'A'],
572621
pmNames: ['p.m.', 'PM', 'P'],
573622
isRTL: false
@@ -589,6 +638,7 @@
589638
currentText: 'Acum',
590639
closeText: 'Închide',
591640
timeFormat: 'HH:mm',
641+
timeSuffix: '',
592642
amNames: ['AM', 'A'],
593643
pmNames: ['PM', 'P'],
594644
isRTL: false
@@ -610,6 +660,7 @@
610660
currentText: 'Сейчас',
611661
closeText: 'Закрыть',
612662
timeFormat: 'HH:mm',
663+
timeSuffix: '',
613664
amNames: ['AM', 'A'],
614665
pmNames: ['PM', 'P'],
615666
isRTL: false
@@ -631,6 +682,7 @@
631682
currentText: 'Teraz',
632683
closeText: 'Zavrieť',
633684
timeFormat: 'H:m',
685+
timeSuffix: '',
634686
amNames: ['dop.', 'AM', 'A'],
635687
pmNames: ['pop.', 'PM', 'P'],
636688
isRTL: false
@@ -652,6 +704,7 @@
652704
currentText: 'Sedaj',
653705
closeText: 'Zapri',
654706
timeFormat: 'HH:mm',
707+
timeSuffix: '',
655708
amNames: ['dop.', 'AM', 'A'],
656709
pmNames: ['pop.', 'PM', 'P'],
657710
isRTL: false
@@ -673,6 +726,7 @@
673726
currentText: 'Сада',
674727
closeText: 'Затвори',
675728
timeFormat: 'HH:mm',
729+
timeSuffix: '',
676730
amNames: ['AM', 'A'],
677731
pmNames: ['PM', 'P'],
678732
isRTL: false
@@ -694,6 +748,7 @@
694748
currentText: 'Sada',
695749
closeText: 'Zatvori',
696750
timeFormat: 'HH:mm',
751+
timeSuffix: '',
697752
amNames: ['AM', 'A'],
698753
pmNames: ['PM', 'P'],
699754
isRTL: false
@@ -715,6 +770,7 @@
715770
currentText: 'Nu',
716771
closeText: 'Stäng',
717772
timeFormat: 'HH:mm',
773+
timeSuffix: '',
718774
amNames: ['AM', 'A'],
719775
pmNames: ['PM', 'P'],
720776
isRTL: false
@@ -735,7 +791,8 @@
735791
timezoneText: 'เขตเวลา',
736792
currentText: 'เวลาปัจจุบัน',
737793
closeText: 'ปิด',
738-
timeFormat: 'hh:mm tt'
794+
timeFormat: 'hh:mm tt',
795+
timeSuffix: ''
739796
};
740797

741798
// source: src/i18n/jquery-ui-timepicker-tr.js
@@ -754,6 +811,7 @@
754811
currentText: 'Şu an',
755812
closeText: 'Tamam',
756813
timeFormat: 'HH:mm',
814+
timeSuffix: '',
757815
amNames: ['ÖÖ', 'Ö'],
758816
pmNames: ['ÖS', 'S'],
759817
isRTL: false
@@ -775,6 +833,7 @@
775833
currentText: 'Зараз',
776834
closeText: 'Закрити',
777835
timeFormat: 'HH:mm',
836+
timeSuffix: '',
778837
amNames: ['AM', 'A'],
779838
pmNames: ['PM', 'P'],
780839
isRTL: false
@@ -796,6 +855,7 @@
796855
currentText: 'Hiện thời',
797856
closeText: 'Đóng',
798857
timeFormat: 'HH:mm',
858+
timeSuffix: '',
799859
amNames: ['SA', 'S'],
800860
pmNames: ['CH', 'C'],
801861
isRTL: false
@@ -817,6 +877,7 @@
817877
currentText: '现在时间',
818878
closeText: '关闭',
819879
timeFormat: 'HH:mm',
880+
timeSuffix: '',
820881
amNames: ['AM', 'A'],
821882
pmNames: ['PM', 'P'],
822883
isRTL: false
@@ -838,6 +899,7 @@
838899
currentText: '現在時間',
839900
closeText: '確定',
840901
timeFormat: 'HH:mm',
902+
timeSuffix: '',
841903
amNames: ['上午', 'AM', 'A'],
842904
pmNames: ['下午', 'PM', 'P'],
843905
isRTL: false

0 commit comments

Comments
 (0)