diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/LanguageSelectWidget.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/LanguageSelectWidget.php index cff646d..697c603 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/LanguageSelectWidget.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/LanguageSelectWidget.php @@ -27,10 +27,35 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen $element['value'] = $element + array( '#type' => 'language_select', '#default_value' => $items[$delta]->value, - '#languages' => LanguageInterface::STATE_ALL, + '#languages' => $this->getSetting('include_locked') ? LanguageInterface::STATE_ALL : LanguageInterface::STATE_CONFIGURABLE, ); return $element; } + /** + * {@inheritdoc} + */ + public static function defaultSettings() { + $settings = parent::defaultSettings(); + $settings['include_locked'] = TRUE; + + return $settings; + } + + /** + * {@inheritdoc} + */ + public function settingsForm(array $form, FormStateInterface $form_state) { + $element = parent::settingsForm($form, $form_state); + + $element['include_locked'] = [ + '#type' => 'checkbox', + '#title' => $this->t('Include locked languages such as Not specified and Not applicable'), + '#default_value' => $this->getSetting('include_locked'), + ]; + + return $element; + } + } diff --git a/core/modules/language/config/schema/language.schema.yml b/core/modules/language/config/schema/language.schema.yml index 5e3f55b..91ce2d1 100644 --- a/core/modules/language/config/schema/language.schema.yml +++ b/core/modules/language/config/schema/language.schema.yml @@ -131,3 +131,11 @@ condition.plugin.language: type: sequence sequence: type: string + +field.widget.settings.language_select: + type: mapping + label: 'Language format settings' + mapping: + include_locked: + type: boolean + label: 'Include locked languages' diff --git a/core/modules/language/language.install b/core/modules/language/language.install index dcec16a..45d2acb 100644 --- a/core/modules/language/language.install +++ b/core/modules/language/language.install @@ -5,9 +5,27 @@ * Update functions for Language module. */ +use Drupal\Core\Entity\Entity\EntityFormDisplay; + /** * Rebuild the container as services changed. */ function language_update_8001() { \Drupal::service('kernel')->invalidateContainer(); } + +/** + * Add the 'include_locked' settings to the 'language_select' widget. + */ +function language_update_8002() { + foreach (EntityFormDisplay::loadMultiple() as $display_form) { + $content = $display_form->get('content'); + foreach (array_keys($content) as $element) { + if (isset($content[$element]['type']) && $content[$element]['type'] == 'language_select') { + $content[$element]['settings'] = ['include_locked' => TRUE]; + $display_form->set('content', $content); + $display_form->save(); + } + } + } +} diff --git a/core/modules/language/tests/src/Kernel/LanguageSelectWidgetTest.php b/core/modules/language/tests/src/Kernel/LanguageSelectWidgetTest.php new file mode 100644 index 0000000..966275c --- /dev/null +++ b/core/modules/language/tests/src/Kernel/LanguageSelectWidgetTest.php @@ -0,0 +1,77 @@ +installEntitySchema('entity_test'); + $this->installEntitySchema('user'); + + $storage = $this->container->get('entity_type.manager')->getStorage('entity_form_display'); + $this->entityFormDisplay = $storage->create([ + 'targetEntityType' => 'entity_test', + 'bundle' => 'entity_test', + 'mode' => 'default', + 'status' => TRUE, + ]); + } + + /** + * Tests the widget with the locked languages. + */ + public function testWithIncludedLockedLanguage() { + $this->entityFormDisplay->setComponent('langcode', [ + 'type' => 'language_select', + ])->save(); + $entity = EntityTest::create(['name' => $this->randomString()]); + $form = $this->container->get('entity.form_builder')->getForm($entity); + $options = array_keys($form['langcode']['widget'][0]['value']['#options']); + $this->assertSame(['en', 'und', 'zxx'], $options); + } + + /** + * Test the widget without the locked languages. + */ + public function testWithoutIncludedLockedLanguage() { + $this->entityFormDisplay->setComponent('langcode', [ + 'type' => 'language_select', + 'settings' => ['include_locked' => FALSE], + ])->save(); + $entity = EntityTest::create(['name' => $this->randomString()]); + $form = $this->container->get('entity.form_builder')->getForm($entity); + $options = array_keys($form['langcode']['widget'][0]['value']['#options']); + $this->assertSame(['en'], $options); + } + +}