[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16704-g80a29d3

[Michal Čihař]

The branch, master has been updated
       via  80a29d3d149680ddf26819014a4494fdc03283f1 (commit)
      from  13349553b19c989714e780302eee7f53646030d5 (commit)


- Log -----------------------------------------------------------------
commit 80a29d3d149680ddf26819014a4494fdc03283f1
Author: Michal Čihař <michal at cihar.com>
Date:   Mon Aug 22 13:44:01 2011 +0200

    Apply changes to timepicker only if it is loaded

-----------------------------------------------------------------------

Summary of changes:
 js/messages.php |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/js/messages.php b/js/messages.php
index 8b1888e..5106283 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) */
 
+<?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($.datepicker._defaults, $.datepicker.regional['']);
-} /* if ($.datepicker) */
+$.extend($.timepicker._defaults, $.timepicker.regional['']);
+} /* if ($.timepicker) */


hooks/post-receive
-- 
phpMyAdmin