diff --git a/core/modules/language/language.module b/core/modules/language/language.module index 968183f..ec87033 100644 --- a/core/modules/language/language.module +++ b/core/modules/language/language.module @@ -367,7 +367,7 @@ function language_language_negotiation_info() { 'file' => $file, 'weight' => -8, 'name' => t('URL'), - 'description' => t('Determine the language from the URL (Path prefix or domain).'), + 'description' => t('Language from the URL (Path prefix or domain).'), 'config' => 'admin/config/regional/language/detection/url', ); @@ -380,7 +380,7 @@ function language_language_negotiation_info() { 'file' => $file, 'weight' => -6, 'name' => t('Session'), - 'description' => t('Determine the language from a request/session parameter.'), + 'description' => t('Language from a request/session parameter.'), 'config' => 'admin/config/regional/language/detection/session', ); @@ -388,8 +388,8 @@ function language_language_negotiation_info() { 'callbacks' => array('negotiation' => 'language_from_user'), 'file' => $file, 'weight' => -4, - 'name' => t('User'), - 'description' => t("Follow the user's language preference."), + 'name' => t('Account'), + 'description' => t("Account site language setting."), ); $negotiation_info[LANGUAGE_NEGOTIATION_BROWSER] = array( @@ -398,7 +398,7 @@ function language_language_negotiation_info() { 'weight' => -2, 'cache' => 0, 'name' => t('Browser'), - 'description' => t("Determine the language from the browser's language settings."), + 'description' => t("Language from the browser's language settings."), ); $negotiation_info[LANGUAGE_NEGOTIATION_INTERFACE] = array( @@ -424,8 +424,8 @@ function language_language_negotiation_info() { 'callbacks' => array('negotiation' => 'language_from_user_admin'), 'file' => $file, 'weight' => 10, - 'name' => t('User admin language'), - 'description' => t("Follow the user's admin language preference."), + 'name' => t('Account administration pages'), + 'description' => t("Account administration pages language setting."), ); return $negotiation_info; diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageUILanguageNegotiationTest.php b/core/modules/language/lib/Drupal/language/Tests/LanguageUILanguageNegotiationTest.php index 60c2336..ff6ffc4 100644 --- a/core/modules/language/lib/Drupal/language/Tests/LanguageUILanguageNegotiationTest.php +++ b/core/modules/language/lib/Drupal/language/Tests/LanguageUILanguageNegotiationTest.php @@ -196,7 +196,7 @@ class LanguageUILanguageNegotiationTest extends WebTestBase { $this->drupalGet("$langcode_unknown/admin/config", array(), $http_header_browser_fallback); $this->assertResponse(404, "Unknown language path prefix should return 404"); - // Set preferred langcode for user to NULL + // Set preferred langcode for user to NULL. $account = $this->loggedInUser; $account->preferred_langcode = NULL; $account->save(); @@ -212,7 +212,7 @@ class LanguageUILanguageNegotiationTest extends WebTestBase { ), ); - // Set preferred langcode for user to unknown language + // Set preferred langcode for user to unknown language. $account = $this->loggedInUser; $account->preferred_langcode = $langcode_unknown; $account->save(); @@ -248,7 +248,7 @@ class LanguageUILanguageNegotiationTest extends WebTestBase { $this->runTest($test); } - // Set preferred admin langcode for user to NULL + // Set preferred admin langcode for user to NULL. $account->preferred_admin_langcode = NULL; $account->save(); @@ -263,7 +263,7 @@ class LanguageUILanguageNegotiationTest extends WebTestBase { ), ); - // Set preferred admin langcode for user to unknown language + // Set preferred admin langcode for user to unknown language. $account->preferred_admin_langcode = $langcode_unknown; $account->save(); diff --git a/core/modules/user/lib/Drupal/user/AccountFormController.php b/core/modules/user/lib/Drupal/user/AccountFormController.php index 4728047..33f3476 100644 --- a/core/modules/user/lib/Drupal/user/AccountFormController.php +++ b/core/modules/user/lib/Drupal/user/AccountFormController.php @@ -220,7 +220,7 @@ abstract class AccountFormController extends EntityFormController { $form['language']['preferred_langcode'] = array( '#type' => 'language_select', - '#title' => t('Language'), + '#title' => t('Site Language'), '#languages' => LANGUAGE_CONFIGURABLE, '#default_value' => $user_preferred_language->langcode, '#description' => $interface_language_is_default ? t("This account's preferred language for e-mails and site presentation.") : t("This account's preferred language for e-mails."), @@ -228,10 +228,9 @@ abstract class AccountFormController extends EntityFormController { $form['language']['preferred_admin_langcode'] = array( '#type' => 'language_select', - '#title' => t('Admin language'), + '#title' => t('Administration pages language'), '#languages' => LANGUAGE_CONFIGURABLE, '#default_value' => $user_preferred_admin_language->langcode, - '#description' => t("This account's preferred language for administration pages."), '#access' => user_access('access administration pages', $account), );