diff --git a/core/includes/language.inc b/core/includes/language.inc index aa6f225..ddae57e 100644 --- a/core/includes/language.inc +++ b/core/includes/language.inc @@ -228,9 +228,8 @@ function language_types_set(array $configurable) { // Check if the language is locked. The configuration of a locked language // type cannot be changed using the UI. if ($locked = !empty($info['locked'])) { - // If a locked language has default settings (by using the 'fixed' - // property) it will be always configurable. If it has no default - // settings, then it won't be configurable. + // Locked languages with a default configuration (using the 'fixed' + // property) are always non-configurable and viceversa. $configurable[$type] = empty($info['fixed']); $language_types[$type] = !$locked; if (!$configurable[$type]) { diff --git a/core/modules/language/language.admin.inc b/core/modules/language/language.admin.inc index 424163e..dab5bee 100644 --- a/core/modules/language/language.admin.inc +++ b/core/modules/language/language.admin.inc @@ -597,7 +597,7 @@ function language_negotiation_configure_form_submit($form, &$form_state) { // made not configurable, deactivate it first. $non_configurable = array_keys(array_diff($configurable, array_filter($configurable))); _language_disable_language_switcher($non_configurable); - drupal_container()->get('plugin.manager.block')->clearCachedDefinitions(); + Drupal::service('plugin.manager.block')->clearCachedDefinitions(); } $form_state['redirect'] = 'admin/config/regional/language/detection'; diff --git a/core/modules/language/language.module b/core/modules/language/language.module index 26a1d30..44ae1ea 100644 --- a/core/modules/language/language.module +++ b/core/modules/language/language.module @@ -581,7 +581,6 @@ function language_library_info() { return $libraries; } - /** * Implements hook_css_alter(). * diff --git a/core/modules/language/tests/language_test/language_test.module b/core/modules/language/tests/language_test/language_test.module index bce9783..dd8a9dd 100644 --- a/core/modules/language/tests/language_test/language_test.module +++ b/core/modules/language/tests/language_test/language_test.module @@ -45,7 +45,7 @@ function language_test_language_types_info_alter(array &$language_types) { if (state()->get('language_test.content_language_type')) { $language_types[Language::TYPE_CONTENT]['locked'] = FALSE; unset($language_types[Language::TYPE_CONTENT]['fixed']); - // By default languages are not configurable. Make LANGUAGE_TYPE_CONTENT + // By default languages are not configurable. Make Language::TYPE_CONTENT // configurable. $configurable = config('system.language.types')->get('configurable'); $configurable[Language::TYPE_CONTENT] = TRUE;