Rename 'Search bookmark' as 'Bookmarked search'.

Add new error when bookmarked search name is missing. Signed-off-by: Hugues Peccatte <[email protected]>
theosphile · Mar 3, 2014 · 139a057 · 139a057
1 parent e39b6c5
commit 139a057
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/db_qbe.php b/db_qbe.php
@@ -124,7 +124,7 @@
     $response->addHTML(
         PMA_Message::notice(
             __(
-                'After saving or loading a search bookmark, you can rename it and '
+                'After saving or loading a bookmarked search, you can rename it and '
                 . 'save the new criteria.'
             )
         )

diff --git a/libraries/DBQbe.class.php b/libraries/DBQbe.class.php
@@ -1448,7 +1448,7 @@ public function getSelectionForm($cfgRelation)
      */
     private function _getSavedSearchesField()
     {
-        $html_output = __('Saved search bookmark:');
+        $html_output = __('Saved bookmarked search:');
         $html_output .= ' <select name="searchId" id="searchId">';
         $html_output .= '<option value="">New bookmark</option>';
 

diff --git a/libraries/SavedSearches.class.php b/libraries/SavedSearches.class.php
@@ -241,13 +241,19 @@ public function __construct($config)
      */
     public function save()
     {
+        if (null == $this->getSearchName()) {
+            PMA_Util::mysqlDie(
+                __('Please provide a name for this bookmarked search.')
+            );
+        }
+
         if (null == $this->getUsername()
             || null == $this->getDbname()
             || null == $this->getSearchName()
             || null == $this->getCriterias()
         ) {
             PMA_Util::mysqlDie(
-                __('Missing information to save the search bookmark.')
+                __('Missing information to save the bookmarked search.')
             );
         }