diff -u b/core/modules/views/src/Plugin/views/PluginBase.php b/core/modules/views/src/Plugin/views/PluginBase.php --- b/core/modules/views/src/Plugin/views/PluginBase.php +++ b/core/modules/views/src/Plugin/views/PluginBase.php @@ -524,7 +524,7 @@ // The entity languages should come first, if requested. if ($flags & PluginBase::INCLUDE_ENTITY) { - $list['***LANGUAGE_entity_translation***'] = $this->t('Language of content in view row'); + $list['***LANGUAGE_entity_translation***'] = $this->t('Content language of view row'); $list['***LANGUAGE_entity_default***'] = $this->t('Original language of content in view row'); } diff -u b/core/modules/views_ui/src/Tests/ViewEditTest.php b/core/modules/views_ui/src/Tests/ViewEditTest.php --- b/core/modules/views_ui/src/Tests/ViewEditTest.php +++ b/core/modules/views_ui/src/Tests/ViewEditTest.php @@ -106,7 +106,7 @@ $langcode_url = 'admin/structure/views/nojs/display/' . $view_name . '/' . $display . '/rendering_language'; $this->assertNoLinkByHref($langcode_url); $this->assertNoLink(t('!type language selected for page', array('!type' => t('Content')))); - $this->assertNoLink(t('Language of content in view row')); + $this->assertNoLink(t('Content language of view row')); } // Make the site multilingual and test the options again. @@ -123,12 +123,12 @@ if ($view_name == 'test_view') { $this->assertNoLinkByHref($langcode_url); $this->assertNoLink(t('!type language selected for page', array('!type' => t('Content')))); - $this->assertNoLink(t('Language of content in view row')); + $this->assertNoLink(t('Content language of view row')); } else { $this->assertLinkByHref($langcode_url); $this->assertNoLink(t('!type language selected for page', array('!type' => t('Content')))); - $this->assertLink(t('Language of content in view row')); + $this->assertLink(t('Content language of view row')); } $this->drupalGet($langcode_url); only in patch2: unchanged: --- a/core/lib/Drupal/Core/Language/LanguageManager.php +++ b/core/lib/Drupal/Core/Language/LanguageManager.php @@ -96,8 +96,8 @@ public function getDefinedLanguageTypesInfo() { // access names and descriptions of the default language types. return array( LanguageInterface::TYPE_INTERFACE => array( - 'name' => $this->t('User interface text'), - 'description' => $this->t('Order of language detection methods for user interface text. If a translation of user interface text is available in the detected language, it will be displayed.'), + 'name' => $this->t('Interface text'), + 'description' => $this->t('Order of language detection methods for interface text. If a translation of interface text is available in the detected language, it will be displayed.'), 'locked' => TRUE, ), LanguageInterface::TYPE_CONTENT => array( only in patch2: unchanged: --- a/core/modules/language/language.admin.js +++ b/core/modules/language/language.admin.js @@ -12,7 +12,7 @@ // Given a customization checkbox derive the language type being changed. function toggleTable(checkbox) { var $checkbox = $(checkbox); - // Get the language detection type such as User interface text language + // Get the language detection type such as Interface text language // detection or Content language detection. $checkbox.closest('.table-language-group') .find('table, .tabledrag-toggle-weight') only in patch2: unchanged: --- a/core/modules/language/language.module +++ b/core/modules/language/language.module @@ -296,8 +296,8 @@ function language_get_default_langcode($entity_type, $bundle) { function language_language_types_info() { return array( LanguageInterface::TYPE_INTERFACE => array( - 'name' => t('User interface text'), - 'description' => t('Order of language detection methods for user interface text. If a translation of user interface text is available in the detected language, it will be displayed.'), + 'name' => t('Interface text'), + 'description' => t('Order of language detection methods for interface text. If a translation of interface text is available in the detected language, it will be displayed.'), 'locked' => TRUE, ), LanguageInterface::TYPE_CONTENT => array( only in patch2: unchanged: --- a/core/modules/language/src/Form/NegotiationConfigureForm.php +++ b/core/modules/language/src/Form/NegotiationConfigureForm.php @@ -236,7 +236,7 @@ protected function configureFormTable(array &$form, $type) { $configurable = $this->languageTypes->get('configurable'); $table_form['configurable'] = array( '#type' => 'checkbox', - '#title' => $this->t('Customize %language_name language detection to differ from User interface text language detection settings', array('%language_name' => $info['name'])), + '#title' => $this->t('Customize %language_name language detection to differ from Interface text language detection settings', array('%language_name' => $info['name'])), '#default_value' => in_array($type, $configurable), '#attributes' => array('class' => array('language-customization-checkbox')), '#attached' => array( only in patch2: unchanged: --- a/core/modules/locale/src/Form/TranslateEditForm.php +++ b/core/modules/locale/src/Form/TranslateEditForm.php @@ -131,7 +131,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { ); } if ($plurals == 2) { - // Simplify user interface text for the most common case. + // Simplify interface text for the most common case. $form['strings'][$string->lid]['translations'][1]['#title'] = $this->t('Plural form'); } } only in patch2: unchanged: --- a/core/modules/views/src/Plugin/views/field/NumericField.php +++ b/core/modules/views/src/Plugin/views/field/NumericField.php @@ -113,7 +113,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { ); } if ($plurals == 2) { - // Simplify user interface text for the most common case. + // Simplify interface text for the most common case. $form['format_plural_values'][0]['#description'] = $this->t('Text to use for the singular form, @count will be replaced with the value.'); $form['format_plural_values'][1]['#title'] = $this->t('Plural form'); $form['format_plural_values'][1]['#description'] = $this->t('Text to use for the plural form, @count will be replaced with the value.');