diff --git a/core/includes/language.inc b/core/includes/language.inc index a243d2e..e66ea94 100644 --- a/core/includes/language.inc +++ b/core/includes/language.inc @@ -408,7 +408,7 @@ function language_negotiation_info() { // Add the default language negotiation method. $negotiation_info[LANGUAGE_NEGOTIATION_DEFAULT] = array( 'callbacks' => array('language' => 'language_from_default'), - 'weight' => 10, + 'weight' => 14, 'name' => t('Default language'), 'description' => t('Use the default site language (@language_name).', array('@language_name' => language_default()->name)), 'config' => 'admin/config/regional/language', diff --git a/core/modules/language/language.admin.inc b/core/modules/language/language.admin.inc index a601d00..5dd5ff4 100644 --- a/core/modules/language/language.admin.inc +++ b/core/modules/language/language.admin.inc @@ -522,6 +522,7 @@ function language_negotiation_configure_form_table(&$form, $type) { '#title_display' => 'invisible', '#default_value' => $weight, '#attributes' => array('class' => array("language-method-weight-$type")), + '#delta' => 20, ); $table_form['title'][$method_id] = array('#markup' => $method_name); @@ -810,3 +811,17 @@ function language_negotiation_configure_session_form($form, &$form_state) { return system_settings_form($form); } + +/** + * Builds the selected language negotiation method configuration form. + */ +function language_negotiation_configure_selected_form($form, &$form_state) { + $form['language_negotiation_selected_langcode'] = array( + '#type' => 'language_select', + '#title' => t('Language'), + '#languages' => LANGUAGE_CONFIGURABLE, + '#default_value' => variable_get('language_negotiation_selected_langcode', FALSE), + ); + + return system_settings_form($form); +} diff --git a/core/modules/language/language.module b/core/modules/language/language.module index d7d9c71..791d8eb 100644 --- a/core/modules/language/language.module +++ b/core/modules/language/language.module @@ -116,6 +116,14 @@ function language_menu() { 'file' => 'language.admin.inc', 'type' => MENU_VISIBLE_IN_BREADCRUMB, ); + $items['admin/config/regional/language/detection/selected'] = array( + 'title' => 'Selected language detection configuration', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('language_negotiation_configure_selected_form'), + 'access arguments' => array('administer languages'), + 'file' => 'language.admin.inc', + 'type' => MENU_VISIBLE_IN_BREADCRUMB, + ); return $items; } @@ -419,6 +427,15 @@ function language_language_negotiation_info() { 'description' => t('Use an already detected language for URLs if none is found.'), ); + $negotiation_info[LANGUAGE_NEGOTIATION_SELECTED] = array( + 'callbacks' => array('negotiation' => 'language_from_selected'), + 'file' => $file, + 'weight' => 12, + 'name' => t('Selected'), + 'description' => t('Language based on a selected language.'), + 'config' => 'admin/config/regional/language/detection/selected', + ); + return $negotiation_info; } diff --git a/core/modules/language/language.negotiation.inc b/core/modules/language/language.negotiation.inc index 48a8083..36e23ed 100644 --- a/core/modules/language/language.negotiation.inc +++ b/core/modules/language/language.negotiation.inc @@ -31,6 +31,11 @@ const LANGUAGE_NEGOTIATION_URL_FALLBACK = 'language-url-fallback'; const LANGUAGE_NEGOTIATION_USER = 'language-user'; /** + * The language is set based on a configured language. + */ + const LANGUAGE_NEGOTIATION_SELECTED = 'language-selected'; + +/** * The language is set based on the request/session parameters. */ const LANGUAGE_NEGOTIATION_SESSION = 'language-session'; @@ -256,6 +261,20 @@ function language_from_url($languages, $request) { } /** + * Identifies language from configuration. + * + * @param $languages + * An array of valid language objects. + * + * @return + * A valid language code on success, FALSE otherwise. + */ +function language_from_selected($languages) { + $langcode = variable_get('language_negotiation_selected_langcode', FALSE); + return isset($languages[$langcode]) ? $langcode : FALSE; +} + +/** * Determines the language to be assigned to URLs when none is detected. * * The language negotiation process has a fallback chain that ends with the diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageUILanguageNegotiationTest.php b/core/modules/language/lib/Drupal/language/Tests/LanguageUILanguageNegotiationTest.php index d12bdfa..d184e7d 100644 --- a/core/modules/language/lib/Drupal/language/Tests/LanguageUILanguageNegotiationTest.php +++ b/core/modules/language/lib/Drupal/language/Tests/LanguageUILanguageNegotiationTest.php @@ -139,6 +139,43 @@ class LanguageUILanguageNegotiationTest extends WebTestBase { // Configure URL language rewrite. variable_set('language_negotiation_url_type', LANGUAGE_TYPE_INTERFACE); + // Configure selected language negotiation to use zh-hans. + $edit = array('language_negotiation_selected_langcode' => $langcode); + $this->drupalPost('admin/config/regional/language/detection/selected', $edit, t('Save configuration')); + $test = array( + 'language_negotiation' => array(LANGUAGE_NEGOTIATION_SELECTED, LANGUAGE_NEGOTIATION_DEFAULT), + 'path' => 'admin/config', + 'expect' => $language_string, + 'expected_method_id' => LANGUAGE_NEGOTIATION_SELECTED, + 'http_header' => $http_header_browser_fallback, + 'message' => 'SELECTED > DEFAULT: UI language is switched based on selected language.', + ); + $this->runTest($test); + + // An invalid language is selected. + variable_set('language_negotiation_selected_langcode', NULL); + $test = array( + 'language_negotiation' => array(LANGUAGE_NEGOTIATION_SELECTED, LANGUAGE_NEGOTIATION_DEFAULT), + 'path' => 'admin/config', + 'expect' => $default_string, + 'expected_method_id' => LANGUAGE_NEGOTIATION_DEFAULT, + 'http_header' => $http_header_browser_fallback, + 'message' => 'SELECTED > DEFAULT: UI language is switched based on selected language.', + ); + $this->runTest($test); + + // No selected language is available. + variable_set('language_negotiation_selected_langcode', $langcode_unknown); + $test = array( + 'language_negotiation' => array(LANGUAGE_NEGOTIATION_SELECTED, LANGUAGE_NEGOTIATION_DEFAULT), + 'path' => 'admin/config', + 'expect' => $default_string, + 'expected_method_id' => LANGUAGE_NEGOTIATION_DEFAULT, + 'http_header' => $http_header_browser_fallback, + 'message' => 'SELECTED > DEFAULT: UI language is switched based on selected language.', + ); + $this->runTest($test); + $tests = array( // Default, browser preference should have no influence. array(