Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / web / core / modules / language / src / LanguageListBuilder.php

diff --git a/web/core/modules/language/src/LanguageListBuilder.php b/web/core/modules/language/src/LanguageListBuilder.php
index 8d1515220434485e61ee8533fcb4c79e4936be7b..21ef6ff5977a33f9ffb91819e25ecd08b198dd05 100644 (file)
--- a/web/core/modules/language/src/LanguageListBuilder.php
+++ b/web/core/modules/language/src/LanguageListBuilder.php
@@ -9,6 +9,7 @@ use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
+use Drupal\Core\Messenger\MessengerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -37,6 +38,13 @@ class LanguageListBuilder extends DraggableListBuilder {
    */
   protected $configFactory;
 
+  /**
+   * The messenger.
+   *
+   * @var \Drupal\Core\Messenger\MessengerInterface
+   */
+  protected $messenger;
+
   /**
    * {@inheritdoc}
    */
@@ -45,7 +53,8 @@ class LanguageListBuilder extends DraggableListBuilder {
       $entity_type,
       $container->get('entity.manager')->getStorage($entity_type->id()),
       $container->get('language_manager'),
-      $container->get('config.factory')
+      $container->get('config.factory'),
+      $container->get('messenger')
     );
   }
 
@@ -60,11 +69,14 @@ class LanguageListBuilder extends DraggableListBuilder {
    *   The language manager.
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The factory for configuration objects.
+   * @param \Drupal\Core\Messenger\MessengerInterface $messenger
+   *   The messenger.
    */
-  public function __construct(EntityTypeInterface $entity_type, EntityStorageInterface $storage, LanguageManagerInterface $language_manager, ConfigFactoryInterface $config_factory) {
+  public function __construct(EntityTypeInterface $entity_type, EntityStorageInterface $storage, LanguageManagerInterface $language_manager, ConfigFactoryInterface $config_factory, MessengerInterface $messenger) {
     parent::__construct($entity_type, $storage);
     $this->languageManager = $language_manager;
     $this->configFactory = $config_factory;
+    $this->messenger = $messenger;
   }
 
   /**
@@ -154,7 +166,7 @@ class LanguageListBuilder extends DraggableListBuilder {
       $this->languageManager->updateLockedLanguageWeights();
     }
 
-    drupal_set_message(t('Configuration saved.'));
+    $this->messenger->addStatus($this->t('Configuration saved.'));
     // Force the redirection to the page with the language we have just
     // selected as default.
     $form_state->setRedirectUrl($this->entities[$new_id]->urlInfo('collection', ['language' => $this->entities[$new_id]]));