Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2459971 by Gábor Hojtsy: The langcode key on configuration files is not explicit in configuration schema

8.0.x
Alex Pott 2015-03-31 10:40:13 +01:00
parent f35996ad3a
commit 5b19144783
54 changed files with 121 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/config/schema/core.data_types.schema.yml
View File

@ -81,6 +81,14 @@ color_hex:
# Complex extended data types: # Complex extended data types:
# Root of a configuration object.
config_object:
type: mapping
mapping:
langcode:
type: string
label: 'Language code'
# Mail text with subject and body parts. # Mail text with subject and body parts.
mail: mail:
type: mapping type: mapping
@ -121,7 +129,7 @@ action_configuration_default:
type: string type: string
theme_settings: theme_settings:
type: mapping type: config_object
mapping: mapping:
favicon: favicon:
type: mapping type: mapping
@ -183,12 +191,6 @@ theme_settings:
sequence: sequence:
type: theme_settings.third_party.[%key] type: theme_settings.third_party.[%key]
theme_breakpoints_default:
type: sequence
sequence:
type: string
label: 'Breakpoint value'
views_field_bulk_form: views_field_bulk_form:
type: views_field type: views_field
label: 'Bulk operation' label: 'Bulk operation'
@ -262,7 +264,7 @@ config_entity:
label: 'UUID' label: 'UUID'
langcode: langcode:
type: string type: string
label: 'Default language' label: 'Language code'
status: status:
type: boolean type: boolean
label: 'Status' label: 'Status'
@ -416,9 +418,6 @@ core.date_format.*:
pattern: pattern:
type: date_format type: date_format
label: 'PHP date format' label: 'PHP date format'
langcode:
type: string
label: 'Default language'
# Generic field settings schemas. # Generic field settings schemas.

2
core/config/schema/core.extension.schema.yml
View File

@ -1,5 +1,5 @@
core.extension: core.extension:
type: mapping type: config_object
label: 'Extension settings' label: 'Extension settings'
mapping: mapping:
module: module:

2
core/config/schema/core.menu.schema.yml
View File

@ -1,5 +1,5 @@
core.menu.static_menu_link_overrides: core.menu.static_menu_link_overrides:
type: mapping type: config_object
label: 'Static menu link overrides' label: 'Static menu link overrides'
mapping: mapping:
definitions: definitions:

2
core/lib/Drupal/Core/Config/Schema/SchemaCheckTrait.php
View File

@ -53,7 +53,7 @@ trait SchemaCheckTrait {
if (!$typed_config->hasConfigSchema($config_name)) { if (!$typed_config->hasConfigSchema($config_name)) {
return FALSE; return FALSE;
} }
$definition = $typed_config->getDefinition($config_name, TRUE, TRUE); $definition = $typed_config->getDefinition($config_name);
$data_definition = $typed_config->buildDataDefinition($definition, $config_data); $data_definition = $typed_config->buildDataDefinition($definition, $config_data);
$this->schema = $typed_config->create($data_definition, $config_data); $this->schema = $typed_config->create($data_definition, $config_data);
$errors = array(); $errors = array();

2
core/lib/Drupal/Core/Config/StorableConfigBase.php
View File

@ -128,7 +128,7 @@ abstract class StorableConfigBase extends ConfigBase {
*/ */
protected function getSchemaWrapper() { protected function getSchemaWrapper() {
if (!isset($this->schemaWrapper)) { if (!isset($this->schemaWrapper)) {
$definition = $this->typedConfigManager->getDefinition($this->name, TRUE, TRUE); $definition = $this->typedConfigManager->getDefinition($this->name);
$data_definition = $this->typedConfigManager->buildDataDefinition($definition, $this->data); $data_definition = $this->typedConfigManager->buildDataDefinition($definition, $this->data);
$this->schemaWrapper = $this->typedConfigManager->create($data_definition, $this->data); $this->schemaWrapper = $this->typedConfigManager->create($data_definition, $this->data);
} }

2
core/lib/Drupal/Core/Config/TypedConfigManager.php
View File

@ -72,7 +72,7 @@ class TypedConfigManager extends TypedDataManager implements TypedConfigManagerI
*/ */
public function get($name) { public function get($name) {
$data = $this->configStorage->read($name); $data = $this->configStorage->read($name);
$type_definition = $this->getDefinition($name, TRUE, TRUE); $type_definition = $this->getDefinition($name);
$data_definition = $this->buildDataDefinition($type_definition, $data); $data_definition = $this->buildDataDefinition($type_definition, $data);
return $this->create($data_definition, $data); return $this->create($data_definition, $data);
} }

4
core/lib/Drupal/Core/Config/TypedConfigManagerInterface.php
View File

@ -111,8 +111,8 @@ Interface TypedConfigManagerInterface extends PluginManagerInterface, CachedDisc
* Ignored with TypedConfigManagerInterface. Kept for compatibility with * Ignored with TypedConfigManagerInterface. Kept for compatibility with
* DiscoveryInterface. * DiscoveryInterface.
* @param bool $is_config_name * @param bool $is_config_name
* Set to TRUE if $plugin_id is a configuration name (as opposed to an * (deprecated) Set to TRUE if $plugin_id is a configuration name (as
* internal configuration schema type). * opposed to an internal configuration schema type).
* *
* @return array * @return array
* A plugin definition array. If the given plugin id does not have typed * A plugin definition array. If the given plugin id does not have typed

2
core/modules/action/config/schema/action.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the Action module. # Schema for the configuration files of the Action module.
action.settings: action.settings:
type: mapping type: config_object
label: 'Action settings' label: 'Action settings'
mapping: mapping:
recursion_limit: recursion_limit:

2
core/modules/aggregator/config/schema/aggregator.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the aggregator module. # Schema for the configuration files of the aggregator module.
aggregator.settings: aggregator.settings:
type: mapping type: config_object
label: 'Aggregator settings' label: 'Aggregator settings'
mapping: mapping:
fetcher: fetcher:

2
core/modules/aggregator/tests/modules/aggregator_test/config/schema/aggregator_test.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the Aggregator Test module. # Schema for the configuration files of the Aggregator Test module.
aggregator_test.settings: aggregator_test.settings:
type: mapping type: config_object
label: 'Aggregator test settings' label: 'Aggregator test settings'
mapping: mapping:
items: items:

2
core/modules/book/config/schema/book.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the book module. # Schema for the configuration files of the book module.
book.settings: book.settings:
type: mapping type: config_object
label: 'Book settings' label: 'Book settings'
mapping: mapping:
allowed_types: allowed_types:

2
core/modules/color/config/schema/color.schema.yml
View File

@ -1,5 +1,5 @@
color.theme.*: color.theme.*:
type: mapping type: config_object
label: 'Color theme settings' label: 'Color theme settings'
mapping: mapping:
palette: palette:

14
core/modules/config/src/Tests/ConfigSchemaTest.php
View File

@ -61,6 +61,8 @@ class ConfigSchemaTest extends KernelTestBase {
$expected = array(); $expected = array();
$expected['label'] = 'Schema test data'; $expected['label'] = 'Schema test data';
$expected['class'] = '\Drupal\Core\Config\Schema\Mapping'; $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
$expected['mapping']['langcode']['type'] = 'string';
$expected['mapping']['langcode']['label'] = 'Language code';
$expected['mapping']['testitem'] = array('label' => 'Test item'); $expected['mapping']['testitem'] = array('label' => 'Test item');
$expected['mapping']['testlist'] = array('label' => 'Test list'); $expected['mapping']['testlist'] = array('label' => 'Test list');
$expected['type'] = 'config_schema_test.someschema'; $expected['type'] = 'config_schema_test.someschema';
@ -101,7 +103,7 @@ class ConfigSchemaTest extends KernelTestBase {
'type' => 'text', 'type' => 'text',
); );
$expected['mapping']['langcode'] = array( $expected['mapping']['langcode'] = array(
'label' => 'Default language', 'label' => 'Language code',
'type' => 'string', 'type' => 'string',
); );
$expected['type'] = 'system.maintenance'; $expected['type'] = 'system.maintenance';
@ -114,6 +116,10 @@ class ConfigSchemaTest extends KernelTestBase {
$expected['label'] = 'Ignore test'; $expected['label'] = 'Ignore test';
$expected['class'] = '\Drupal\Core\Config\Schema\Mapping'; $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
$expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition'; $expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
$expected['mapping']['langcode'] = array(
'type' => 'string',
'label' => 'Language code',
);
$expected['mapping']['label'] = array( $expected['mapping']['label'] = array(
'label' => 'Label', 'label' => 'Label',
'type' => 'label', 'type' => 'label',
@ -156,7 +162,7 @@ class ConfigSchemaTest extends KernelTestBase {
$expected['mapping']['uuid']['type'] = 'string'; $expected['mapping']['uuid']['type'] = 'string';
$expected['mapping']['uuid']['label'] = 'UUID'; $expected['mapping']['uuid']['label'] = 'UUID';
$expected['mapping']['langcode']['type'] = 'string'; $expected['mapping']['langcode']['type'] = 'string';
$expected['mapping']['langcode']['label'] = 'Default language'; $expected['mapping']['langcode']['label'] = 'Language code';
$expected['mapping']['status']['type'] = 'boolean'; $expected['mapping']['status']['type'] = 'boolean';
$expected['mapping']['status']['label'] = 'Status'; $expected['mapping']['status']['label'] = 'Status';
$expected['mapping']['dependencies']['type'] = 'config_dependencies'; $expected['mapping']['dependencies']['type'] = 'config_dependencies';
@ -222,6 +228,8 @@ class ConfigSchemaTest extends KernelTestBase {
$expected = array(); $expected = array();
$expected['label'] = 'Schema multiple filesytem marker test'; $expected['label'] = 'Schema multiple filesytem marker test';
$expected['class'] = '\Drupal\Core\Config\Schema\Mapping'; $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
$expected['mapping']['langcode']['type'] = 'string';
$expected['mapping']['langcode']['label'] = 'Language code';
$expected['mapping']['testid']['type'] = 'string'; $expected['mapping']['testid']['type'] = 'string';
$expected['mapping']['testid']['label'] = 'ID'; $expected['mapping']['testid']['label'] = 'ID';
$expected['mapping']['testdescription']['type'] = 'text'; $expected['mapping']['testdescription']['type'] = 'text';
@ -396,6 +404,8 @@ class ConfigSchemaTest extends KernelTestBase {
$expected['label'] = 'Schema wildcard fallback test'; $expected['label'] = 'Schema wildcard fallback test';
$expected['class'] = '\Drupal\Core\Config\Schema\Mapping'; $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
$expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition'; $expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
$expected['mapping']['langcode']['type'] = 'string';
$expected['mapping']['langcode']['label'] = 'Language code';
$expected['mapping']['testid']['type'] = 'string'; $expected['mapping']['testid']['type'] = 'string';
$expected['mapping']['testid']['label'] = 'ID'; $expected['mapping']['testid']['label'] = 'ID';
$expected['mapping']['testdescription']['type'] = 'text'; $expected['mapping']['testdescription']['type'] = 'text';

2
core/modules/config/tests/config_collection_install_test/config/schema/config_collection_install_test.schema.yml
View File

@ -1,5 +1,5 @@
config_collection_install_test.test: config_collection_install_test.test:
type: mapping type: config_object
label: 'Collection test' label: 'Collection test'
mapping: mapping:
collection: collection:

2
core/modules/config/tests/config_events_test/config/schema/config_events_test.schema.yml
View File

@ -1,5 +1,5 @@
config_events_test.test: config_events_test.test:
type: mapping type: config_object
label: 'Configuration events test' label: 'Configuration events test'
mapping: mapping:
key: key:

2
core/modules/config/tests/config_integration_test/config/schema/config_integration_test.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the Configuration Integration Test module. # Schema for the configuration files of the Configuration Integration Test module.
config_integration_test.settings: config_integration_test.settings:
type: mapping type: config_object
label: 'Configuration integration test settings' label: 'Configuration integration test settings'
mapping: mapping:
foo: foo:

16
core/modules/config/tests/config_schema_test/config/schema/config_schema_test.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the Configuration Schema Test module. # Schema for the configuration files of the Configuration Schema Test module.
config_schema_test.someschema: config_schema_test.someschema:
type: mapping type: config_object
label: 'Schema test data' label: 'Schema test data'
mapping: mapping:
testitem: testitem:
@ -11,7 +11,7 @@ config_schema_test.someschema:
config_schema_test.someschema.with_parents: config_schema_test.someschema.with_parents:
label: 'Schema test data with parenting' label: 'Schema test data with parenting'
type: mapping type: config_object
mapping: mapping:
one_level: one_level:
label: 'Parenting one level up' label: 'Parenting one level up'
@ -64,7 +64,7 @@ config_schema_test.someschema.with_parents.key_3:
type: string type: string
config_schema_test.someschema.somemodule.*.*: config_schema_test.someschema.somemodule.*.*:
type: mapping type: config_object
label: 'Schema multiple filesytem marker test' label: 'Schema multiple filesytem marker test'
mapping: mapping:
testid: testid:
@ -75,7 +75,7 @@ config_schema_test.someschema.somemodule.*.*:
label: 'Description' label: 'Description'
config_schema_test.wildcard_fallback.*: config_schema_test.wildcard_fallback.*:
type: mapping type: config_object
label: 'Schema wildcard fallback test' label: 'Schema wildcard fallback test'
mapping: mapping:
testid: testid:
@ -86,7 +86,7 @@ config_schema_test.wildcard_fallback.*:
label: 'Description' label: 'Description'
config_schema_test.schema_data_types: config_schema_test.schema_data_types:
type: mapping type: config_object
label: 'Config test schema' label: 'Config test schema'
mapping: mapping:
config_schema_test_integer: config_schema_test_integer:
@ -127,7 +127,7 @@ config_schema_test.schema_data_types:
config_schema_test.schema_in_install: config_schema_test.schema_in_install:
label: 'Schema test data with parenting' label: 'Schema test data with parenting'
type: mapping type: config_object
mapping: mapping:
integer: integer:
type: integer type: integer
@ -138,7 +138,7 @@ config_schema_test_integer:
label: 'Config test integer' label: 'Config test integer'
config_schema_test.ignore: config_schema_test.ignore:
type: mapping type: config_object
label: 'Ignore test' label: 'Ignore test'
mapping: mapping:
label: label:
@ -155,7 +155,7 @@ config_schema_test.ignore:
label: 'Weight' label: 'Weight'
config_schema_test.plugin_types: config_schema_test.plugin_types:
type: mapping type: config_object
mapping: mapping:
tests: tests:
type: sequence type: sequence

10
core/modules/config/tests/config_test/config/schema/config_test.schema.yml
View File

@ -56,7 +56,7 @@ config_test.query.*:
label: 'number' label: 'number'
config_test.types: config_test.types:
type: mapping type: config_object
label: 'Configuration type' label: 'Configuration type'
mapping: mapping:
array: array:
@ -94,7 +94,7 @@ config_test.types:
label: 'String integer' label: 'String integer'
config_test.no_status.default: config_test.no_status.default:
type: mapping type: config_object
label: 'Configuration no status default' label: 'Configuration no status default'
mapping: mapping:
id: id:
@ -105,7 +105,7 @@ config_test.no_status.default:
label: 'Label' label: 'Label'
config_test.system: config_test.system:
type: mapping type: config_object
label: 'Configuration system' label: 'Configuration system'
mapping: mapping:
foo: foo:
@ -119,7 +119,7 @@ config_test.system:
label: '404' label: '404'
config_test.new: config_test.new:
type: mapping type: config_object
label: 'Configuration test' label: 'Configuration test'
mapping: mapping:
key: key:
@ -136,7 +136,7 @@ config_test.old:
type: config_test.new type: config_test.new
config_test.foo: config_test.foo:
type: mapping type: config_object
label: 'Configuration test' label: 'Configuration test'
mapping: mapping:
value: value:

5
core/modules/config_translation/tests/modules/config_translation_test/config/schema/config_translation_test.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the Configuration translation test module. # Schema for the configuration files of the Configuration translation test module.
config_translation_test.content: config_translation_test.content:
type: mapping type: config_object
label: 'Content' label: 'Content'
mapping: mapping:
id: id:
@ -10,9 +10,6 @@ config_translation_test.content:
label: label:
type: label type: label
label: 'Label' label: 'Label'
langcode:
type: string
label: 'Default language'
content: content:
type: text_format type: text_format
label: 'Content' label: 'Content'

2
core/modules/contact/config/schema/contact.schema.yml
View File

@ -24,7 +24,7 @@ contact.form.*:
label: 'Weight' label: 'Weight'
contact.settings: contact.settings:
type: mapping type: config_object
label: 'Contact settings' label: 'Contact settings'
mapping: mapping:
default_form: default_form:

2
core/modules/dblog/config/schema/dblog.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the dblog module. # Schema for the configuration files of the dblog module.
dblog.settings: dblog.settings:
type: mapping type: config_object
label: 'Database logging settings' label: 'Database logging settings'
mapping: mapping:
row_limit: row_limit:

2
core/modules/field/config/schema/field.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for configuration files of the Field module. # Schema for configuration files of the Field module.
field.settings: field.settings:
type: mapping type: config_object
label: 'Field settings' label: 'Field settings'
mapping: mapping:
purge_batch_size: purge_batch_size:

2
core/modules/field_ui/config/schema/field_ui.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for configuration files of the Field UI module. # Schema for configuration files of the Field UI module.
field_ui.settings: field_ui.settings:
type: mapping type: config_object
label: 'Field UI settings' label: 'Field UI settings'
mapping: mapping:
field_prefix: field_prefix:

2
core/modules/file/config/schema/file.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the File module. # Schema for the configuration files of the File module.
file.settings: file.settings:
type: mapping type: config_object
label: 'File settings' label: 'File settings'
mapping: mapping:
description: description:

5
core/modules/filter/config/schema/filter.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the Filter module. # Schema for the configuration files of the Filter module.
filter.settings: filter.settings:
type: mapping type: config_object
label: 'Filter settings' label: 'Filter settings'
mapping: mapping:
fallback_format: fallback_format:
@ -35,9 +35,6 @@ filter.format.*:
label: 'Enabled filters' label: 'Enabled filters'
sequence: sequence:
type: filter type: filter
langcode:
type: string
label: 'Default language'
dependencies: dependencies:
type: config_dependencies type: config_dependencies
label: 'Dependencies' label: 'Dependencies'

2
core/modules/forum/config/schema/forum.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the Forum module. # Schema for the configuration files of the Forum module.
forum.settings: forum.settings:
type: mapping type: config_object
label: 'Forum settings' label: 'Forum settings'
mapping: mapping:
block: block:

2
core/modules/image/config/schema/image.schema.yml
View File

@ -70,7 +70,7 @@ image.effect.image_scale_and_crop:
label: 'Image scale and crop' label: 'Image scale and crop'
image.settings: image.settings:
type: mapping type: config_object
mapping: mapping:
preview_image: preview_image:
type: string type: string

21
core/modules/language/config/install/language.mappings.yml
View File

@ -1,12 +1,13 @@
# Browsers use different language codes to refer to the same languages, # Browsers use different language codes to refer to the same languages,
# these defaults handles the most common cases. # these defaults handles the most common cases.
no: 'nb' # Norwegian map:
pt: 'pt-pt' # Portuguese no: 'nb' # Norwegian
zh: 'zh-hans' # Default Chinese to simplified script pt: 'pt-pt' # Portuguese
zh-tw: 'zh-hant' # Taiwan Chinese in traditional script zh: 'zh-hans' # Default Chinese to simplified script
zh-hk: 'zh-hant' # Hong Kong Chinese in traditional script zh-tw: 'zh-hant' # Taiwan Chinese in traditional script
zh-mo: 'zh-hant' # Macao Chinese in traditional script zh-hk: 'zh-hant' # Hong Kong Chinese in traditional script
zh-cht: 'zh-hant' # traditional Chinese zh-mo: 'zh-hant' # Macao Chinese in traditional script
zh-cn: 'zh-hans' # PRC Mainland Chinese in simplified script zh-cht: 'zh-hant' # traditional Chinese
zh-sg: 'zh-hans' # Singapore Chinese in simplified script zh-cn: 'zh-hans' # PRC Mainland Chinese in simplified script
zh-chs: 'zh-hans' # simplified Chinese zh-sg: 'zh-hans' # Singapore Chinese in simplified script
zh-chs: 'zh-hans' # simplified Chinese

15
core/modules/language/config/schema/language.schema.yml
View File

@ -18,7 +18,7 @@ language_type_negotiation:
label: Weight label: Weight
language.types: language.types:
type: mapping type: config_object
label: 'Language types' label: 'Language types'
mapping: mapping:
all: all:
@ -41,7 +41,7 @@ language.types:
label: 'Language negotiation per type setting' label: 'Language negotiation per type setting'
language.negotiation: language.negotiation:
type: mapping type: config_object
label: 'Language detection methods' label: 'Language detection methods'
mapping: mapping:
session: session:
@ -75,11 +75,14 @@ language.negotiation:
label: 'Selected language' label: 'Selected language'
language.mappings: language.mappings:
type: sequence type: config_object
label: 'Language mapping' label: 'Language mapping'
sequence: mapping:
type: string map:
label: 'Language' type: sequence
sequence:
type: string
label: 'Language'
language.entity.*: language.entity.*:
type: config_entity type: config_entity

2
core/modules/language/language.module
View File

@ -448,7 +448,7 @@ function language_get_browser_drupal_langcode_mappings() {
if ($config->isNew()) { if ($config->isNew()) {
return array(); return array();
} }
return $config->get(); return $config->get('map');
} }
/** /**

2
core/modules/language/src/Form/NegotiationBrowserDeleteForm.php
View File

@ -71,7 +71,7 @@ class NegotiationBrowserDeleteForm extends ConfirmFormBase {
*/ */
public function submitForm(array &$form, FormStateInterface $form_state) { public function submitForm(array &$form, FormStateInterface $form_state) {
$this->config('language.mappings') $this->config('language.mappings')
->clear($this->browserLangcode) ->clear('map.' . $this->browserLangcode)
->save(); ->save();
$args = array( $args = array(

4
core/modules/language/src/Form/NegotiationBrowserForm.php
View File

@ -180,7 +180,7 @@ class NegotiationBrowserForm extends ConfigFormBase {
$mappings = $form_state->get('mappings'); $mappings = $form_state->get('mappings');
if (!empty($mappings)) { if (!empty($mappings)) {
$config = $this->config('language.mappings'); $config = $this->config('language.mappings');
$config->setData($mappings); $config->setData(['map' => $mappings]);
$config->save(); $config->save();
} }
@ -198,7 +198,7 @@ class NegotiationBrowserForm extends ConfigFormBase {
if ($config->isNew()) { if ($config->isNew()) {
return array(); return array();
} }
return $config->get(); return $config->get('map');
} }
} }

2
core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationBrowser.php
View File

@ -39,7 +39,7 @@ class LanguageNegotiationBrowser extends LanguageNegotiationMethodBase {
if ($this->languageManager && $request && $request->server->get('HTTP_ACCEPT_LANGUAGE')) { if ($this->languageManager && $request && $request->server->get('HTTP_ACCEPT_LANGUAGE')) {
$http_accept_language = $request->server->get('HTTP_ACCEPT_LANGUAGE'); $http_accept_language = $request->server->get('HTTP_ACCEPT_LANGUAGE');
$langcodes = array_keys($this->languageManager->getLanguages()); $langcodes = array_keys($this->languageManager->getLanguages());
$mappings = $this->config->get('language.mappings')->get(); $mappings = $this->config->get('language.mappings')->get('map');
$langcode = UserAgent::getBestMatchingLangcode($http_accept_language, $langcodes, $mappings); $langcode = UserAgent::getBestMatchingLangcode($http_accept_language, $langcodes, $mappings);
} }

2
core/modules/locale/config/schema/locale.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the Locale module. # Schema for the configuration files of the Locale module.
locale.settings: locale.settings:
type: mapping type: config_object
label: 'Translate interface settings' label: 'Translate interface settings'
mapping: mapping:
cache_strings: cache_strings:

2
core/modules/locale/src/LocaleConfigManager.php
View File

@ -134,7 +134,7 @@ class LocaleConfigManager {
if ($this->isSupported($name)) { if ($this->isSupported($name)) {
// Create typed configuration wrapper based on install storage data. // Create typed configuration wrapper based on install storage data.
$data = $this->installStorageRead($name); $data = $this->installStorageRead($name);
$type_definition = $this->typedConfigManager->getDefinition($name, TRUE, TRUE); $type_definition = $this->typedConfigManager->getDefinition($name);
$data_definition = $this->typedConfigManager->buildDataDefinition($type_definition, $data); $data_definition = $this->typedConfigManager->buildDataDefinition($type_definition, $data);
$typed_config = $this->typedConfigManager->create($data_definition, $data); $typed_config = $this->typedConfigManager->create($data_definition, $data);
if ($typed_config instanceof TraversableTypedDataInterface) { if ($typed_config instanceof TraversableTypedDataInterface) {

8
core/modules/locale/tests/modules/locale_test/config/schema/locale_test.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the Locale Test module. # Schema for the configuration files of the Locale Test module.
locale_test.no_translation: locale_test.no_translation:
type: mapping type: config_object
label: 'No traslation settings' label: 'No traslation settings'
mapping: mapping:
test: test:
@ -9,11 +9,9 @@ locale_test.no_translation:
label: 'Test' label: 'Test'
# See \Drupal\locale\Tests\LocaleConfigSubscriberTest # See \Drupal\locale\Tests\LocaleConfigSubscriberTest
translatable: true translatable: true
langcode:
type: string
locale_test.translation: locale_test.translation:
type: mapping type: config_object
label: 'translation settings' label: 'translation settings'
mapping: mapping:
test: test:
@ -21,5 +19,3 @@ locale_test.translation:
label: 'Test' label: 'Test'
# See \Drupal\locale\Tests\LocaleConfigSubscriberTest # See \Drupal\locale\Tests\LocaleConfigSubscriberTest
translatable: true translatable: true
langcode:
type: string

2
core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml
View File

@ -331,7 +331,7 @@ migrate_entity_constant:
label: 'Parent' label: 'Parent'
langcode: langcode:
type: string type: string
label: 'Type' label: 'Language code'
third_party_settings: third_party_settings:
type: sequence type: sequence
label: 'Settings' label: 'Settings'

2
core/modules/node/config/schema/node.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the node module. # Schema for the configuration files of the node module.
node.settings: node.settings:
type: mapping type: config_object
label: 'Node settings' label: 'Node settings'
mapping: mapping:
use_admin_theme: use_admin_theme:

2
core/modules/rest/config/schema/rest.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the REST module. # Schema for the configuration files of the REST module.
rest.settings: rest.settings:
type: mapping type: config_object
label: 'REST settings' label: 'REST settings'
mapping: mapping:
resources: resources:

2
core/modules/search/config/schema/search.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the search module. # Schema for the configuration files of the search module.
search.settings: search.settings:
type: mapping type: config_object
label: 'Search settings' label: 'Search settings'
mapping: mapping:
and_or_limit: and_or_limit:

2
core/modules/simpletest/config/schema/simpletest.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the Simpletest module. # Schema for the configuration files of the Simpletest module.
simpletest.settings: simpletest.settings:
type: mapping type: config_object
label: 'Testing' label: 'Testing'
mapping: mapping:
clear_results: clear_results:

2
core/modules/statistics/config/schema/statistics.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the statistics module. # Schema for the configuration files of the statistics module.
statistics.settings: statistics.settings:
type: mapping type: config_object
label: 'Statistics settings' label: 'Statistics settings'
mapping: mapping:
access_log: access_log:

2
core/modules/syslog/config/schema/syslog.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the syslog module. # Schema for the configuration files of the syslog module.
syslog.settings: syslog.settings:
type: mapping type: config_object
label: 'Syslog settings' label: 'Syslog settings'
mapping: mapping:
identity: identity:

42
core/modules/system/config/schema/system.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the System module. # Schema for the configuration files of the System module.
system.site: system.site:
type: mapping type: config_object
label: 'Site information' label: 'Site information'
mapping: mapping:
uuid: uuid:
@ -35,9 +35,6 @@ system.site:
weight_select_max: weight_select_max:
type: integer type: integer
label: 'Weight element maximum value' label: 'Weight element maximum value'
langcode:
type: string
label: 'Language code'
default_langcode: default_langcode:
type: string type: string
label: 'Site default language code' label: 'Site default language code'
@ -46,18 +43,15 @@ system.site:
label: 'Notification email address' label: 'Notification email address'
system.maintenance: system.maintenance:
type: mapping type: config_object
label: 'Maintenance mode' label: 'Maintenance mode'
mapping: mapping:
message: message:
type: text type: text
label: 'Message to display when in maintenance mode' label: 'Message to display when in maintenance mode'
langcode:
type: string
label: 'Default language'
system.authorize: system.authorize:
type: mapping type: config_object
label: 'Authorize settings' label: 'Authorize settings'
mapping: mapping:
filetransfer_default: filetransfer_default:
@ -65,7 +59,7 @@ system.authorize:
label: 'Default file transfer protocol' label: 'Default file transfer protocol'
system.cron: system.cron:
type: mapping type: config_object
label: 'Cron settings' label: 'Cron settings'
mapping: mapping:
threshold: threshold:
@ -83,7 +77,7 @@ system.cron:
label: 'Requirements error period' label: 'Requirements error period'
system.date: system.date:
type: mapping type: config_object
label: 'Date settings' label: 'Date settings'
mapping: mapping:
first_day: first_day:
@ -96,9 +90,6 @@ system.date:
default: default:
type: string type: string
label: 'Default country' label: 'Default country'
langcode:
type: string
label: 'Default language'
timezone: timezone:
type: mapping type: mapping
label: 'Time zone settings' label: 'Time zone settings'
@ -121,7 +112,7 @@ system.date:
label: 'Remind users at login if their time zone is not set' label: 'Remind users at login if their time zone is not set'
system.diff: system.diff:
type: mapping type: config_object
label: 'Diff settings' label: 'Diff settings'
mapping: mapping:
context: context:
@ -136,7 +127,7 @@ system.diff:
label: 'Number of trailing lines in a diff' label: 'Number of trailing lines in a diff'
system.filter: system.filter:
type: mapping type: config_object
label: 'Filter settings' label: 'Filter settings'
mapping: mapping:
protocols: protocols:
@ -147,7 +138,7 @@ system.filter:
label: 'Protocol' label: 'Protocol'
system.logging: system.logging:
type: mapping type: config_object
label: 'Logging settings' label: 'Logging settings'
mapping: mapping:
error_level: error_level:
@ -155,7 +146,7 @@ system.logging:
label: 'Error messages to display' label: 'Error messages to display'
system.performance: system.performance:
type: mapping type: config_object
label: 'Performance settings' label: 'Performance settings'
mapping: mapping:
cache: cache:
@ -220,7 +211,7 @@ system.performance:
label: 'Stale file threshold' label: 'Stale file threshold'
system.rss: system.rss:
type: mapping type: config_object
label: 'Feed settings' label: 'Feed settings'
mapping: mapping:
channel: channel:
@ -240,12 +231,9 @@ system.rss:
view_mode: view_mode:
type: string type: string
label: 'Feed content' label: 'Feed content'
langcode:
type: string
label: 'Default language'
system.theme: system.theme:
type: mapping type: config_object
label: 'Theme settings' label: 'Theme settings'
mapping: mapping:
admin: admin:
@ -292,7 +280,7 @@ system.action.*:
type: action.configuration.[%parent.plugin] type: action.configuration.[%parent.plugin]
system.file: system.file:
type: mapping type: config_object
label: 'File system' label: 'File system'
mapping: mapping:
allow_insecure_uploads: allow_insecure_uploads:
@ -313,7 +301,7 @@ system.file:
label: 'Maximum age for temporary files' label: 'Maximum age for temporary files'
system.image: system.image:
type: mapping type: config_object
label: 'Image settings' label: 'Image settings'
mapping: mapping:
toolkit: toolkit:
@ -321,7 +309,7 @@ system.image:
label: 'Toolkit' label: 'Toolkit'
system.image.gd: system.image.gd:
type: mapping type: config_object
label: 'Image settings' label: 'Image settings'
mapping: mapping:
jpeg_quality: jpeg_quality:
@ -329,7 +317,7 @@ system.image.gd:
label: 'JPEG quality' label: 'JPEG quality'
system.mail: system.mail:
type: mapping type: config_object
label: 'Mail system' label: 'Mail system'
mapping: mapping:
interface: interface:

2
core/modules/system/tests/modules/form_test/config/schema/form_test.schema.yml
View File

@ -1,5 +1,5 @@
form_test.object: form_test.object:
type: mapping type: config_object
label: 'Test form' label: 'Test form'
mapping: mapping:
bananas: bananas:

2
core/modules/system/tests/modules/update_script_test/config/schema/update_script_test.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the Update Script Test module. # Schema for the configuration files of the Update Script Test module.
update_script_test.settings: update_script_test.settings:
type: mapping type: config_object
label: '' label: ''
mapping: mapping:
requirement_type: requirement_type:

2
core/modules/taxonomy/config/schema/taxonomy.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the Taxonomy module. # Schema for the configuration files of the Taxonomy module.
taxonomy.settings: taxonomy.settings:
type: mapping type: config_object
label: 'Taxonomy settings' label: 'Taxonomy settings'
mapping: mapping:
maintain_index_table: maintain_index_table:

2
core/modules/text/config/schema/text.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the text module. # Schema for the configuration files of the text module.
text.settings: text.settings:
type: mapping type: config_object
label: 'Text settings' label: 'Text settings'
mapping: mapping:
default_summary_length: default_summary_length:

2
core/modules/tracker/config/schema/tracker.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the tracker module. # Schema for the configuration files of the tracker module.
tracker.settings: tracker.settings:
type: mapping type: config_object
label: 'Tracker settings' label: 'Tracker settings'
mapping: mapping:
cron_index_limit: cron_index_limit:

2
core/modules/update/config/schema/update.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the Update module. # Schema for the configuration files of the Update module.
update.settings: update.settings:
type: mapping type: config_object
label: 'Update settings' label: 'Update settings'
mapping: mapping:
check: check:

2
core/modules/update/tests/modules/update_test/config/schema/update_test.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the Update Test module. # Schema for the configuration files of the Update Test module.
update_test.settings: update_test.settings:
type: mapping type: config_object
label: 'Update test settings' label: 'Update test settings'
mapping: mapping:
system_info: system_info:

12
core/modules/user/config/schema/user.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the User module. # Schema for the configuration files of the User module.
user.settings: user.settings:
type: mapping type: config_object
label: 'User settings' label: 'User settings'
mapping: mapping:
anonymous: anonymous:
@ -50,12 +50,9 @@ user.settings:
password_strength: password_strength:
type: boolean type: boolean
label: 'Enable password strength indicator' label: 'Enable password strength indicator'
langcode:
type: string
label: 'Default language'
user.mail: user.mail:
type: mapping type: config_object
label: 'Email settings' label: 'Email settings'
mapping: mapping:
cancel_confirm: cancel_confirm:
@ -85,12 +82,9 @@ user.mail:
status_canceled: status_canceled:
type: mail type: mail
label: 'Account cancelled' label: 'Account cancelled'
langcode:
type: string
label: 'Default language'
user.flood: user.flood:
type: mapping type: config_object
label: 'User flood settings' label: 'User flood settings'
mapping: mapping:
uid_only: uid_only:

2
core/modules/views/config/schema/views.schema.yml
View File

@ -1,7 +1,7 @@
# Schema for the configuration files of the Views module. # Schema for the configuration files of the Views module.
views.settings: views.settings:
type: mapping type: config_object
label: 'Views settings' label: 'Views settings'
mapping: mapping:
display_extenders: display_extenders:

4
core/themes/stark/config/schema/stark.schema.yml
View File

@ -3,7 +3,3 @@
stark.settings: stark.settings:
type: theme_settings type: theme_settings
label: 'Stark settings' label: 'Stark settings'
stark.breakpoints:
type: theme_breakpoints_default
label: 'Stark breakpoints'