diff -u b/modules/locale/locale.admin.inc b/modules/locale/locale.admin.inc --- b/modules/locale/locale.admin.inc +++ b/modules/locale/locale.admin.inc @@ -1441,8 +1441,6 @@ * Builds the browser language negotiation method configuration form. */ function language_negotiation_configure_browser_form($form, &$form_state) { - $form = array(); - // Initialize a language list to the ones available, including English. $languages = language_list(); @@ -1506,9 +1504,8 @@ ); $form['new_mapping']['drupal_langcode'] = array( '#type' => 'select', - '#title' => t('Drupal language'), + '#title' => t('Site language'), '#options' => $language_options, - '#default_value' => '', ); $form['actions']['#type'] = 'actions'; @@ -1541,7 +1538,7 @@ $row = array(); $row[] = drupal_render($form[$key]['browser_langcode']); $row[] = drupal_render($form[$key]['drupal_langcode']); - $row[] = l(t('Delete'), 'admin/config/regional/language/configure/browser/delete/' . $key, $link_attributes); + $row[] = l(t('delete'), 'admin/config/regional/language/configure/browser/delete/' . $key, $link_attributes); $rows[] = array( 'data' => $row, @@ -1550,7 +1547,7 @@ $header = array( t('Browser language code'), - t('Drupal language'), + t('Site language'), t('Operations'), ); @@ -1606,7 +1603,6 @@ if (!empty($mappings)) { language_set_browser_drupal_langcode_mappings($mappings); } - $form_state['redirect'] = 'admin/config/regional/language/configure'; } /** @@ -1618,7 +1614,7 @@ '%browser_langcode' => $browser_langcode, )); $path = 'admin/config/regional/language/configure/browser'; - return confirm_form($form, $question, $path, ''); + return confirm_form($form, $question, $path); } /** diff -u b/modules/locale/locale.module b/modules/locale/locale.module --- b/modules/locale/locale.module +++ b/modules/locale/locale.module @@ -122,6 +122,21 @@ 'file' => 'locale.admin.inc', 'type' => MENU_VISIBLE_IN_BREADCRUMB, ); + $items['admin/config/regional/language/configure/browser'] = array( + 'title' => 'Browser language detection configuration', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('language_negotiation_configure_browser_form'), + 'access arguments' => array('administer languages'), + 'file' => 'locale.admin.inc', + 'type' => MENU_VISIBLE_IN_BREADCRUMB, + ); + $items['admin/config/regional/language/configure/browser/delete/%'] = array( + 'title' => 'Delete language mapping', + 'page arguments' => array('language_negotiation_configure_browser_delete_form', 7), + 'type' => MENU_VISIBLE_IN_BREADCRUMB, + 'access arguments' => array('administer languages'), + 'file' => 'locale.admin.inc', + ); $items['admin/config/regional/language/edit/%'] = array( 'title' => 'Edit language', 'page callback' => 'drupal_get_form', @@ -217,21 +232,6 @@ 'access arguments' => array('administer site configuration'), 'file' => 'locale.admin.inc', ); - $items['admin/config/regional/language/configure/browser'] = array( - 'title' => 'Browser language detection configuration', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('language_negotiation_configure_browser_form'), - 'access arguments' => array('administer languages'), - 'file' => 'locale.admin.inc', - 'type' => MENU_VISIBLE_IN_BREADCRUMB, - ); - $items['admin/config/regional/language/configure/browser/delete/%'] = array( - 'title' => 'Delete language mapping', - 'page arguments' => array('language_negotiation_configure_browser_delete_form', 7), - 'type' => MENU_CALLBACK, - 'access arguments' => array('administer languages'), - 'file' => 'locale.admin.inc', - ); return $items; }