Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
trentrichardson committed Mar 16, 2015
2 parents 3c9065e + feafd1f commit 8c597e8
Show file tree
Hide file tree
Showing 98 changed files with 371 additions and 66 deletions.
5 changes: 4 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,9 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-watch');

// Default task.
grunt.registerTask('default', ['jshint', 'jasmine', 'clean', 'copy', 'concat', 'replace', 'uglify', 'cssmin']);
grunt.registerTask('default', ['clean', 'copy', 'concat', 'replace', 'uglify', 'cssmin']);

// Test task.
grunt.registerTask('test', ['jshint', 'jasmine']);

};
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jqueryui-timepicker-addon",
"version": "1.5.0",
"version": "1.5.2",
"repository": {
"type": "git",
"url": "git://github.com/trentrichardson/jQuery-Timepicker-Addon.git"
Expand Down
68 changes: 65 additions & 3 deletions dist/i18n/jquery-ui-timepicker-addon-i18n.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*! jQuery Timepicker Addon - v1.5.0 - 2014-09-01
/*! jQuery Timepicker Addon - v1.5.2 - 2015-03-15
* http://trentrichardson.com/examples/timepicker
* Copyright (c) 2014 Trent Richardson; Licensed MIT */
* Copyright (c) 2015 Trent Richardson; Licensed MIT */

(function($){

Expand All @@ -20,6 +20,7 @@
currentText: 'Huidige Tyd',
closeText: 'Klaar',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
Expand All @@ -41,6 +42,7 @@
currentText: 'Այժմ',
closeText: 'Փակել',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
Expand All @@ -62,6 +64,7 @@
currentText: 'Сега',
closeText: 'Затвори',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
Expand All @@ -83,6 +86,7 @@
currentText: 'Ara',
closeText: 'Tancar',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
Expand All @@ -104,6 +108,7 @@
currentText: 'Nyní',
closeText: 'Zavřít',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['dop.', 'AM', 'A'],
pmNames: ['odp.', 'PM', 'P'],
isRTL: false
Expand All @@ -125,6 +130,7 @@
currentText: 'Nu',
closeText: 'Luk',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['am', 'AM', 'A'],
pmNames: ['pm', 'PM', 'P'],
isRTL: false
Expand All @@ -146,6 +152,7 @@
currentText: 'Jetzt',
closeText: 'Fertig',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['vorm.', 'AM', 'A'],
pmNames: ['nachm.', 'PM', 'P'],
isRTL: false
Expand All @@ -167,6 +174,7 @@
currentText: 'Τώρα',
closeText: 'Κλείσιμο',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['π.μ.', 'AM', 'A'],
pmNames: ['μ.μ.', 'PM', 'P'],
isRTL: false
Expand All @@ -189,6 +197,7 @@
currentText: 'Hoy',
closeText: 'Cerrar',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['a.m.', 'AM', 'A'],
pmNames: ['p.m.', 'PM', 'P'],
isRTL: false
Expand All @@ -210,6 +219,7 @@
currentText: 'Praegu',
closeText: 'Valmis',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
Expand All @@ -232,6 +242,7 @@
currentText: 'Orain',
closeText: 'Itxi',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['a.m.', 'AM', 'A'],
pmNames: ['p.m.', 'PM', 'P'],
isRTL: false
Expand All @@ -253,6 +264,7 @@
currentText: 'Nyt',
closeText: 'Sulje',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['ap.', 'AM', 'A'],
pmNames: ['ip.', 'PM', 'P'],
isRTL: false
Expand All @@ -274,6 +286,7 @@
currentText: 'Maintenant',
closeText: 'Terminé',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
Expand All @@ -295,6 +308,7 @@
currentText: 'Agora',
closeText: 'Pechar',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['a.m.', 'AM', 'A'],
pmNames: ['p.m.', 'PM', 'P'],
isRTL: false
Expand All @@ -316,6 +330,7 @@
currentText: "עכשיו",
closeText:"סגור",
timeFormat: "HH:mm",
timeSuffix: '',
amNames: ['לפנה"צ', 'AM', 'A'],
pmNames: ['אחה"צ', 'PM', 'P'],
isRTL: true
Expand All @@ -337,6 +352,7 @@
currentText: 'Sada',
closeText: 'Gotovo',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['a.m.', 'AM', 'A'],
pmNames: ['p.m.', 'PM', 'P'],
isRTL: false
Expand All @@ -358,6 +374,7 @@
currentText: 'Most',
closeText: 'Kész',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['de.', 'AM', 'A'],
pmNames: ['du.', 'PM', 'P'],
isRTL: false
Expand All @@ -379,6 +396,7 @@
currentText: 'Sekarang',
closeText: 'OK',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
Expand All @@ -400,6 +418,7 @@
currentText: 'Adesso',
closeText: 'Chiudi',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['m.', 'AM', 'A'],
pmNames: ['p.', 'PM', 'P'],
isRTL: false
Expand All @@ -421,6 +440,7 @@
currentText: '現時刻',
closeText: '閉じる',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['午前', 'AM', 'A'],
pmNames: ['午後', 'PM', 'P'],
isRTL: false
Expand All @@ -442,6 +462,7 @@
currentText: '현재 시각',
closeText: '닫기',
timeFormat: 'tt h:mm',
timeSuffix: '',
amNames: ['오전', 'AM', 'A'],
pmNames: ['오후', 'PM', 'P'],
isRTL: false
Expand All @@ -463,11 +484,34 @@
currentText: 'Dabar',
closeText: 'Uždaryti',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['priešpiet', 'AM', 'A'],
pmNames: ['popiet', 'PM', 'P'],
isRTL: false
};

// source: src/i18n/jquery-ui-timepicker-lv.js
/* Latvian translation for the jQuery Timepicker Addon */
/* Written by Dmitry Bogatykh */

$.timepicker.regional['lv'] = {
timeOnlyTitle: 'Ievadiet laiku',
timeText: 'Laiks',
hourText: 'Stundas',
minuteText: 'Minūtes',
secondText: 'Sekundes',
millisecText: 'Milisekundes',
microsecText: 'Mikrosekundes',
timezoneText: 'Laika josla',
currentText: 'Tagad',
closeText: 'Aizvērt',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['AM', 'AM', 'A'],
pmNames: ['PM', 'PM', 'P'],
isRTL: false
};

// source: src/i18n/jquery-ui-timepicker-nl.js
/* Dutch translation for the jQuery Timepicker Addon */
/* Written by Martijn van der Lee */
Expand All @@ -484,6 +528,7 @@
currentText: 'Vandaag',
closeText: 'Sluiten',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
Expand All @@ -505,6 +550,7 @@
currentText: 'Nå',
closeText: 'Lukk',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['am', 'AM', 'A'],
pmNames: ['pm', 'PM', 'P'],
isRTL: false
Expand All @@ -526,6 +572,7 @@
currentText: 'Teraz',
closeText: 'Gotowe',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
Expand All @@ -547,6 +594,7 @@
currentText: 'Agora',
closeText: 'Fechar',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['a.m.', 'AM', 'A'],
pmNames: ['p.m.', 'PM', 'P'],
isRTL: false
Expand All @@ -568,6 +616,7 @@
currentText: 'Agora',
closeText: 'Fechar',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['a.m.', 'AM', 'A'],
pmNames: ['p.m.', 'PM', 'P'],
isRTL: false
Expand All @@ -589,6 +638,7 @@
currentText: 'Acum',
closeText: 'Închide',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
Expand All @@ -610,6 +660,7 @@
currentText: 'Сейчас',
closeText: 'Закрыть',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
Expand All @@ -631,6 +682,7 @@
currentText: 'Teraz',
closeText: 'Zavrieť',
timeFormat: 'H:m',
timeSuffix: '',
amNames: ['dop.', 'AM', 'A'],
pmNames: ['pop.', 'PM', 'P'],
isRTL: false
Expand All @@ -652,6 +704,7 @@
currentText: 'Sedaj',
closeText: 'Zapri',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['dop.', 'AM', 'A'],
pmNames: ['pop.', 'PM', 'P'],
isRTL: false
Expand All @@ -673,6 +726,7 @@
currentText: 'Сада',
closeText: 'Затвори',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
Expand All @@ -694,6 +748,7 @@
currentText: 'Sada',
closeText: 'Zatvori',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
Expand All @@ -715,6 +770,7 @@
currentText: 'Nu',
closeText: 'Stäng',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
Expand All @@ -735,7 +791,8 @@
timezoneText: 'เขตเวลา',
currentText: 'เวลาปัจจุบัน',
closeText: 'ปิด',
timeFormat: 'hh:mm tt'
timeFormat: 'hh:mm tt',
timeSuffix: ''
};

// source: src/i18n/jquery-ui-timepicker-tr.js
Expand All @@ -754,6 +811,7 @@
currentText: 'Şu an',
closeText: 'Tamam',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['ÖÖ', 'Ö'],
pmNames: ['ÖS', 'S'],
isRTL: false
Expand All @@ -775,6 +833,7 @@
currentText: 'Зараз',
closeText: 'Закрити',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
Expand All @@ -796,6 +855,7 @@
currentText: 'Hiện thời',
closeText: 'Đóng',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['SA', 'S'],
pmNames: ['CH', 'C'],
isRTL: false
Expand All @@ -817,6 +877,7 @@
currentText: '现在时间',
closeText: '关闭',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
Expand All @@ -838,6 +899,7 @@
currentText: '現在時間',
closeText: '確定',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['上午', 'AM', 'A'],
pmNames: ['下午', 'PM', 'P'],
isRTL: false
Expand Down
Loading

0 comments on commit 8c597e8

Please sign in to comment.