Merge remote-tracking branch 'trentrichardson/dev' into l10n-ampm

This commit is contained in:
Jun Omae 2011-08-15 15:52:36 +09:00
commit 97990e9657
2 changed files with 29 additions and 1 deletions

View file

@ -1017,7 +1017,17 @@ $.datepicker._gotoToday = function(id) {
var inst = this._getInst($(id)[0]),
$dp = inst.dpDiv;
this._base_gotoToday(id);
this._setTime(this._getInst($(id)[0]), new Date());
var now = new Date();
var tp_inst = this._get(inst, 'timepicker');
if (tp_inst._defaults.showTimezone && tp_inst.timezone_select) {
var tzoffset = now.getTimezoneOffset(); // If +0100, returns -60
var tzsign = tzoffset > 0 ? '-' : '+';
tzoffset = Math.abs(tzoffset);
var tzmin = tzoffset % 60
tzoffset = tzsign + ('0' + (tzoffset - tzmin) / 60).slice(-2) + ('0' + tzmin).slice(-2);
tp_inst.timezone_select.val(tzoffset);
}
this._setTime(inst, now);
$( '.ui-datepicker-today', $dp).click();
};

18
localization/jquery-ui-timepicker-pl.js vendored Normal file
View file

@ -0,0 +1,18 @@
/* German translation for the jQuery Timepicker Addon */
/* Written by Michał Pena */
(function($) {
$.timepicker.regional['pl'] = {
timeOnlyTitle: 'Wybierz godzinę',
timeText: 'Czas',
hourText: 'Godzina',
minuteText: 'Minuta',
secondText: 'Sekunda',
millisecText: 'Milisekunda',
timezoneText: 'Strefa czasowa',
currentText: 'Teraz',
closeText: 'Gotowe',
timeFormat: 'hh:mm tt',
ampm: false
};
$.timepicker.setDefaults($.timepicker.regional['pl']);
})(jQuery);