Issue #2022549 by valdo, ParisLiakos, YesCT: Regression: No interface...

Issue #2022549 by valdo, ParisLiakos, YesCT: Regression: No interface translation in the first installer steps.

core/includes/install.core.inc

@@ -1453,11 +1453,11 @@ function install_translations_directory() {
  */
 function install_register_translation_service(ContainerBuilder $container) {
   $container->register('string_translator.file_translation', 'Drupal\Core\StringTranslation\Translator\FileTranslation')
-    ->addArgument(install_translations_directory())
-    ->addTag('string_translator');
-  $container->register('string_translator.custom_strings', 'Drupal\Core\StringTranslation\Translator\CustomStrings')
-    ->addTag('string_translator');
-  $container->register('string_translation', 'Drupal\Core\StringTranslation\TranslationManager');
+    ->addArgument(install_translations_directory());
+  $container->register('string_translator.custom_strings', 'Drupal\Core\StringTranslation\Translator\CustomStrings');
+  $container->register('string_translation', 'Drupal\Core\StringTranslation\TranslationManager')
+    ->addMethodCall('addTranslator', array(new Reference('string_translator.file_translation')))
+    ->addMethodCall('addTranslator', array(new Reference('string_translator.custom_strings')));
 }
 
 /**

core/modules/system/lib/Drupal/system/Tests/Installer/InstallerTranslationTest.php

+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Installer\InstallerTranslationTest.
+ */
+
+namespace Drupal\system\Tests\Installer;
+
+use Drupal\Component\Utility\NestedArray;
+use Drupal\system\Tests\InstallerTest;
+
+/**
+ * Tests the installer translation detection.
+ */
+class InstallerTranslationTest extends InstallerTest {
+
+  public static function getInfo() {
+    return array(
+      'name' => 'Installer translation test',
+      'description' => 'Selects German as the installation language and verifies the following page is not in English.',
+      'group' => 'Installer',
+    );
+  }
+
+  protected function setUp() {
+    global $conf;
+
+    // When running tests through the SimpleTest UI (vs. on the command line),
+    // SimpleTest's batch conflicts with the installer's batch. Batch API does
+    // not support the concept of nested batches (in which the nested is not
+    // progressive), so we need to temporarily pretend there was no batch.
+    // Back up the currently running SimpleTest batch.
+    $this->originalBatch = batch_get();
+
+    // Add the translations directory so we can retrieve German translations.
+    $conf['locale.settings']['translation.path'] = drupal_get_path('module', 'simpletest') . '/files/translations';
+
+    // Create the database prefix for this test.
+    $this->prepareDatabasePrefix();
+
+    // Prepare the environment for running tests.
+    $this->prepareEnvironment();
+    if (!$this->setupEnvironment) {
+      return FALSE;
+    }
+
+    // Reset all statics and variables to perform tests in a clean environment.
+    $conf = array();
+    drupal_static_reset();
+
+    // Change the database prefix.
+    // All static variables need to be reset before the database prefix is
+    // changed, since \Drupal\Core\Utility\CacheArray implementations attempt to
+    // write back to persistent caches when they are destructed.
+    $this->changeDatabasePrefix();
+    if (!$this->setupDatabasePrefix) {
+      return FALSE;
+    }
+    $variable_groups = array(
+      'system.file' => array(
+        'path.private' =>  $this->private_files_directory,
+        'path.temporary' => $this->temp_files_directory,
+      ),
+      'locale.settings' => array(
+        'translation.path' => $this->translation_files_directory,
+      ),
+    );
+    foreach ($variable_groups as $config_base => $variables) {
+      foreach ($variables as $name => $value) {
+        NestedArray::setValue($GLOBALS['conf'], array_merge(array($config_base), explode('.', $name)), $value);
+      }
+    }
+    $settings['conf_path'] = (object) array(
+      'value' => $this->public_files_directory,
+      'required' => TRUE,
+    );
+    $settings['config_directories'] = (object) array(
+      'value' => array(),
+      'required' => TRUE,
+    );
+    $this->writeSettings($settings);
+
+    // Submit the installer with German language.
+    $this->drupalPost($GLOBALS['base_url'] . '/core/install.php', array('langcode' => 'de'), 'Save and continue');
+
+    // On the following page where installation profile is being selected the
+    // interface should be already translated, so there is no "Set up database"
+    // text anymore.
+    $this->assertNoText('Set up database', '"Set up database" string was not found.');
+
+    // After this assertion all we needed to test is tested, but the test
+    // expects the installation to succeed. If the test would finish here, an
+    // exception would occur. That is why the full installation has to be
+    // finished in the further steps.
+
+    // Get the "Save and continue" submit button translated value from the
+    // translated interface.
+    $submit_value = (string) current($this->xpath('//input[@type="submit"]/@value'));
+
+    // Submit the minimal profile installation.
+    $this->drupalPost(NULL, array('profile' => 'minimal'), $submit_value);
+
+    // Submit the next step.
+    $this->drupalPost(NULL, array(), $submit_value);
+
+    // Reload config directories.
+    include $this->public_files_directory . '/settings.php';
+    $prefix = substr($this->public_files_directory, strlen(conf_path() . '/files/'));
+    foreach ($config_directories as $type => $data) {
+      $GLOBALS['config_directories'][$type]['path'] = $prefix . '/files/' . $data['path'];
+    }
+    $this->rebuildContainer();
+
+    foreach ($variable_groups as $config_base => $variables) {
+      $config = config($config_base);
+      foreach ($variables as $name => $value) {
+        $config->set($name, $value);
+      }
+      $config->save();
+    }
+
+    // Use the test mail class instead of the default mail handler class.
+    config('system.mail')->set('interface.default', 'Drupal\Core\Mail\VariableLog')->save();
+
+    drupal_set_time_limit($this->timeLimit);
+    // When running from run-tests.sh we don't get an empty current path which
+    // would indicate we're on the home page.
+    $path = current_path();
+    if (empty($path)) {
+      _current_path('run-tests');
+    }
+    $this->setup = TRUE;
+  }
+
+}