From 021e81165360a6762a24be3a99f9da4f480d07ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Mon, 8 Aug 2011 15:23:20 +0200
Subject: [PATCH] Use standard way for passing messages

---
 js/makegrid.js                | 12 ++++++------
 js/messages.php               |  7 +++++++
 libraries/display_tbl.lib.php |  6 ------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/js/makegrid.js b/js/makegrid.js
index 00d839f9ce..7755d1ece1 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -489,12 +489,12 @@
         g.tableCreateTime = $('#table_create_time').val();
         
         // assign column reorder & column sort hint
-        g.reorderHint = $('#col_order_hint').val();
-        g.sortHint = $('#sort_hint').val();
-        g.markHint = $('#col_mark_hint').val();
-        g.colVisibHint = $('#col_visib_hint').val();
-        g.showAllColText = $('#show_all_col_text').val();
-        
+        g.reorderHint = PMA_messages['strColOrderHint'];
+        g.sortHint = PMA_messages['strSortHint'];
+        g.markHint = PMA_messages['strMarkHint'];
+        g.colVisibHint = PMA_messages['strVisibHint'];
+        g.showAllColText = PMA_messages['strShowAll'];
+
         // initialize column order
         $col_order = $('#col_order');
         if ($col_order.length > 0) {
diff --git a/js/messages.php b/js/messages.php
index d5565ac09a..72d5f04ea3 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -268,6 +268,13 @@ $js_messages['strNewerVersion'] = __('A newer version of phpMyAdmin is available
 $js_messages['strLatestAvailable'] = __(', latest stable version:');
 $js_messages['strUpToDate'] = __('up to date');
 
+/* Browsing grid */
+$js_messages['strColOrderHint'] = __('Drag to reorder');
+$js_messages['strSortHint'] = __('Click to sort');
+$js_messages['strMarkHint'] = __('Click to mark/unmark');
+$js_messages['strVisibHint'] = __('Click the drop-down arrow<br />to toggle column\'s visibility');
+$js_messages['strShowAll'] = __('Show all');
+
 echo "var PMA_messages = new Array();\n";
 foreach ($js_messages as $name => $js_message) {
     PMA_printJsValue("PMA_messages['" . $name . "']", $js_message);
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 2f95f11c2b..711998d18e 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -419,12 +419,6 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di
                      PMA_Table::sGetStatusInfo($GLOBALS['db'], $GLOBALS['table'], 'Create_time') . '" />';
             }
         }
-        // generate hints
-        echo '<input id="col_order_hint" type="hidden" value="' . __('Drag to reorder') . '" />';
-        echo '<input id="sort_hint" type="hidden" value="' . __('Click to sort') . '" />';
-        echo '<input id="col_mark_hint" type="hidden" value="' . __('Click to mark/unmark') . '" />';
-        echo '<input id="col_visib_hint" type="hidden" value="' . __('Click the drop-down arrow<br />to toggle column\'s visibility') . '" />';
-        echo '<input id="show_all_col_text" type="hidden" value="' . __('Show all') . '" />';
         ?>
     </td>