Commit 69f3a4d6 authored by Dries's avatar Dries
Browse files

- Improved consistency: "Clear Site" -> "Clear site", "Re-index Site" -> "Re-index site"

parent b9415b4b
......@@ -156,7 +156,7 @@ function search_menu($may_cache) {
'callback' => 'search_view',
'access' => user_access('search content'),
'type' => MENU_SUGGESTED_ITEM);
$items[] = array('path' => 'admin/settings/search/wipe', 'title' => t('Clear Index'),
$items[] = array('path' => 'admin/settings/search/wipe', 'title' => t('Clear index'),
'callback' => 'search_wipe_confirm',
'access' => user_access('administer search'),
'type' => MENU_CALLBACK);
......@@ -183,7 +183,7 @@ function search_menu($may_cache) {
* Implementation of hook_validate().
*/
function search_settings_form_validate($form_id, &$form) {
if ($_POST['op'] == t('Re-index Site')) {
if ($_POST['op'] == t('Re-index site')) {
drupal_goto('admin/settings/search/wipe');
}
// If these settings change, the index needs to be rebuilt.
......@@ -213,7 +213,7 @@ function search_settings() {
$status = '<p><strong>'. t('%percentage of the site has been indexed.', array('%percentage' => $percentage)) .' '. $count .'</strong></p>';
$form['status'] = array('#type' => 'fieldset', '#title' => t('Indexing status'));
$form['status']['status'] = array('#type' => 'markup', '#value' => $status);
$form['status']['wipe'] = array('#type' => 'submit', '#value' => t('Re-index Site'));
$form['status']['wipe'] = array('#type' => 'submit', '#value' => t('Re-index site'));
$items = drupal_map_assoc(array(10, 20, 50, 100, 200, 500));
......@@ -237,7 +237,7 @@ function search_settings() {
*/
function search_wipe_confirm() {
return confirm_form('search_wipe_confirm', $form, t('Are you sure you want to re-index the site?'),
'admin/forums', t(' The search index is not cleared but systematically updated to reflect the new settings. Searching will continue to work but new content won\'t be indexed until all existing content has been re-indexed. This action cannot be undone.'), t('Re-index Site'), t('Cancel'));
'admin/forums', t(' The search index is not cleared but systematically updated to reflect the new settings. Searching will continue to work but new content won\'t be indexed until all existing content has been re-indexed. This action cannot be undone.'), t('Re-index site'), t('Cancel'));
}
/**
......
......@@ -156,7 +156,7 @@ function search_menu($may_cache) {
'callback' => 'search_view',
'access' => user_access('search content'),
'type' => MENU_SUGGESTED_ITEM);
$items[] = array('path' => 'admin/settings/search/wipe', 'title' => t('Clear Index'),
$items[] = array('path' => 'admin/settings/search/wipe', 'title' => t('Clear index'),
'callback' => 'search_wipe_confirm',
'access' => user_access('administer search'),
'type' => MENU_CALLBACK);
......@@ -183,7 +183,7 @@ function search_menu($may_cache) {
* Implementation of hook_validate().
*/
function search_settings_form_validate($form_id, &$form) {
if ($_POST['op'] == t('Re-index Site')) {
if ($_POST['op'] == t('Re-index site')) {
drupal_goto('admin/settings/search/wipe');
}
// If these settings change, the index needs to be rebuilt.
......@@ -213,7 +213,7 @@ function search_settings() {
$status = '<p><strong>'. t('%percentage of the site has been indexed.', array('%percentage' => $percentage)) .' '. $count .'</strong></p>';
$form['status'] = array('#type' => 'fieldset', '#title' => t('Indexing status'));
$form['status']['status'] = array('#type' => 'markup', '#value' => $status);
$form['status']['wipe'] = array('#type' => 'submit', '#value' => t('Re-index Site'));
$form['status']['wipe'] = array('#type' => 'submit', '#value' => t('Re-index site'));
$items = drupal_map_assoc(array(10, 20, 50, 100, 200, 500));
......@@ -237,7 +237,7 @@ function search_settings() {
*/
function search_wipe_confirm() {
return confirm_form('search_wipe_confirm', $form, t('Are you sure you want to re-index the site?'),
'admin/forums', t(' The search index is not cleared but systematically updated to reflect the new settings. Searching will continue to work but new content won\'t be indexed until all existing content has been re-indexed. This action cannot be undone.'), t('Re-index Site'), t('Cancel'));
'admin/forums', t(' The search index is not cleared but systematically updated to reflect the new settings. Searching will continue to work but new content won\'t be indexed until all existing content has been re-indexed. This action cannot be undone.'), t('Re-index site'), t('Cancel'));
}
/**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment