From 13349553b19c989714e780302eee7f53646030d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 22 Aug 2011 13:40:53 +0200 Subject: [PATCH 1/2] Localization for new timepicker --- js/messages.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/js/messages.php b/js/messages.php index 8a606dc6eb..8b1888eae9 100644 --- a/js/messages.php +++ b/js/messages.php @@ -448,9 +448,10 @@ PMA_printJsValue("$.datepicker.regional['']['dayNamesMin']", /* 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')); +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($.datepicker._defaults, $.datepicker.regional['']); } /* if ($.datepicker) */ From 80a29d3d149680ddf26819014a4494fdc03283f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 22 Aug 2011 13:44:01 +0200 Subject: [PATCH 2/2] Apply changes to timepicker only if it is loaded --- js/messages.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/js/messages.php b/js/messages.php index 8b1888eae9..5106283b7c 100644 --- a/js/messages.php +++ b/js/messages.php @@ -447,11 +447,16 @@ PMA_printJsValue("$.datepicker.regional['']['dayNamesMin']", __('Sa'))); /* l10n: Column header for week of the year in calendar */ PMA_printJsValue("$.datepicker.regional['']['weekHeader']", __('Wk')); +?> +$.extend($.datepicker._defaults, $.datepicker.regional['']); +} /* if ($.datepicker) */ + -$.extend($.datepicker._defaults, $.datepicker.regional['']); -} /* if ($.datepicker) */ +$.extend($.timepicker._defaults, $.timepicker.regional['']); +} /* if ($.timepicker) */