Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
59eca878bc
@ -447,10 +447,16 @@ PMA_printJsValue("$.datepicker.regional['']['dayNamesMin']",
|
||||
__('Sa')));
|
||||
/* l10n: Column header for week of the year in calendar */
|
||||
PMA_printJsValue("$.datepicker.regional['']['weekHeader']", __('Wk'));
|
||||
|
||||
PMA_printJsValue("$.datepicker.regional['']['hourText']", __('Hour'));
|
||||
PMA_printJsValue("$.datepicker.regional['']['minuteText']", __('Minute'));
|
||||
PMA_printJsValue("$.datepicker.regional['']['secondText']", __('Second'));
|
||||
?>
|
||||
$.extend($.datepicker._defaults, $.datepicker.regional['']);
|
||||
} /* if ($.datepicker) */
|
||||
|
||||
<?php
|
||||
echo "if ($.timepicker) {\n";
|
||||
PMA_printJsValue("$.timepicker.regional['']['timeText']", __('Time'));
|
||||
PMA_printJsValue("$.timepicker.regional['']['hourText']", __('Hour'));
|
||||
PMA_printJsValue("$.timepicker.regional['']['minuteText']", __('Minute'));
|
||||
PMA_printJsValue("$.timepicker.regional['']['secondText']", __('Second'));
|
||||
?>
|
||||
$.extend($.timepicker._defaults, $.timepicker.regional['']);
|
||||
} /* if ($.timepicker) */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user