comparison core/modules/language/src/ConfigurableLanguageManager.php @ 17:129ea1e6d783

Update, including to Drupal core 8.6.10

    * @var bool
    */
   protected $initialized = FALSE;
 
   /**
-   * Whether already in the process of language initialization.
-   *
-   * @var bool
-   */
-  protected $initializing = FALSE;
+   * Whether language types are in the process of language initialization.
+   *
+   * @var bool[]
+   */
+  protected $initializing = [];
 
   /**
    * {@inheritdoc}
    */
   public static function rebuildServices() {

     if (!isset($this->negotiatedLanguages[$type])) {
       // Ensure we have a valid value for this language type.
       $this->negotiatedLanguages[$type] = $this->getDefaultLanguage();
 
       if ($this->negotiator && $this->isMultilingual()) {
-        if (!$this->initializing) {
-          $this->initializing = TRUE;
+        if (!isset($this->initializing[$type])) {
+          $this->initializing[$type] = TRUE;
           $negotiation = $this->negotiator->initializeType($type);
           $this->negotiatedLanguages[$type] = reset($negotiation);
           $this->negotiatedMethods[$type] = key($negotiation);
-          $this->initializing = FALSE;
+          unset($this->initializing[$type]);
         }
         // If the current interface language needs to be retrieved during
         // initialization we return the system language. This way string
         // translation calls happening during initialization will return the
         // original strings which can be translated by calling them again