first commit

web/core/modules/locale/tests/locale_test.es6.js

@@ -0,0 +1,54 @@
+/**
+ * @file
+ * JavaScript for locale_test.module.
+ *
+ * @ignore
+ */
+
+Drupal.t("Standard Call t");
+Drupal
+  .
+  t
+  (
+    "Whitespace Call t"
+  )
+;
+
+Drupal.t('Single Quote t');
+Drupal.t('Single Quote \'Escaped\' t');
+Drupal.t('Single Quote ' + 'Concat ' + 'strings ' + 't');
+
+Drupal.t("Double Quote t");
+Drupal.t("Double Quote \"Escaped\" t");
+Drupal.t("Double Quote " + "Concat " + "strings " + "t");
+
+Drupal.t("Context Unquoted t", {}, {context: "Context string unquoted"});
+Drupal.t("Context Single Quoted t", {}, {'context': "Context string single quoted"});
+Drupal.t("Context Double Quoted t", {}, {"context": "Context string double quoted"});
+
+Drupal.t("Context !key Args t", {'!key': 'value'}, {context: "Context string"});
+
+Drupal.formatPlural(1, "Standard Call plural", "Standard Call @count plural");
+Drupal
+  .
+  formatPlural
+  (
+    1,
+    "Whitespace Call plural",
+    "Whitespace Call @count plural"
+  )
+;
+
+Drupal.formatPlural(1, 'Single Quote plural', 'Single Quote @count plural');
+Drupal.formatPlural(1, 'Single Quote \'Escaped\' plural', 'Single Quote \'Escaped\' @count plural');
+
+Drupal.formatPlural(1, "Double Quote plural", "Double Quote @count plural");
+Drupal.formatPlural(1, "Double Quote \"Escaped\" plural", "Double Quote \"Escaped\" @count plural");
+
+Drupal.formatPlural(1, "Context Unquoted plural", "Context Unquoted @count plural", {}, {context: "Context string unquoted"});
+Drupal.formatPlural(1, "Context Single Quoted plural", "Context Single Quoted @count plural", {}, {'context': "Context string single quoted"});
+Drupal.formatPlural(1, "Context Double Quoted plural", "Context Double Quoted @count plural", {}, {"context": "Context string double quoted"});
+
+Drupal.formatPlural(1, "Context !key Args plural", "Context !key Args @count plural", {'!key': 'value'}, {context: "Context string"});
+
+Drupal.formatPlural(1, "No count argument plural - singular", "No count argument plural - plural");

web/core/modules/locale/tests/locale_test.js

@@ -0,0 +1,40 @@
+/**
+* DO NOT EDIT THIS FILE.
+* See the following change record for more information,
+* https://www.drupal.org/node/2815083
+* @preserve
+**/
+
+Drupal.t("Standard Call t");
+Drupal.t("Whitespace Call t");
+
+Drupal.t('Single Quote t');
+Drupal.t('Single Quote \'Escaped\' t');
+Drupal.t('Single Quote ' + 'Concat ' + 'strings ' + 't');
+
+Drupal.t("Double Quote t");
+Drupal.t("Double Quote \"Escaped\" t");
+Drupal.t("Double Quote " + "Concat " + "strings " + "t");
+
+Drupal.t("Context Unquoted t", {}, { context: "Context string unquoted" });
+Drupal.t("Context Single Quoted t", {}, { 'context': "Context string single quoted" });
+Drupal.t("Context Double Quoted t", {}, { "context": "Context string double quoted" });
+
+Drupal.t("Context !key Args t", { '!key': 'value' }, { context: "Context string" });
+
+Drupal.formatPlural(1, "Standard Call plural", "Standard Call @count plural");
+Drupal.formatPlural(1, "Whitespace Call plural", "Whitespace Call @count plural");
+
+Drupal.formatPlural(1, 'Single Quote plural', 'Single Quote @count plural');
+Drupal.formatPlural(1, 'Single Quote \'Escaped\' plural', 'Single Quote \'Escaped\' @count plural');
+
+Drupal.formatPlural(1, "Double Quote plural", "Double Quote @count plural");
+Drupal.formatPlural(1, "Double Quote \"Escaped\" plural", "Double Quote \"Escaped\" @count plural");
+
+Drupal.formatPlural(1, "Context Unquoted plural", "Context Unquoted @count plural", {}, { context: "Context string unquoted" });
+Drupal.formatPlural(1, "Context Single Quoted plural", "Context Single Quoted @count plural", {}, { 'context': "Context string single quoted" });
+Drupal.formatPlural(1, "Context Double Quoted plural", "Context Double Quoted @count plural", {}, { "context": "Context string double quoted" });
+
+Drupal.formatPlural(1, "Context !key Args plural", "Context !key Args @count plural", { '!key': 'value' }, { context: "Context string" });
+
+Drupal.formatPlural(1, "No count argument plural - singular", "No count argument plural - plural");

web/core/modules/locale/tests/modules/early_translation_test/early_translation_test.info.yml

@@ -0,0 +1,6 @@
+name: 'Early translation test'
+type: module
+description: 'Support module for testing early bootstrap getting of annotations with translations.'
+core: 8.x
+package: Testing
+version: VERSION

web/core/modules/locale/tests/modules/early_translation_test/early_translation_test.services.yml

@@ -0,0 +1,6 @@
+services:
+  early_translation_test.authentication.early_translation_test:
+    class: Drupal\early_translation_test\Auth
+    arguments: ['@entity_type.manager']
+    tags:
+      - { name: authentication_provider, provider_id: 'early_translation_test', priority: 100 }

web/core/modules/locale/tests/modules/early_translation_test/src/Auth.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace Drupal\early_translation_test;
+
+use Drupal\Core\Authentication\AuthenticationProviderInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Test authentication provider.
+ */
+class Auth implements AuthenticationProviderInterface {
+
+  /**
+   * The user storage.
+   *
+   * @var \Drupal\user\UserStorageInterface
+   */
+  protected $userStorage;
+
+  /**
+   * Constructs an authentication provider object.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
+   */
+  public function __construct(EntityTypeManagerInterface $entity_type_manager) {
+    // Authentication providers are called early during in the bootstrap.
+    // Getting the user storage used to result in a circular reference since
+    // translation involves a call to \Drupal\locale\LocaleLookup that tries to
+    // get the user roles.
+    // @see https://www.drupal.org/node/2241461
+    $this->userStorage = $entity_type_manager->getStorage('user');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function applies(Request $request) {
+    return FALSE;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function authenticate(Request $request) {
+    return NULL;
+  }
+
+}

web/core/modules/locale/tests/modules/locale_test/config/install/language/de/locale_test.translation.yml

@@ -0,0 +1 @@
+test: German test

web/core/modules/locale/tests/modules/locale_test/config/install/locale_test.no_translation.yml

@@ -0,0 +1 @@
+test: Test

web/core/modules/locale/tests/modules/locale_test/config/install/locale_test.translation.yml

@@ -0,0 +1 @@
+test: English test

web/core/modules/locale/tests/modules/locale_test/config/install/locale_test.translation_multiple.yml

@@ -0,0 +1,8 @@
+test: English test
+test_multiple:
+  string: 'A string'
+  another_string: 'Another string'
+  test_after_multiple: false
+test_after_multiple:
+  string: 'After a string'
+  another_string: 'After another string'

web/core/modules/locale/tests/modules/locale_test/config/optional/block.block.test_default_config.yml

@@ -0,0 +1,19 @@
+langcode: en
+status: true
+dependencies:
+  theme:
+    - classy
+id: test_default_config
+theme: classy
+region: content
+weight: -40
+provider: null
+plugin: local_tasks_block
+settings:
+  id: local_tasks_block
+  label: Tabs
+  provider: core
+  label_display: '0'
+  primary: true
+  secondary: true
+visibility: {  }

web/core/modules/locale/tests/modules/locale_test/config/schema/locale_test.schema.yml

@@ -0,0 +1,58 @@
+# Schema for the configuration files of the Locale Test module.
+
+locale_test.no_translation:
+  type: config_object
+  label: 'No traslation settings'
+  mapping:
+    test:
+      type: string
+      label: 'Test'
+      # See \Drupal\Tests\locale\Kernel\LocaleConfigSubscriberTest
+      translatable: true
+
+locale_test.translation:
+  type: config_object
+  label: 'translation settings'
+  mapping:
+    test:
+      type: string
+      label: 'Test'
+      # See \Drupal\Tests\locale\Kernel\LocaleConfigSubscriberTest
+      translatable: true
+
+locale_test.translation_multiple:
+  type: config_object
+  label: 'translation settings'
+  mapping:
+    test:
+      type: string
+      label: 'Test'
+      # See \Drupal\Tests\locale\Kernel\LocaleConfigSubscriberTest
+      translatable: true
+    test_multiple:
+      type: mapping
+      label: 'Multiple settings'
+      mapping:
+        string:
+          type: string
+          label: 'A string'
+          translatable: true
+        another_string:
+          type: string
+          label: 'Another string'
+          translatable: true
+        test_after_multiple:
+          type: boolean
+          label: 'Test after multiple'
+    test_after_multiple:
+      type: mapping
+      label: 'Test after multiple settings'
+      mapping:
+        string:
+          type: string
+          label: 'A string'
+          translatable: true
+        another_string:
+          type: string
+          label: 'Another string'
+          translatable: true

web/core/modules/locale/tests/modules/locale_test/locale_test.info.yml

@@ -0,0 +1,9 @@
+name: 'Locale test'
+type: module
+description: 'Support module for locale module testing.'
+package: Testing
+version: '1.2'
+core: 8.x
+hidden: true
+'interface translation project': locale_test
+'interface translation server pattern': core/modules/locale/test/test.%language.po

web/core/modules/locale/tests/modules/locale_test/locale_test.install

@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @file
+ * Install, update and uninstall functions for the locale_test module.
+ */
+
+/**
+ * Implements hook_uninstall().
+ */
+function locale_test_uninstall() {
+  // Clear variables.
+  \Drupal::state()->delete('locale.test_system_info_alter');
+  \Drupal::state()->delete('locale.test_projects_alter');
+}

web/core/modules/locale/tests/modules/locale_test/locale_test.module

@@ -0,0 +1,216 @@
+<?php
+
+/**
+ * @file
+ * Simulate a custom module with a local po file.
+ */
+
+use Drupal\Core\Url;
+use Drupal\Core\Extension\Extension;
+use Drupal\Core\StreamWrapper\PublicStream;
+
+/**
+ * Implements hook_system_info_alter().
+ *
+ * Make the test scripts to be believe this is not a hidden test module, but
+ * a regular custom module.
+ */
+function locale_test_system_info_alter(&$info, Extension $file, $type) {
+  // Only modify the system info if required.
+  // By default the locale_test modules are hidden and have a project specified.
+  // To test the module detection process by locale_project_list() the
+  // test modules should mimic a custom module. I.e. be non-hidden.
+  if (\Drupal::state()->get('locale.test_system_info_alter')) {
+    if ($file->getName() == 'locale_test' || $file->getName() == 'locale_test_translate') {
+      // Don't hide the module.
+      $info['hidden'] = FALSE;
+    }
+  }
+
+  // Alter the name and the core version of the project. This should not affect
+  // the locale project information.
+  if (\Drupal::state()->get('locale.test_system_info_alter_name_core')) {
+    if ($file->getName() == 'locale_test') {
+      $info['core'] = '8.6.7';
+      $info['name'] = 'locale_test_alter';
+    }
+  }
+}
+
+/**
+ * Implements hook_locale_translation_projects_alter().
+ *
+ * The translation status process by default checks the status of the installed
+ * projects. This function replaces the data of the installed modules by a
+ * predefined set of modules with fixed file names and release versions. Project
+ * names, versions, timestamps etc must be fixed because they must match the
+ * files created by the test script.
+ *
+ * The "locale.test_projects_alter" state variable must be set by the
+ * test script in order for this hook to take effect.
+ */
+function locale_test_locale_translation_projects_alter(&$projects) {
+  // Drupal core should not be translated. By overriding the server pattern we
+  // make sure that no translation for drupal core will be found and that the
+  // translation update system will not go out to l.d.o to check.
+  $projects['drupal']['server_pattern'] = 'translations://';
+
+  if (\Drupal::state()->get('locale.remove_core_project')) {
+    unset($projects['drupal']);
+  }
+
+  if (\Drupal::state()->get('locale.test_projects_alter')) {
+
+    // Instead of the default ftp.drupal.org we use the file system of the test
+    // instance to simulate a remote file location.
+    $url = Url::fromRoute('<front>', [], ['absolute' => TRUE])->toString();
+    $remote_url = $url . PublicStream::basePath() . '/remote/';
+
+    // Completely replace the project data with a set of test projects.
+    $projects = [
+      'contrib_module_one' => [
+        'name' => 'contrib_module_one',
+        'info' => [
+          'name' => 'Contributed module one',
+          'interface translation server pattern' => $remote_url . '%core/%project/%project-%version.%language._po',
+          'package' => 'Other',
+          'version' => '8.x-1.1',
+          'project' => 'contrib_module_one',
+          'datestamp' => '1344471537',
+          '_info_file_ctime' => 1348767306,
+        ],
+        'datestamp' => '1344471537',
+        'project_type' => 'module',
+        'project_status' => TRUE,
+      ],
+      'contrib_module_two' => [
+        'name' => 'contrib_module_two',
+        'info' => [
+          'name' => 'Contributed module two',
+          'interface translation server pattern' => $remote_url . '%core/%project/%project-%version.%language._po',
+          'package' => 'Other',
+          'version' => '8.x-2.0-beta4',
+          'project' => 'contrib_module_two',
+          'datestamp' => '1344471537',
+          '_info_file_ctime' => 1348767306,
+        ],
+        'datestamp' => '1344471537',
+        'project_type' => 'module',
+        'project_status' => TRUE,
+      ],
+      'contrib_module_three' => [
+        'name' => 'contrib_module_three',
+        'info' => [
+          'name' => 'Contributed module three',
+          'interface translation server pattern' => $remote_url . '%core/%project/%project-%version.%language._po',
+          'package' => 'Other',
+          'version' => '8.x-1.0',
+          'project' => 'contrib_module_three',
+          'datestamp' => '1344471537',
+          '_info_file_ctime' => 1348767306,
+        ],
+        'datestamp' => '1344471537',
+        'project_type' => 'module',
+        'project_status' => TRUE,
+      ],
+      'locale_test' => [
+        'name' => 'locale_test',
+        'info' => [
+          'name' => 'Locale test',
+          'interface translation project' => 'locale_test',
+          'interface translation server pattern' => 'core/modules/locale/tests/test.%language.po',
+          'package' => 'Other',
+          'version' => NULL,
+          'project' => 'locale_test',
+          '_info_file_ctime' => 1348767306,
+          'datestamp' => 0,
+        ],
+        'datestamp' => 0,
+        'project_type' => 'module',
+        'project_status' => TRUE,
+      ],
+      'custom_module_one' => [
+        'name' => 'custom_module_one',
+        'info' => [
+          'name' => 'Custom module one',
+          'interface translation project' => 'custom_module_one',
+          'interface translation server pattern' => 'translations://custom_module_one.%language.po',
+          'package' => 'Other',
+          'version' => NULL,
+          'project' => 'custom_module_one',
+          '_info_file_ctime' => 1348767306,
+          'datestamp' => 0,
+        ],
+        'datestamp' => 0,
+        'project_type' => 'module',
+        'project_status' => TRUE,
+      ],
+    ];
+  }
+}
+
+/**
+ * Implements hook_language_fallback_candidates_OPERATION_alter().
+ */
+function locale_test_language_fallback_candidates_locale_lookup_alter(array &$candidates, array $context) {
+  \Drupal::state()->set('locale.test_language_fallback_candidates_locale_lookup_alter_candidates', $candidates);
+  \Drupal::state()->set('locale.test_language_fallback_candidates_locale_lookup_alter_context', $context);
+}
+
+/**
+ * Implements hook_theme().
+ */
+function locale_test_theme() {
+  $return = [];
+
+  $return['locale_test_tokenized'] = [
+    'variable' => ['content' => ''],
+  ];
+
+  return $return;
+}
+
+/**
+ * Implements hook_token_info().
+ */
+function locale_test_token_info() {
+  $info = [];
+
+  $info['types']['locale_test'] = [
+    'name' => t('Locale test'),
+    'description' => t('Locale test'),
+  ];
+
+  $info['tokens']['locale_test']['security_test1'] = [
+    'type' => 'text',
+    'name' => t('Security test 1'),
+  ];
+  $info['tokens']['locale_test']['security_test2'] = [
+    'type' => 'text',
+    'name' => t('Security test 2'),
+  ];
+
+  return $info;
+}
+
+/**
+ * Implements hook_tokens().
+ */
+function locale_test_tokens($type, $tokens, array $data = [], array $options = []) {
+  $return = [];
+  if ($type == 'locale_test') {
+    foreach ($tokens as $name => $original) {
+      switch ($name) {
+        case 'security_test1':
+          $return[$original] = "javascript:alert('Mooooh!');";
+          break;
+
+        case 'security_test2':
+          $return[$original] = "<script>alert('Mooooh!');</script>";
+          break;
+      }
+    }
+  }
+
+  return $return;
+}

web/core/modules/locale/tests/modules/locale_test/templates/locale-test-tokenized.html.twig

@@ -0,0 +1 @@
+{{ content }}

web/core/modules/locale/tests/modules/locale_test_development_release/locale_test_development_release.info.yml

@@ -0,0 +1,7 @@
+name: 'Locale Test Development Release'
+type: module
+description: 'Helper module to test the behavior when the core verison is a development release.'
+package: Testing
+version: VERSION
+core: 8.x
+hidden: true

web/core/modules/locale/tests/modules/locale_test_development_release/locale_test_development_release.module

@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * @file
+ * Simulate a Drupal version.
+ */
+
+use Drupal\Core\Extension\Extension;
+
+/**
+ * Implements hook_system_info_alter().
+ *
+ * Change the core version number to a development one for testing.
+ * 8.0.0-alpha102-dev is the simulated version.
+ */
+function locale_test_development_release_system_info_alter(&$info, Extension $file, $type) {
+  if (isset($info['package']) && $info['package'] == 'Core') {
+    $info['version'] = '8.0.0-alpha102-dev';
+  }
+}
+
+/**
+ * Implements hook_locale_translation_projects_alter().
+ *
+ * Add a contrib module with a dev release to list of translatable modules.
+ */
+function locale_test_development_release_locale_translation_projects_alter(&$projects) {
+  $projects['contrib'] = [
+    'name' => 'contrib',
+    'info' => [
+      'name' => 'Contributed module',
+      'package' => 'Other',
+      'version' => '12.x-10.4-unstable11+14-dev',
+      'project' => 'contrib_module',
+      'datestamp' => '0',
+      '_info_file_ctime' => 1442933959,
+    ],
+    'datestamp' => '0',
+    'project_type' => 'module',
+    'project_status' => TRUE,
+  ];
+}

web/core/modules/locale/tests/modules/locale_test_translate/config/install/locale_test_translate.settings.yml

@@ -0,0 +1,3 @@
+translatable_no_default: ''
+translatable_default_with_translation: 'Locale can translate'
+translatable_default_with_no_translation: 'Locale can not translate'

web/core/modules/locale/tests/modules/locale_test_translate/config/schema/locale_test_translate.schema.yml

@@ -0,0 +1,10 @@
+locale_test_translate.settings:
+  type: config_object
+  label: 'Test for locale translations'
+  mapping:
+    translatable_no_default:
+      type: label
+    translatable_default_with_translation:
+      type: label
+    translatable_default_with_no_translation:
+      type: label

web/core/modules/locale/tests/modules/locale_test_translate/locale_test_translate.info.yml

@@ -0,0 +1,9 @@
+name: 'Locale test translate'
+type: module
+description: 'Translation test module for locale module testing.'
+package: Testing
+version: '1.3'
+core: 8.x
+hidden: true
+'interface translation project': locale_test_translate
+'interface translation server pattern': core/modules/locale/tests/test.%language.po

web/core/modules/locale/tests/modules/locale_test_translate/locale_test_translate.module

@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @file
+ * Simulates a custom module with a local po file.
+ */
+
+use Drupal\Core\Extension\Extension;
+
+/**
+ * Implements hook_system_info_alter().
+ *
+ * By default this modules is hidden but once enabled it behaves like a normal
+ * (not hidden) module. This hook implementation changes the .info.yml data by
+ * setting the hidden status to FALSE.
+ */
+function locale_test_translate_system_info_alter(&$info, Extension $file, $type) {
+  if ($file->getName() == 'locale_test_translate') {
+    // Don't hide the module.
+    $info['hidden'] = FALSE;
+  }
+}

web/core/modules/locale/tests/src/Functional/LocaleConfigTranslationImportTest.php

@@ -0,0 +1,239 @@
+<?php
+
+namespace Drupal\Tests\locale\Functional;
+
+use Drupal\locale\Locale;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\language\Entity\ConfigurableLanguage;
+
+/**
+ * Tests translation update's effects on configuration translations.
+ *
+ * @group locale
+ */
+class LocaleConfigTranslationImportTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['language', 'locale_test_translate'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+  }
+
+  /**
+   * Test update changes configuration translations if enabled after language.
+   */
+  public function testConfigTranslationImport() {
+    $admin_user = $this->drupalCreateUser(['administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'administer permissions']);
+    $this->drupalLogin($admin_user);
+
+    // Add a language. The Afrikaans translation file of locale_test_translate
+    // (test.af.po) has been prepared with a configuration translation.
+    ConfigurableLanguage::createFromLangcode('af')->save();
+
+    // Enable locale module.
+    $this->container->get('module_installer')->install(['locale']);
+    $this->resetAll();
+
+    // Enable import of translations. By default this is disabled for automated
+    // tests.
+    $this->config('locale.settings')
+      ->set('translation.import_enabled', TRUE)
+      ->set('translation.use_source', LOCALE_TRANSLATION_USE_SOURCE_LOCAL)
+      ->save();
+
+    // Add translation permissions now that the locale module has been enabled.
+    $edit = [
+      'authenticated[translate interface]' => 'translate interface',
+    ];
+    $this->drupalPostForm('admin/people/permissions', $edit, t('Save permissions'));
+
+    // Check and update the translation status. This will import the Afrikaans
+    // translations of locale_test_translate module.
+    $this->drupalGet('admin/reports/translations/check');
+
+    // Override the Drupal core translation status to be up to date.
+    // Drupal core should not be a subject in this test.
+    $status = locale_translation_get_status();
+    $status['drupal']['af']->type = 'current';
+    \Drupal::state()->set('locale.translation_status', $status);
+
+    $this->drupalPostForm('admin/reports/translations', [], t('Update translations'));
+
+    // Check if configuration translations have been imported.
+    $override = \Drupal::languageManager()->getLanguageConfigOverride('af', 'system.maintenance');
+    $this->assertEqual($override->get('message'), 'Ons is tans besig met onderhoud op @site. Wees asseblief geduldig, ons sal binnekort weer terug wees.');
+  }
+
+  /**
+   * Test update changes configuration translations if enabled after language.
+   */
+  public function testConfigTranslationModuleInstall() {
+
+    // Enable locale, block and config_translation modules.
+    $this->container->get('module_installer')->install(['block', 'config_translation']);
+    $this->resetAll();
+
+    // The testing profile overrides locale.settings to disable translation
+    // import. Test that this override is in place.
+    $this->assertFalse($this->config('locale.settings')->get('translation.import_enabled'), 'Translations imports are disabled by default in the Testing profile.');
+
+    $admin_user = $this->drupalCreateUser(['administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'administer permissions', 'translate configuration']);
+    $this->drupalLogin($admin_user);
+
+    // Enable import of translations. By default this is disabled for automated
+    // tests.
+    $this->config('locale.settings')
+      ->set('translation.import_enabled', TRUE)
+      ->set('translation.use_source', LOCALE_TRANSLATION_USE_SOURCE_LOCAL)
+      ->save();
+
+    // Add predefined language.
+    $this->drupalPostForm('admin/config/regional/language/add', ['predefined_langcode' => 'af'], t('Add language'));
+
+    // Add the system branding block to the page.
+    $this->drupalPlaceBlock('system_branding_block', ['region' => 'header', 'id' => 'site-branding']);
+    $this->drupalPostForm('admin/config/system/site-information', ['site_slogan' => 'Test site slogan'], 'Save configuration');
+    $this->drupalPostForm('admin/config/system/site-information/translate/af/edit', ['translation[config_names][system.site][slogan]' => 'Test site slogan in Afrikaans'], 'Save translation');
+
+    // Get the front page and ensure that the translated configuration appears.
+    $this->drupalGet('af');
+    $this->assertText('Test site slogan in Afrikaans');
+
+    $override = \Drupal::languageManager()->getLanguageConfigOverride('af', 'locale_test_translate.settings');
+    $this->assertEqual('Locale can translate Afrikaans', $override->get('translatable_default_with_translation'));
+
+    // Update test configuration.
+    $override
+      ->set('translatable_no_default', 'This translation is preserved')
+      ->set('translatable_default_with_translation', 'This translation is preserved')
+      ->set('translatable_default_with_no_translation', 'This translation is preserved')
+      ->save();
+
+    // Install any module.
+    $this->drupalPostForm('admin/modules', ['modules[dblog][enable]' => 'dblog'], t('Install'));
+    $this->assertText('Module Database Logging has been enabled.');
+
+    // Get the front page and ensure that the translated configuration still
+    // appears.
+    $this->drupalGet('af');
+    $this->assertText('Test site slogan in Afrikaans');
+
+    $this->rebuildContainer();
+    $override = \Drupal::languageManager()->getLanguageConfigOverride('af', 'locale_test_translate.settings');
+    $expected = [
+      'translatable_no_default' => 'This translation is preserved',
+      'translatable_default_with_translation' => 'This translation is preserved',
+      'translatable_default_with_no_translation' => 'This translation is preserved',
+    ];
+    $this->assertEqual($expected, $override->get());
+  }
+
+  /**
+   * Test removing a string from Locale deletes configuration translations.
+   */
+  public function testLocaleRemovalAndConfigOverrideDelete() {
+    // Enable the locale module.
+    $this->container->get('module_installer')->install(['locale']);
+    $this->resetAll();
+
+    $admin_user = $this->drupalCreateUser(['administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'administer permissions', 'translate interface']);
+    $this->drupalLogin($admin_user);
+
+    // Enable import of translations. By default this is disabled for automated
+    // tests.
+    $this->config('locale.settings')
+      ->set('translation.import_enabled', TRUE)
+      ->set('translation.use_source', LOCALE_TRANSLATION_USE_SOURCE_LOCAL)
+      ->save();
+
+    // Add predefined language.
+    $this->drupalPostForm('admin/config/regional/language/add', ['predefined_langcode' => 'af'], t('Add language'));
+
+    $override = \Drupal::languageManager()->getLanguageConfigOverride('af', 'locale_test_translate.settings');
+    $this->assertEqual(['translatable_default_with_translation' => 'Locale can translate Afrikaans'], $override->get());
+
+    // Remove the string from translation to simulate a Locale removal. Note
+    // that is no current way of doing this in the UI.
+    $locale_storage = \Drupal::service('locale.storage');
+    $string = $locale_storage->findString(['source' => 'Locale can translate']);
+    \Drupal::service('locale.storage')->delete($string);
+    // Force a rebuild of config translations.
+    $count = Locale::config()->updateConfigTranslations(['locale_test_translate.settings'], ['af']);
+    $this->assertEqual($count, 1, 'Correct count of updated translations');
+
+    $override = \Drupal::languageManager()->getLanguageConfigOverride('af', 'locale_test_translate.settings');
+    $this->assertEqual([], $override->get());
+    $this->assertTrue($override->isNew(), 'The configuration override was deleted when the Locale string was deleted.');
+  }
+
+  /**
+   * Test removing a string from Locale changes configuration translations.
+   */
+  public function testLocaleRemovalAndConfigOverridePreserve() {
+    // Enable the locale module.
+    $this->container->get('module_installer')->install(['locale']);
+    $this->resetAll();
+
+    $admin_user = $this->drupalCreateUser(['administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'administer permissions', 'translate interface']);
+    $this->drupalLogin($admin_user);
+
+    // Enable import of translations. By default this is disabled for automated
+    // tests.
+    $this->config('locale.settings')
+      ->set('translation.import_enabled', TRUE)
+      ->set('translation.use_source', LOCALE_TRANSLATION_USE_SOURCE_LOCAL)
+      ->save();
+
+    // Add predefined language.
+    $this->drupalPostForm('admin/config/regional/language/add', ['predefined_langcode' => 'af'], t('Add language'));
+
+    $override = \Drupal::languageManager()->getLanguageConfigOverride('af', 'locale_test_translate.settings');
+    // Update test configuration.
+    $override
+      ->set('translatable_no_default', 'This translation is preserved')
+      ->set('translatable_default_with_no_translation', 'This translation is preserved')
+      ->save();
+    $expected = [
+      'translatable_default_with_translation' => 'Locale can translate Afrikaans',
+      'translatable_no_default' => 'This translation is preserved',
+      'translatable_default_with_no_translation' => 'This translation is preserved',
+    ];
+    $this->assertEqual($expected, $override->get());
+
+    // Set the translated string to empty.
+    $search = [
+      'string' => 'Locale can translate',
+      'langcode' => 'af',
+      'translation' => 'all',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $textareas = $this->xpath('//textarea');
+    $textarea = current($textareas);
+    $lid = $textarea->getAttribute('name');
+    $edit = [
+      $lid => '',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
+
+    $override = \Drupal::languageManager()->getLanguageConfigOverride('af', 'locale_test_translate.settings');
+    $expected = [
+      'translatable_no_default' => 'This translation is preserved',
+      'translatable_default_with_no_translation' => 'This translation is preserved',
+    ];
+    $this->assertEqual($expected, $override->get());
+  }
+
+}

web/core/modules/locale/tests/src/Functional/LocaleConfigTranslationTest.php

@@ -0,0 +1,253 @@
+<?php
+
+namespace Drupal\Tests\locale\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Core\Language\LanguageInterface;
+
+/**
+ * Tests translation of configuration strings.
+ *
+ * @group locale
+ */
+class LocaleConfigTranslationTest extends BrowserTestBase {
+
+  /**
+   * The language code used.
+   *
+   * @var string
+   */
+  protected $langcode;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['locale', 'contact', 'contact_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    // Add a default locale storage for all these tests.
+    $this->storage = $this->container->get('locale.storage');
+
+    // Enable import of translations. By default this is disabled for automated
+    // tests.
+    $this->config('locale.settings')
+      ->set('translation.import_enabled', TRUE)
+      ->set('translation.use_source', LOCALE_TRANSLATION_USE_SOURCE_LOCAL)
+      ->save();
+
+    // Add custom language.
+    $this->langcode = 'xx';
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages', 'translate interface', 'administer modules', 'access site-wide contact form', 'administer contact forms', 'administer site configuration']);
+    $this->drupalLogin($admin_user);
+    $name = $this->randomMachineName(16);
+    $edit = [
+      'predefined_langcode' => 'custom',
+      'langcode' => $this->langcode,
+      'label' => $name,
+      'direction' => LanguageInterface::DIRECTION_LTR,
+    ];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
+    // Set path prefix.
+    $edit = ["prefix[$this->langcode]" => $this->langcode];
+    $this->drupalPostForm('admin/config/regional/language/detection/url', $edit, t('Save configuration'));
+  }
+
+  /**
+   * Tests basic configuration translation.
+   */
+  public function testConfigTranslation() {
+    // Check that the maintenance message exists and create translation for it.
+    $source = '@site is currently under maintenance. We should be back shortly. Thank you for your patience.';
+    $string = $this->storage->findString(['source' => $source, 'context' => '', 'type' => 'configuration']);
+    $this->assertNotEmpty($string, 'Configuration strings have been created upon installation.');
+
+    // Translate using the UI so configuration is refreshed.
+    $message = $this->randomMachineName(20);
+    $search = [
+      'string' => $string->source,
+      'langcode' => $this->langcode,
+      'translation' => 'all',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $textareas = $this->xpath('//textarea');
+    $textarea = current($textareas);
+    $lid = $textarea->getAttribute('name');
+    $edit = [
+      $lid => $message,
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
+
+    // Get translation and check we've only got the message.
+    $translation = \Drupal::languageManager()->getLanguageConfigOverride($this->langcode, 'system.maintenance')->get();
+    $this->assertCount(1, $translation, 'Got the right number of properties after translation.');
+    $this->assertEqual($translation['message'], $message);
+
+    // Check default medium date format exists and create a translation for it.
+    $string = $this->storage->findString(['source' => 'D, m/d/Y - H:i', 'context' => 'PHP date format', 'type' => 'configuration']);
+    $this->assertNotEmpty($string, 'Configuration date formats have been created upon installation.');
+
+    // Translate using the UI so configuration is refreshed.
+    $search = [
+      'string' => $string->source,
+      'langcode' => $this->langcode,
+      'translation' => 'all',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $textareas = $this->xpath('//textarea');
+    $textarea = current($textareas);
+    $lid = $textarea->getAttribute('name');
+    $edit = [
+      $lid => 'D',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
+
+    $translation = \Drupal::languageManager()->getLanguageConfigOverride($this->langcode, 'core.date_format.medium')->get();
+    $this->assertEqual($translation['pattern'], 'D', 'Got the right date format pattern after translation.');
+
+    // Formatting the date 8 / 27 / 1985 @ 13:37 EST with pattern D should
+    // display "Tue".
+    $formatted_date = $this->container->get('date.formatter')->format(494015820, $type = 'medium', NULL, 'America/New_York', $this->langcode);
+    $this->assertEqual($formatted_date, 'Tue', 'Got the right formatted date using the date format translation pattern.');
+
+    // Assert strings from image module config are not available.
+    $string = $this->storage->findString(['source' => 'Medium (220×220)', 'context' => '', 'type' => 'configuration']);
+    $this->assertNull($string, 'Configuration strings have been created upon installation.');
+
+    // Enable the image module.
+    $this->drupalPostForm('admin/modules', ['modules[image][enable]' => "1"], t('Install'));
+    $this->rebuildContainer();
+
+    $string = $this->storage->findString(['source' => 'Medium (220×220)', 'context' => '', 'type' => 'configuration']);
+    $this->assertNotEmpty($string, 'Configuration strings have been created upon installation.');
+    $locations = $string->getLocations();
+    $this->assertTrue(isset($locations['configuration']) && isset($locations['configuration']['image.style.medium']), 'Configuration string has been created with the right location');
+
+    // Check the string is unique and has no translation yet.
+    $translations = $this->storage->getTranslations(['language' => $this->langcode, 'type' => 'configuration', 'name' => 'image.style.medium']);
+    $this->assertCount(1, $translations);
+    $translation = reset($translations);
+    $this->assertEqual($translation->source, $string->source);
+    $this->assertEmpty($translation->translation);
+
+    // Translate using the UI so configuration is refreshed.
+    $image_style_label = $this->randomMachineName(20);
+    $search = [
+      'string' => $string->source,
+      'langcode' => $this->langcode,
+      'translation' => 'all',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $textarea = current($this->xpath('//textarea'));
+    $lid = $textarea->getAttribute('name');
+    $edit = [
+      $lid => $image_style_label,
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
+
+    // Check the right single translation has been created.
+    $translations = $this->storage->getTranslations(['language' => $this->langcode, 'type' => 'configuration', 'name' => 'image.style.medium']);
+    $translation = reset($translations);
+    $this->assertCount(1, $translations, 'Got only one translation for image configuration.');
+    $this->assertEquals($string->source, $translation->source);
+    $this->assertEquals($image_style_label, $translation->translation);
+
+    // Try more complex configuration data.
+    $translation = \Drupal::languageManager()->getLanguageConfigOverride($this->langcode, 'image.style.medium')->get();
+    $this->assertEqual($translation['label'], $image_style_label, 'Got the right translation for image style name after translation');
+
+    // Uninstall the module.
+    $this->drupalPostForm('admin/modules/uninstall', ['uninstall[image]' => "image"], t('Uninstall'));
+    $this->drupalPostForm(NULL, [], t('Uninstall'));
+
+    // Ensure that the translated configuration has been removed.
+    $override = \Drupal::languageManager()->getLanguageConfigOverride('xx', 'image.style.medium');
+    $this->assertTrue($override->isNew(), 'Translated configuration for image module removed.');
+
+    // Translate default category using the UI so configuration is refreshed.
+    $category_label = $this->randomMachineName(20);
+    $search = [
+      'string' => 'Website feedback',
+      'langcode' => $this->langcode,
+      'translation' => 'all',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $textarea = current($this->xpath('//textarea'));
+    $lid = $textarea->getAttribute('name');
+    $edit = [
+      $lid => $category_label,
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
+
+    // Check if this category displayed in this language will use the
+    // translation. This test ensures the entity loaded from the request
+    // upcasting will already work.
+    $this->drupalGet($this->langcode . '/contact/feedback');
+    $this->assertText($category_label);
+
+    // Check if the UI does not show the translated String.
+    $this->drupalGet('admin/structure/contact/manage/feedback');
+    $this->assertFieldById('edit-label', 'Website feedback', 'Translation is not loaded for Edit Form.');
+  }
+
+  /**
+   * Test translatability of optional configuration in locale.
+   */
+  public function testOptionalConfiguration() {
+    $this->assertNodeConfig(FALSE, FALSE);
+    // Enable the node module.
+    $this->drupalPostForm('admin/modules', ['modules[node][enable]' => "1"], t('Install'));
+    $this->drupalPostForm(NULL, [], t('Continue'));
+    $this->rebuildContainer();
+    $this->assertNodeConfig(TRUE, FALSE);
+    // Enable the views module (which node provides some optional config for).
+    $this->drupalPostForm('admin/modules', ['modules[views][enable]' => "1"], t('Install'));
+    $this->rebuildContainer();
+    $this->assertNodeConfig(TRUE, TRUE);
+  }
+
+  /**
+   * Check that node configuration source strings are made available in locale.
+   *
+   * @param bool $required
+   *   Whether to assume a sample of the required default configuration is
+   *   present.
+   * @param bool $optional
+   *   Whether to assume a sample of the optional default configuration is
+   *   present.
+   */
+  protected function assertNodeConfig($required, $optional) {
+    // Check the required default configuration in node module.
+    $string = $this->storage->findString(['source' => 'Make content sticky', 'context' => '', 'type' => 'configuration']);
+    if ($required) {
+      $this->assertFalse($this->config('system.action.node_make_sticky_action')->isNew());
+      $this->assertNotEmpty($string, 'Node action text can be found with node module.');
+    }
+    else {
+      $this->assertTrue($this->config('system.action.node_make_sticky_action')->isNew());
+      $this->assertNull($string, 'Node action text can not be found without node module.');
+    }
+
+    // Check the optional default configuration in node module.
+    $string = $this->storage->findString(['source' => 'No front page content has been created yet.<br/>Follow the <a target="_blank" href="https://www.drupal.org/docs/user_guide/en/index.html">User Guide</a> to start building your site.', 'context' => '', 'type' => 'configuration']);
+    if ($optional) {
+      $this->assertFalse($this->config('views.view.frontpage')->isNew());
+      $this->assertNotEmpty($string, 'Node view text can be found with node and views modules.');
+    }
+    else {
+      $this->assertTrue($this->config('views.view.frontpage')->isNew());
+      $this->assertNull($string, 'Node view text can not be found without node and/or views modules.');
+    }
+  }
+
+}

web/core/modules/locale/tests/src/Functional/LocaleContentTest.php

@@ -0,0 +1,207 @@
+<?php
+
+namespace Drupal\Tests\locale\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\node\NodeInterface;
+
+/**
+ * Tests you can enable multilingual support on content types and configure a
+ * language for a node.
+ *
+ * @group locale
+ */
+class LocaleContentTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['node', 'locale'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'classy';
+
+  /**
+   * Verifies that machine name fields are always LTR.
+   */
+  public function testMachineNameLTR() {
+    // User to add and remove language.
+    $admin_user = $this->drupalCreateUser(['administer languages', 'administer content types', 'access administration pages', 'administer site configuration']);
+
+    // Log in as admin.
+    $this->drupalLogin($admin_user);
+
+    // Verify that the machine name field is LTR for a new content type.
+    $this->drupalGet('admin/structure/types/add');
+    $this->assertFieldByXpath('//input[@name="type" and @dir="ltr"]', NULL, 'The machine name field is LTR when no additional language is configured.');
+
+    // Install the Arabic language (which is RTL) and configure as the default.
+    $edit = [];
+    $edit['predefined_langcode'] = 'ar';
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
+
+    $edit = [
+      'site_default_language' => 'ar',
+    ];
+    $this->drupalPostForm('admin/config/regional/language', $edit, t('Save configuration'));
+
+    // Verify that the machine name field is still LTR for a new content type.
+    $this->drupalGet('admin/structure/types/add');
+    $this->assertFieldByXpath('//input[@name="type" and @dir="ltr"]', NULL, 'The machine name field is LTR when the default language is RTL.');
+  }
+
+  /**
+   * Test if a content type can be set to multilingual and language is present.
+   */
+  public function testContentTypeLanguageConfiguration() {
+    $type1 = $this->drupalCreateContentType();
+    $type2 = $this->drupalCreateContentType();
+
+    // User to add and remove language.
+    $admin_user = $this->drupalCreateUser(['administer languages', 'administer content types', 'access administration pages']);
+    // User to create a node.
+    $web_user = $this->drupalCreateUser(["create {$type1->id()} content", "create {$type2->id()} content", "edit any {$type2->id()} content"]);
+
+    // Add custom language.
+    $this->drupalLogin($admin_user);
+    // Code for the language.
+    $langcode = 'xx';
+    // The English name for the language.
+    $name = $this->randomMachineName(16);
+    $edit = [
+      'predefined_langcode' => 'custom',
+      'langcode' => $langcode,
+      'label' => $name,
+      'direction' => LanguageInterface::DIRECTION_LTR,
+    ];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
+
+    // Set the content type to use multilingual support.
+    $this->drupalGet("admin/structure/types/manage/{$type2->id()}");
+    $this->assertText(t('Language settings'), 'Multilingual support widget present on content type configuration form.');
+    $edit = [
+      'language_configuration[language_alterable]' => TRUE,
+    ];
+    $this->drupalPostForm("admin/structure/types/manage/{$type2->id()}", $edit, t('Save content type'));
+    $this->assertRaw(t('The content type %type has been updated.', ['%type' => $type2->label()]));
+    $this->drupalLogout();
+    \Drupal::languageManager()->reset();
+
+    // Verify language selection is not present on the node add form.
+    $this->drupalLogin($web_user);
+    $this->drupalGet("node/add/{$type1->id()}");
+    // Verify language select list is not present.
+    $this->assertNoFieldByName('langcode[0][value]', NULL, 'Language select not present on the node add form.');
+
+    // Verify language selection appears on the node add form.
+    $this->drupalGet("node/add/{$type2->id()}");
+    // Verify language select list is present.
+    $this->assertFieldByName('langcode[0][value]', NULL, 'Language select present on the node add form.');
+    // Ensure language appears.
+    $this->assertText($name, 'Language present.');
+
+    // Create a node.
+    $node_title = $this->randomMachineName();
+    $node_body = $this->randomMachineName();
+    $edit = [
+      'type' => $type2->id(),
+      'title' => $node_title,
+      'body' => [['value' => $node_body]],
+      'langcode' => $langcode,
+    ];
+    $node = $this->drupalCreateNode($edit);
+    // Edit the content and ensure correct language is selected.
+    $path = 'node/' . $node->id() . '/edit';
+    $this->drupalGet($path);
+    $this->assertRaw('<option value="' . $langcode . '" selected="selected">' . $name . '</option>', 'Correct language selected.');
+    // Ensure we can change the node language.
+    $edit = [
+      'langcode[0][value]' => 'en',
+    ];
+    $this->drupalPostForm($path, $edit, t('Save'));
+    $this->assertText(t('@title has been updated.', ['@title' => $node_title]));
+
+    // Verify that the creation message contains a link to a node.
+    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', [':href' => 'node/' . $node->id()]);
+    $this->assert(isset($view_link), 'The message area contains the link to the edited node');
+
+    $this->drupalLogout();
+  }
+
+  /**
+   * Test if a dir and lang tags exist in node's attributes.
+   */
+  public function testContentTypeDirLang() {
+    $type = $this->drupalCreateContentType();
+
+    // User to add and remove language.
+    $admin_user = $this->drupalCreateUser(['administer languages', 'administer content types', 'access administration pages']);
+    // User to create a node.
+    $web_user = $this->drupalCreateUser(["create {$type->id()} content", "edit own {$type->id()} content"]);
+
+    // Log in as admin.
+    $this->drupalLogin($admin_user);
+
+    // Install Arabic language.
+    $edit = [];
+    $edit['predefined_langcode'] = 'ar';
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
+
+    // Install Spanish language.
+    $edit = [];
+    $edit['predefined_langcode'] = 'es';
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
+    \Drupal::languageManager()->reset();
+
+    // Set the content type to use multilingual support.
+    $this->drupalGet("admin/structure/types/manage/{$type->id()}");
+    $edit = [
+      'language_configuration[language_alterable]' => TRUE,
+    ];
+    $this->drupalPostForm("admin/structure/types/manage/{$type->id()}", $edit, t('Save content type'));
+    $this->assertRaw(t('The content type %type has been updated.', ['%type' => $type->label()]));
+    $this->drupalLogout();
+
+    // Log in as web user to add new node.
+    $this->drupalLogin($web_user);
+
+    // Create three nodes: English, Arabic and Spanish.
+    $nodes = [];
+    foreach (['en', 'es', 'ar'] as $langcode) {
+      $nodes[$langcode] = $this->drupalCreateNode([
+        'langcode' => $langcode,
+        'type' => $type->id(),
+        'promote' => NodeInterface::PROMOTED,
+      ]);
+    }
+
+    // Check if English node does not have lang tag.
+    $this->drupalGet('node/' . $nodes['en']->id());
+    $element = $this->cssSelect('article.node[lang="en"]');
+    $this->assertTrue(empty($element), 'The lang tag has not been assigned to the English node.');
+
+    // Check if English node does not have dir tag.
+    $element = $this->cssSelect('article.node[dir="ltr"]');
+    $this->assertTrue(empty($element), 'The dir tag has not been assigned to the English node.');
+
+    // Check if Arabic node has lang="ar" & dir="rtl" tags.
+    $this->drupalGet('node/' . $nodes['ar']->id());
+    $element = $this->cssSelect('article.node[lang="ar"][dir="rtl"]');
+    $this->assertTrue(!empty($element), 'The lang and dir tags have been assigned correctly to the Arabic node.');
+
+    // Check if Spanish node has lang="es" tag.
+    $this->drupalGet('node/' . $nodes['es']->id());
+    $element = $this->cssSelect('article.node[lang="es"]');
+    $this->assertTrue(!empty($element), 'The lang tag has been assigned correctly to the Spanish node.');
+
+    // Check if Spanish node does not have dir="ltr" tag.
+    $element = $this->cssSelect('article.node[lang="es"][dir="ltr"]');
+    $this->assertTrue(empty($element), 'The dir tag has not been assigned to the Spanish node.');
+  }
+
+}

web/core/modules/locale/tests/src/Functional/LocaleExportTest.php

@@ -0,0 +1,183 @@
+<?php
+
+namespace Drupal\Tests\locale\Functional;
+
+use Drupal\Core\File\FileSystemInterface;
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests the exportation of locale files.
+ *
+ * @group locale
+ */
+class LocaleExportTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['locale'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
+  /**
+   * A user able to create languages and export translations.
+   */
+  protected $adminUser = NULL;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->adminUser = $this->drupalCreateUser(['administer languages', 'translate interface', 'access administration pages']);
+    $this->drupalLogin($this->adminUser);
+
+    // Copy test po files to the translations directory.
+    \Drupal::service('file_system')->copy(__DIR__ . '/../../../tests/test.de.po', 'translations://', FileSystemInterface::EXISTS_REPLACE);
+    \Drupal::service('file_system')->copy(__DIR__ . '/../../../tests/test.xx.po', 'translations://', FileSystemInterface::EXISTS_REPLACE);
+  }
+
+  /**
+   * Test exportation of translations.
+   */
+  public function testExportTranslation() {
+    $file_system = \Drupal::service('file_system');
+    // First import some known translations.
+    // This will also automatically add the 'fr' language.
+    $name = $file_system->tempnam('temporary://', "po_") . '.po';
+    file_put_contents($name, $this->getPoFile());
+    $this->drupalPostForm('admin/config/regional/translate/import', [
+      'langcode' => 'fr',
+      'files[file]' => $name,
+    ], t('Import'));
+    $file_system->unlink($name);
+
+    // Get the French translations.
+    $this->drupalPostForm('admin/config/regional/translate/export', [
+      'langcode' => 'fr',
+    ], t('Export'));
+
+    // Ensure we have a translation file.
+    $this->assertRaw('# French translation of Drupal', 'Exported French translation file.');
+    // Ensure our imported translations exist in the file.
+    $this->assertRaw('msgstr "lundi"', 'French translations present in exported file.');
+
+    // Import some more French translations which will be marked as customized.
+    $name = $file_system->tempnam('temporary://', "po2_") . '.po';
+    file_put_contents($name, $this->getCustomPoFile());
+    $this->drupalPostForm('admin/config/regional/translate/import', [
+      'langcode' => 'fr',
+      'files[file]' => $name,
+      'customized' => 1,
+    ], t('Import'));
+    $file_system->unlink($name);
+
+    // Create string without translation in the locales_source table.
+    $this->container
+      ->get('locale.storage')
+      ->createString()
+      ->setString('February')
+      ->save();
+
+    // Export only customized French translations.
+    $this->drupalPostForm('admin/config/regional/translate/export', [
+      'langcode' => 'fr',
+      'content_options[not_customized]' => FALSE,
+      'content_options[customized]' => TRUE,
+      'content_options[not_translated]' => FALSE,
+    ], t('Export'));
+
+    // Ensure we have a translation file.
+    $this->assertRaw('# French translation of Drupal', 'Exported French translation file with only customized strings.');
+    // Ensure the customized translations exist in the file.
+    $this->assertRaw('msgstr "janvier"', 'French custom translation present in exported file.');
+    // Ensure no untranslated strings exist in the file.
+    $this->assertNoRaw('msgid "February"', 'Untranslated string not present in exported file.');
+
+    // Export only untranslated French translations.
+    $this->drupalPostForm('admin/config/regional/translate/export', [
+      'langcode' => 'fr',
+      'content_options[not_customized]' => FALSE,
+      'content_options[customized]' => FALSE,
+      'content_options[not_translated]' => TRUE,
+    ], t('Export'));
+
+    // Ensure we have a translation file.
+    $this->assertRaw('# French translation of Drupal', 'Exported French translation file with only untranslated strings.');
+    // Ensure no customized translations exist in the file.
+    $this->assertNoRaw('msgstr "janvier"', 'French custom translation not present in exported file.');
+    // Ensure the untranslated strings exist in the file, and with right quotes.
+    $this->assertRaw($this->getUntranslatedString(), 'Empty string present in exported file.');
+  }
+
+  /**
+   * Test exportation of translation template file.
+   */
+  public function testExportTranslationTemplateFile() {
+    // Load an admin page with JavaScript so _drupal_add_library() fires at
+    // least once and _locale_parse_js_file() gets to run at least once so that
+    // the locales_source table gets populated with something.
+    $this->drupalGet('admin/config/regional/language');
+    // Get the translation template file.
+    $this->drupalPostForm('admin/config/regional/translate/export', [], t('Export'));
+    // Ensure we have a translation file.
+    $this->assertRaw('# LANGUAGE translation of PROJECT', 'Exported translation template file.');
+  }
+
+  /**
+   * Helper function that returns a proper .po file.
+   */
+  public function getPoFile() {
+    return <<< EOF
+msgid ""
+msgstr ""
+"Project-Id-Version: Drupal 8\\n"
+"MIME-Version: 1.0\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\\n"
+
+msgid "Monday"
+msgstr "lundi"
+EOF;
+  }
+
+  /**
+   * Helper function that returns a .po file which strings will be marked
+   * as customized.
+   */
+  public function getCustomPoFile() {
+    return <<< EOF
+msgid ""
+msgstr ""
+"Project-Id-Version: Drupal 8\\n"
+"MIME-Version: 1.0\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\\n"
+
+msgid "January"
+msgstr "janvier"
+EOF;
+  }
+
+  /**
+   * Returns a .po file fragment with an untranslated string.
+   *
+   * @return string
+   *   A .po file fragment with an untranslated string.
+   */
+  public function getUntranslatedString() {
+    return <<< EOF
+msgid "February"
+msgstr ""
+EOF;
+  }
+
+}

web/core/modules/locale/tests/src/Functional/LocaleFileSystemFormTest.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace Drupal\Tests\locale\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests the locale functionality in the altered file settings form.
+ *
+ * @group locale
+ */
+class LocaleFileSystemFormTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['system'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $account = $this->drupalCreateUser(['administer site configuration']);
+    $this->drupalLogin($account);
+  }
+
+  /**
+   * Tests translation directory settings on the file settings form.
+   */
+  public function testFileConfigurationPage() {
+    // By default there should be no setting for the translation directory.
+    $this->drupalGet('admin/config/media/file-system');
+    $this->assertNoFieldByName('translation_path');
+
+    // With locale module installed, the setting should appear.
+    $module_installer = $this->container->get('module_installer');
+    $module_installer->install(['locale']);
+    $this->rebuildContainer();
+    $this->drupalGet('admin/config/media/file-system');
+    $this->assertFieldByName('translation_path');
+
+    // The setting should persist.
+    $translation_path = $this->publicFilesDirectory . '/translations_changed';
+    $fields = [
+      'translation_path' => $translation_path,
+    ];
+    $this->drupalPostForm(NULL, $fields, t('Save configuration'));
+    $this->drupalGet('admin/config/media/file-system');
+    $this->assertFieldByName('translation_path', $translation_path);
+    $this->assertEqual($translation_path, $this->config('locale.settings')->get('translation.path'));
+  }
+
+}

web/core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php

@@ -0,0 +1,656 @@
+<?php
+
+namespace Drupal\Tests\locale\Functional;
+
+use Drupal\Component\Render\FormattableMarkup;
+use Drupal\Core\Url;
+use Drupal\Core\Database\Database;
+use Drupal\Core\File\FileSystemInterface;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Core\Language\LanguageInterface;
+
+/**
+ * Tests the import of locale files.
+ *
+ * @group locale
+ */
+class LocaleImportFunctionalTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['locale', 'dblog'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
+  /**
+   * A user able to create languages and import translations.
+   *
+   * @var \Drupal\user\Entity\User
+   */
+  protected $adminUser;
+
+  /**
+   * A user able to create languages, import translations and access site
+   * reports.
+   *
+   * @var \Drupal\user\Entity\User
+   */
+  protected $adminUserAccessSiteReports;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Copy test po files to the translations directory.
+    /** @var \Drupal\Core\File\FileSystemInterface $file_system */
+    $file_system = \Drupal::service('file_system');
+    $file_system->copy(__DIR__ . '/../../../tests/test.de.po', 'translations://', FileSystemInterface::EXISTS_REPLACE);
+    $file_system->copy(__DIR__ . '/../../../tests/test.xx.po', 'translations://', FileSystemInterface::EXISTS_REPLACE);
+
+    $this->adminUser = $this->drupalCreateUser(['administer languages', 'translate interface', 'access administration pages']);
+    $this->adminUserAccessSiteReports = $this->drupalCreateUser(['administer languages', 'translate interface', 'access administration pages', 'access site reports']);
+    $this->drupalLogin($this->adminUser);
+
+    // Enable import of translations. By default this is disabled for automated
+    // tests.
+    $this->config('locale.settings')
+      ->set('translation.import_enabled', TRUE)
+      ->set('translation.use_source', LOCALE_TRANSLATION_USE_SOURCE_LOCAL)
+      ->save();
+  }
+
+  /**
+   * Test import of standalone .po files.
+   */
+  public function testStandalonePoFile() {
+    // Try importing a .po file.
+    $this->importPoFile($this->getPoFile(), [
+      'langcode' => 'fr',
+    ]);
+    $this->config('locale.settings');
+    // The import should automatically create the corresponding language.
+    $this->assertRaw(t('The language %language has been created.', ['%language' => 'French']), 'The language has been automatically created.');
+
+    // The import should have created 8 strings.
+    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 8, '%update' => 0, '%delete' => 0]), 'The translation file was successfully imported.');
+
+    // This import should have saved plural forms to have 2 variants.
+    $locale_plurals = \Drupal::service('locale.plural.formula')->getNumberOfPlurals('fr');
+    $this->assertEqual(2, $locale_plurals, 'Plural number initialized.');
+
+    // Ensure we were redirected correctly.
+    $this->assertUrl(Url::fromRoute('locale.translate_page', [], ['absolute' => TRUE])->toString(), [], 'Correct page redirection.');
+
+    // Try importing a .po file with invalid tags.
+    $this->importPoFile($this->getBadPoFile(), [
+      'langcode' => 'fr',
+    ]);
+
+    // The import should have created 1 string and rejected 2.
+    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 1, '%update' => 0, '%delete' => 0]), 'The translation file was successfully imported.');
+
+    $skip_message = \Drupal::translation()->formatPlural(2, 'One translation string was skipped because of disallowed or malformed HTML. <a href=":url">See the log</a> for details.', '@count translation strings were skipped because of disallowed or malformed HTML. See the log for details.', [':url' => Url::fromRoute('dblog.overview')->toString()]);
+    $this->assertRaw($skip_message, 'Unsafe strings were skipped.');
+
+    // Repeat the process with a user that can access site reports, and this
+    // time the different warnings must contain links to the log.
+    $this->drupalLogin($this->adminUserAccessSiteReports);
+
+    // Try importing a .po file with invalid tags.
+    $this->importPoFile($this->getBadPoFile(), [
+      'langcode' => 'fr',
+    ]);
+
+    $skip_message = \Drupal::translation()->formatPlural(2, 'One translation string was skipped because of disallowed or malformed HTML. <a href=":url">See the log</a> for details.', '@count translation strings were skipped because of disallowed or malformed HTML. <a href=":url">See the log</a> for details.', [':url' => Url::fromRoute('dblog.overview')->toString()]);
+    $this->assertRaw($skip_message, 'Unsafe strings were skipped.');
+
+    // Check empty files import with a user that cannot access site reports..
+    $this->drupalLogin($this->adminUser);
+    // Try importing a zero byte sized .po file.
+    $this->importPoFile($this->getEmptyPoFile(), [
+      'langcode' => 'fr',
+    ]);
+    // The import should have created 0 string and rejected 0.
+    $this->assertRaw(t('One translation file could not be imported. See the log for details.'), 'The empty translation file import reported no translations imported.');
+
+    // Repeat the process with a user that can access site reports, and this
+    // time the different warnings must contain links to the log.
+    $this->drupalLogin($this->adminUserAccessSiteReports);
+    // Try importing a zero byte sized .po file.
+    $this->importPoFile($this->getEmptyPoFile(), [
+      'langcode' => 'fr',
+    ]);
+    // The import should have created 0 string and rejected 0.
+    $this->assertRaw(t('One translation file could not be imported. <a href=":url">See the log</a> for details.', [':url' => Url::fromRoute('dblog.overview')->toString()]), 'The empty translation file import reported no translations imported.');
+
+    // Try importing a .po file which doesn't exist.
+    $name = $this->randomMachineName(16);
+    $this->drupalPostForm('admin/config/regional/translate/import', [
+      'langcode' => 'fr',
+      'files[file]' => $name,
+    ], t('Import'));
+    $this->assertUrl(Url::fromRoute('locale.translate_import', [], ['absolute' => TRUE])->toString(), [], 'Correct page redirection.');
+    $this->assertText(t('File to import not found.'), 'File to import not found message.');
+
+    // Try importing a .po file with overriding strings, and ensure existing
+    // strings are kept.
+    $this->importPoFile($this->getOverwritePoFile(), [
+      'langcode' => 'fr',
+    ]);
+
+    // The import should have created 1 string.
+    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 1, '%update' => 0, '%delete' => 0]), 'The translation file was successfully imported.');
+    // Ensure string wasn't overwritten.
+    $search = [
+      'string' => 'Montag',
+      'langcode' => 'fr',
+      'translation' => 'translated',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $this->assertText(t('No strings available.'), 'String not overwritten by imported string.');
+
+    // This import should not have changed number of plural forms.
+    $locale_plurals = \Drupal::service('locale.plural.formula')->getNumberOfPlurals('fr');
+    $this->assertEqual(2, $locale_plurals, 'Plural numbers untouched.');
+
+    // Try importing a .po file with overriding strings, and ensure existing
+    // strings are overwritten.
+    $this->importPoFile($this->getOverwritePoFile(), [
+      'langcode' => 'fr',
+      'overwrite_options[not_customized]' => TRUE,
+    ]);
+
+    // The import should have updated 2 strings.
+    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 0, '%update' => 2, '%delete' => 0]), 'The translation file was successfully imported.');
+    // Ensure string was overwritten.
+    $search = [
+      'string' => 'Montag',
+      'langcode' => 'fr',
+      'translation' => 'translated',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $this->assertNoText(t('No strings available.'), 'String overwritten by imported string.');
+    // This import should have changed number of plural forms.
+    $locale_plurals = \Drupal::service('locale.plural.formula')->reset()->getNumberOfPlurals('fr');
+    $this->assertEqual(3, $locale_plurals, 'Plural numbers changed.');
+
+    // Importing a .po file and mark its strings as customized strings.
+    $this->importPoFile($this->getCustomPoFile(), [
+      'langcode' => 'fr',
+      'customized' => TRUE,
+    ]);
+
+    // The import should have created 6 strings.
+    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 6, '%update' => 0, '%delete' => 0]), 'The customized translation file was successfully imported.');
+
+    // The database should now contain 6 customized strings (two imported
+    // strings are not translated).
+    $count = Database::getConnection()->query('SELECT COUNT(*) FROM {locales_target} WHERE customized = :custom', [':custom' => 1])->fetchField();
+    $this->assertEqual($count, 6, 'Customized translations successfully imported.');
+
+    // Try importing a .po file with overriding strings, and ensure existing
+    // customized strings are kept.
+    $this->importPoFile($this->getCustomOverwritePoFile(), [
+      'langcode' => 'fr',
+      'overwrite_options[not_customized]' => TRUE,
+      'overwrite_options[customized]' => FALSE,
+    ]);
+
+    // The import should have created 1 string.
+    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 1, '%update' => 0, '%delete' => 0]), 'The customized translation file was successfully imported.');
+    // Ensure string wasn't overwritten.
+    $search = [
+      'string' => 'januari',
+      'langcode' => 'fr',
+      'translation' => 'translated',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $this->assertText(t('No strings available.'), 'Customized string not overwritten by imported string.');
+
+    // Try importing a .po file with overriding strings, and ensure existing
+    // customized strings are overwritten.
+    $this->importPoFile($this->getCustomOverwritePoFile(), [
+      'langcode' => 'fr',
+      'overwrite_options[not_customized]' => FALSE,
+      'overwrite_options[customized]' => TRUE,
+    ]);
+
+    // The import should have updated 2 strings.
+    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 0, '%update' => 2, '%delete' => 0]), 'The customized translation file was successfully imported.');
+    // Ensure string was overwritten.
+    $search = [
+      'string' => 'januari',
+      'langcode' => 'fr',
+      'translation' => 'translated',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $this->assertNoText(t('No strings available.'), 'Customized string overwritten by imported string.');
+
+  }
+
+  /**
+   * Test msgctxt context support.
+   */
+  public function testLanguageContext() {
+    // Try importing a .po file.
+    $this->importPoFile($this->getPoFileWithContext(), [
+      'langcode' => 'hr',
+    ]);
+
+    // We cast the return value of t() to string so as to retrieve the
+    // translated value, rendered as a string.
+    $this->assertIdentical((string) t('May', [], ['langcode' => 'hr', 'context' => 'Long month name']), 'Svibanj', 'Long month name context is working.');
+    $this->assertIdentical((string) t('May', [], ['langcode' => 'hr']), 'Svi.', 'Default context is working.');
+  }
+
+  /**
+   * Test empty msgstr at end of .po file see #611786.
+   */
+  public function testEmptyMsgstr() {
+    $langcode = 'hu';
+
+    // Try importing a .po file.
+    $this->importPoFile($this->getPoFileWithMsgstr(), [
+      'langcode' => $langcode,
+    ]);
+
+    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 1, '%update' => 0, '%delete' => 0]), 'The translation file was successfully imported.');
+    $this->assertIdentical((string) t('Operations', [], ['langcode' => $langcode]), 'Műveletek', 'String imported and translated.');
+
+    // Try importing a .po file.
+    $this->importPoFile($this->getPoFileWithEmptyMsgstr(), [
+      'langcode' => $langcode,
+      'overwrite_options[not_customized]' => TRUE,
+    ]);
+    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 0, '%update' => 0, '%delete' => 1]), 'The translation file was successfully imported.');
+
+    $str = "Operations";
+    $search = [
+      'string' => $str,
+      'langcode' => $langcode,
+      'translation' => 'untranslated',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $this->assertText($str, 'Search found the string as untranslated.');
+  }
+
+  /**
+   * Tests .po file import with configuration translation.
+   */
+  public function testConfigPoFile() {
+    // Values for translations to assert. Config key, original string,
+    // translation and config property name.
+    $config_strings = [
+      'system.maintenance' => [
+        '@site is currently under maintenance. We should be back shortly. Thank you for your patience.',
+        '@site karbantartás alatt áll. Rövidesen visszatérünk. Köszönjük a türelmet.',
+        'message',
+      ],
+      'user.role.anonymous' => [
+        'Anonymous user',
+        'Névtelen felhasználó',
+        'label',
+      ],
+    ];
+
+    // Add custom language for testing.
+    $langcode = 'xx';
+    $edit = [
+      'predefined_langcode' => 'custom',
+      'langcode' => $langcode,
+      'label' => $this->randomMachineName(16),
+      'direction' => LanguageInterface::DIRECTION_LTR,
+    ];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
+
+    // Check for the source strings we are going to translate. Adding the
+    // custom language should have made the process to export configuration
+    // strings to interface translation executed.
+    $locale_storage = $this->container->get('locale.storage');
+    foreach ($config_strings as $config_string) {
+      $string = $locale_storage->findString(['source' => $config_string[0], 'context' => '', 'type' => 'configuration']);
+      $this->assertNotEmpty($string, 'Configuration strings have been created upon installation.');
+    }
+
+    // Import a .po file to translate.
+    $this->importPoFile($this->getPoFileWithConfig(), [
+      'langcode' => $langcode,
+    ]);
+
+    // Translations got recorded in the interface translation system.
+    foreach ($config_strings as $config_string) {
+      $search = [
+        'string' => $config_string[0],
+        'langcode' => $langcode,
+        'translation' => 'all',
+      ];
+      $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+      $this->assertText($config_string[1], new FormattableMarkup('Translation of @string found.', ['@string' => $config_string[0]]));
+    }
+
+    // Test that translations got recorded in the config system.
+    $overrides = \Drupal::service('language.config_factory_override');
+    foreach ($config_strings as $config_key => $config_string) {
+      $override = $overrides->getOverride($langcode, $config_key);
+      $this->assertEqual($override->get($config_string[2]), $config_string[1]);
+    }
+  }
+
+  /**
+   * Tests .po file import with user.settings configuration.
+   */
+  public function testConfigtranslationImportingPoFile() {
+    // Set the language code.
+    $langcode = 'de';
+
+    // Import a .po file to translate.
+    $this->importPoFile($this->getPoFileWithConfigDe(), [
+      'langcode' => $langcode,
+    ]);
+
+    // Check that the 'Anonymous' string is translated.
+    $config = \Drupal::languageManager()->getLanguageConfigOverride($langcode, 'user.settings');
+    $this->assertEqual($config->get('anonymous'), 'Anonymous German');
+  }
+
+  /**
+   * Test the translation are imported when a new language is created.
+   */
+  public function testCreatedLanguageTranslation() {
+    // Import a .po file to add de language.
+    $this->importPoFile($this->getPoFileWithConfigDe(), ['langcode' => 'de']);
+
+    // Get the language.entity.de label and check it's been translated.
+    $override = \Drupal::languageManager()->getLanguageConfigOverride('de', 'language.entity.de');
+    $this->assertEqual($override->get('label'), 'Deutsch');
+  }
+
+  /**
+   * Helper function: import a standalone .po file in a given language.
+   *
+   * @param string $contents
+   *   Contents of the .po file to import.
+   * @param array $options
+   *   (optional) Additional options to pass to the translation import form.
+   */
+  public function importPoFile($contents, array $options = []) {
+    $file_system = \Drupal::service('file_system');
+    $name = $file_system->tempnam('temporary://', "po_") . '.po';
+    file_put_contents($name, $contents);
+    $options['files[file]'] = $name;
+    $this->drupalPostForm('admin/config/regional/translate/import', $options, t('Import'));
+    $file_system->unlink($name);
+  }
+
+  /**
+   * Helper function that returns a proper .po file.
+   */
+  public function getPoFile() {
+    return <<< EOF
+msgid ""
+msgstr ""
+"Project-Id-Version: Drupal 8\\n"
+"MIME-Version: 1.0\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\\n"
+
+msgid "One sheep"
+msgid_plural "@count sheep"
+msgstr[0] "un mouton"
+msgstr[1] "@count moutons"
+
+msgid "Monday"
+msgstr "lundi"
+
+msgid "Tuesday"
+msgstr "mardi"
+
+msgid "Wednesday"
+msgstr "mercredi"
+
+msgid "Thursday"
+msgstr "jeudi"
+
+msgid "Friday"
+msgstr "vendredi"
+
+msgid "Saturday"
+msgstr "samedi"
+
+msgid "Sunday"
+msgstr "dimanche"
+EOF;
+  }
+
+  /**
+   * Helper function that returns a empty .po file.
+   */
+  public function getEmptyPoFile() {
+    return '';
+  }
+
+  /**
+   * Helper function that returns a bad .po file.
+   */
+  public function getBadPoFile() {
+    return <<< EOF
+msgid ""
+msgstr ""
+"Project-Id-Version: Drupal 8\\n"
+"MIME-Version: 1.0\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\\n"
+
+msgid "Save configuration"
+msgstr "Enregistrer la configuration"
+
+msgid "edit"
+msgstr "modifier<img SRC="javascript:alert(\'xss\');">"
+
+msgid "delete"
+msgstr "supprimer<script>alert('xss');</script>"
+
+EOF;
+  }
+
+  /**
+   * Helper function that returns a proper .po file for testing.
+   */
+  public function getOverwritePoFile() {
+    return <<< EOF
+msgid ""
+msgstr ""
+"Project-Id-Version: Drupal 8\\n"
+"MIME-Version: 1.0\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\\n"
+
+msgid "Monday"
+msgstr "Montag"
+
+msgid "Day"
+msgstr "Jour"
+EOF;
+  }
+
+  /**
+   * Helper function that returns a .po file which strings will be marked
+   * as customized.
+   */
+  public function getCustomPoFile() {
+    return <<< EOF
+msgid ""
+msgstr ""
+"Project-Id-Version: Drupal 8\\n"
+"MIME-Version: 1.0\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\\n"
+
+msgid "One dog"
+msgid_plural "@count dogs"
+msgstr[0] "un chien"
+msgstr[1] "@count chiens"
+
+msgid "January"
+msgstr "janvier"
+
+msgid "February"
+msgstr "février"
+
+msgid "March"
+msgstr "mars"
+
+msgid "April"
+msgstr "avril"
+
+msgid "June"
+msgstr "juin"
+EOF;
+  }
+
+  /**
+   * Helper function that returns a .po file for testing customized strings.
+   */
+  public function getCustomOverwritePoFile() {
+    return <<< EOF
+msgid ""
+msgstr ""
+"Project-Id-Version: Drupal 8\\n"
+"MIME-Version: 1.0\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\\n"
+
+msgid "January"
+msgstr "januari"
+
+msgid "February"
+msgstr "februari"
+
+msgid "July"
+msgstr "juillet"
+EOF;
+  }
+
+  /**
+   * Helper function that returns a .po file with context.
+   */
+  public function getPoFileWithContext() {
+    // Croatian (code hr) is one of the languages that have a different
+    // form for the full name and the abbreviated name for the month of May.
+    return <<< EOF
+msgid ""
+msgstr ""
+"Project-Id-Version: Drupal 8\\n"
+"MIME-Version: 1.0\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\\n"
+
+msgctxt "Long month name"
+msgid "May"
+msgstr "Svibanj"
+
+msgid "May"
+msgstr "Svi."
+EOF;
+  }
+
+  /**
+   * Helper function that returns a .po file with an empty last item.
+   */
+  public function getPoFileWithEmptyMsgstr() {
+    return <<< EOF
+msgid ""
+msgstr ""
+"Project-Id-Version: Drupal 8\\n"
+"MIME-Version: 1.0\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\\n"
+
+msgid "Operations"
+msgstr ""
+
+EOF;
+  }
+
+  /**
+   * Helper function that returns a .po file with an empty last item.
+   */
+  public function getPoFileWithMsgstr() {
+    return <<< EOF
+msgid ""
+msgstr ""
+"Project-Id-Version: Drupal 8\\n"
+"MIME-Version: 1.0\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\\n"
+
+msgid "Operations"
+msgstr "Műveletek"
+
+msgid "Will not appear in Drupal core, so we can ensure the test passes"
+msgstr ""
+
+EOF;
+  }
+
+  /**
+   * Helper function that returns a .po file with configuration translations.
+   */
+  public function getPoFileWithConfig() {
+    return <<< EOF
+msgid ""
+msgstr ""
+"Project-Id-Version: Drupal 8\\n"
+"MIME-Version: 1.0\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\\n"
+
+msgid "@site is currently under maintenance. We should be back shortly. Thank you for your patience."
+msgstr "@site karbantartás alatt áll. Rövidesen visszatérünk. Köszönjük a türelmet."
+
+msgid "Anonymous user"
+msgstr "Névtelen felhasználó"
+
+EOF;
+  }
+
+  /**
+   * Helper function that returns a .po file with configuration translations.
+   */
+  public function getPoFileWithConfigDe() {
+    return <<< EOF
+msgid ""
+msgstr ""
+"Project-Id-Version: Drupal 8\\n"
+"MIME-Version: 1.0\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\\n"
+
+msgid "Anonymous"
+msgstr "Anonymous German"
+
+msgid "German"
+msgstr "Deutsch"
+
+EOF;
+  }
+
+}

web/core/modules/locale/tests/src/Functional/LocaleJavascriptTranslationTest.php

@@ -0,0 +1,169 @@
+<?php
+
+namespace Drupal\Tests\locale\Functional;
+
+use Drupal\Component\Gettext\PoItem;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Component\Render\FormattableMarkup;
+
+/**
+ * Tests parsing js files for translatable strings.
+ *
+ * @group locale
+ */
+class LocaleJavascriptTranslationTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['locale', 'locale_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
+  public function testFileParsing() {
+
+    // This test is for ensuring that the regular expression in
+    // _locale_parse_js_file() finds translatable source strings in all valid
+    // JavaScript syntax regardless of the coding style used, especially with
+    // respect to optional whitespace, line breaks, etc.
+    // - We test locale_test.es6.js, because that is the one that contains a
+    //   variety of whitespace styles.
+    // - We also test the transpiled locale_test.js as an extra double-check
+    //   that JavaScript transpilation doesn't change what
+    //   _locale_parse_js_file() finds.
+    $files[] = __DIR__ . '/../../locale_test.es6.js';
+    $files[] = __DIR__ . '/../../locale_test.js';
+
+    foreach ($files as $filename) {
+      // Parse the file to look for source strings.
+      _locale_parse_js_file($filename);
+
+      // Get all of the source strings that were found.
+      $strings = $this->container
+        ->get('locale.storage')
+        ->getStrings([
+          'type' => 'javascript',
+          'name' => $filename,
+        ]);
+
+      $source_strings = [];
+      foreach ($strings as $string) {
+        $source_strings[$string->source] = $string->context;
+      }
+
+      $etx = PoItem::DELIMITER;
+      // List of all strings that should be in the file.
+      $test_strings = [
+        'Standard Call t' => '',
+        'Whitespace Call t' => '',
+
+        'Single Quote t' => '',
+        "Single Quote \\'Escaped\\' t" => '',
+        'Single Quote Concat strings t' => '',
+
+        'Double Quote t' => '',
+        "Double Quote \\\"Escaped\\\" t" => '',
+        'Double Quote Concat strings t' => '',
+
+        'Context !key Args t' => 'Context string',
+
+        'Context Unquoted t' => 'Context string unquoted',
+        'Context Single Quoted t' => 'Context string single quoted',
+        'Context Double Quoted t' => 'Context string double quoted',
+
+        "Standard Call plural{$etx}Standard Call @count plural" => '',
+        "Whitespace Call plural{$etx}Whitespace Call @count plural" => '',
+
+        "Single Quote plural{$etx}Single Quote @count plural" => '',
+        "Single Quote \\'Escaped\\' plural{$etx}Single Quote \\'Escaped\\' @count plural" => '',
+
+        "Double Quote plural{$etx}Double Quote @count plural" => '',
+        "Double Quote \\\"Escaped\\\" plural{$etx}Double Quote \\\"Escaped\\\" @count plural" => '',
+
+        "Context !key Args plural{$etx}Context !key Args @count plural" => 'Context string',
+
+        "Context Unquoted plural{$etx}Context Unquoted @count plural" => 'Context string unquoted',
+        "Context Single Quoted plural{$etx}Context Single Quoted @count plural" => 'Context string single quoted',
+        "Context Double Quoted plural{$etx}Context Double Quoted @count plural" => 'Context string double quoted',
+
+        "No count argument plural - singular{$etx}No count argument plural - plural" => '',
+      ];
+
+      // Assert that all strings were found properly.
+      foreach ($test_strings as $str => $context) {
+        $args = ['%source' => $str, '%context' => $context];
+
+        // Make sure that the string was found in the file.
+        $this->assertTrue(isset($source_strings[$str]), new FormattableMarkup('Found source string: %source', $args));
+
+        // Make sure that the proper context was matched.
+        $message = $context ? new FormattableMarkup('Context for %source is %context', $args) : new FormattableMarkup('Context for %source is blank', $args);
+        $this->assertTrue(isset($source_strings[$str]) && $source_strings[$str] === $context, $message);
+      }
+
+      $this->assertEqual(count($source_strings), count($test_strings), 'Found correct number of source strings.');
+    }
+  }
+
+  /**
+   * Assert translations JS is added before drupal.js, because it depends on it.
+   */
+  public function testLocaleTranslationJsDependencies() {
+    // User to add and remove language.
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages', 'translate interface']);
+
+    // Add custom language.
+    $this->drupalLogin($admin_user);
+    // Code for the language.
+    $langcode = 'es';
+    // The English name for the language.
+    $name = $this->randomMachineName(16);
+    // The domain prefix.
+    $prefix = $langcode;
+    $edit = [
+      'predefined_langcode' => 'custom',
+      'langcode' => $langcode,
+      'label' => $name,
+      'direction' => LanguageInterface::DIRECTION_LTR,
+    ];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
+
+    // Set path prefix.
+    $edit = ["prefix[$langcode]" => $prefix];
+    $this->drupalPostForm('admin/config/regional/language/detection/url', $edit, t('Save configuration'));
+
+    // This forces locale.admin.js string sources to be imported, which contains
+    // the next translation.
+    $this->drupalGet($prefix . '/admin/config/regional/translate');
+
+    // Translate a string in locale.admin.js to our new language.
+    $strings = \Drupal::service('locale.storage')
+      ->getStrings([
+        'source' => 'Show description',
+        'type' => 'javascript',
+        'name' => 'core/modules/locale/locale.admin.js',
+      ]);
+    $string = $strings[0];
+
+    $this->drupalPostForm(NULL, ['string' => 'Show description'], t('Filter'));
+    $edit = ['strings[' . $string->lid . '][translations][0]' => 'Mostrar descripcion'];
+    $this->drupalPostForm(NULL, $edit, t('Save translations'));
+
+    // Calculate the filename of the JS including the translations.
+    $js_translation_files = \Drupal::state()->get('locale.translation.javascript');
+    $js_filename = $prefix . '_' . $js_translation_files[$prefix] . '.js';
+
+    $content = $this->getSession()->getPage()->getContent();
+    $this->assertRaw('core/misc/drupal.js');
+    $this->assertRaw($js_filename);
+    // Assert translations JS is included before drupal.js.
+    $this->assertTrue(strpos($content, $js_filename) < strpos($content, 'core/misc/drupal.js'), 'Translations are included before Drupal.t.');
+  }
+
+}

web/core/modules/locale/tests/src/Functional/LocaleLocaleLookupTest.php

@@ -0,0 +1,105 @@
+<?php
+
+namespace Drupal\Tests\locale\Functional;
+
+use Drupal\Component\Gettext\PoItem;
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests LocaleLookup.
+ *
+ * @group locale
+ */
+class LocaleLocaleLookupTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['locale', 'locale_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Change the language default object to different values.
+    ConfigurableLanguage::createFromLangcode('fr')->save();
+    $this->config('system.site')->set('default_langcode', 'fr')->save();
+
+    $this->drupalLogin($this->rootUser);
+  }
+
+  /**
+   * Tests that there are no circular dependencies.
+   */
+  public function testCircularDependency() {
+    // Ensure that we can enable early_translation_test on a non-english site.
+    $this->drupalPostForm('admin/modules', ['modules[early_translation_test][enable]' => TRUE], t('Install'));
+    $this->assertSession()->statusCodeEquals(200);
+  }
+
+  /**
+   * Test language fallback defaults.
+   */
+  public function testLanguageFallbackDefaults() {
+    $this->drupalGet('');
+    // Ensure state of fallback languages persisted by
+    // locale_test_language_fallback_candidates_locale_lookup_alter() is empty.
+    $this->assertEqual(\Drupal::state()->get('locale.test_language_fallback_candidates_locale_lookup_alter_candidates'), []);
+    // Make sure there is enough information provided for alter hooks.
+    $context = \Drupal::state()->get('locale.test_language_fallback_candidates_locale_lookup_alter_context');
+    $this->assertEqual($context['langcode'], 'fr');
+    $this->assertEqual($context['operation'], 'locale_lookup');
+  }
+
+  /**
+   * Test old plural style @count[number] fix.
+   *
+   * @dataProvider providerTestFixOldPluralStyle
+   */
+  public function testFixOldPluralStyle($translation_value, $expected) {
+    $string_storage = \Drupal::service('locale.storage');
+    $string = $string_storage->findString(['source' => 'Member for', 'context' => '']);
+    $lid = $string->getId();
+    $string_storage->createTranslation([
+      'lid' => $lid,
+      'language' => 'fr',
+      'translation' => $translation_value,
+    ])->save();
+    _locale_refresh_translations(['fr'], [$lid]);
+
+    // Check that 'count[2]' was fixed for render value.
+    $this->drupalGet('');
+    $this->assertSession()->pageTextContains($expected);
+
+    // Check that 'count[2]' was saved for source value.
+    $translation = $string_storage->findTranslation(['language' => 'fr', 'lid' => $lid])->translation;
+    $this->assertSame($translation_value, $translation, 'Source value not changed');
+    $this->assertStringContainsString('@count[2]', $translation, 'Source value contains @count[2]');
+  }
+
+  /**
+   * Provides data for testFixOldPluralStyle().
+   *
+   * @return array
+   *   An array of test data:
+   *     - translation value
+   *     - expected result
+   */
+  public function providerTestFixOldPluralStyle() {
+    return [
+      'non-plural translation' => ['@count[2] non-plural test', '@count[2] non-plural test'],
+      'plural translation' => ['@count[2] plural test' . PoItem::DELIMITER, '@count plural test'],
+    ];
+  }
+
+}

web/core/modules/locale/tests/src/Functional/LocaleNonInteractiveDevInstallTest.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Drupal\Tests\locale\Functional;
+
+/**
+ * Tests installing in a different language with a dev version string.
+ *
+ * @group locale
+ */
+class LocaleNonInteractiveDevInstallTest extends LocaleNonInteractiveInstallTest {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getVersionStringToTest() {
+    include_once $this->root . '/core/includes/install.core.inc';
+    $version = _install_get_version_info(\Drupal::VERSION);
+    return $version['major'] . '.' . $version['minor'] . '.x';
+  }
+
+}

web/core/modules/locale/tests/src/Functional/LocaleNonInteractiveInstallTest.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace Drupal\Tests\locale\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests installing in a different language with a non-dev version string.
+ *
+ * @group locale
+ */
+class LocaleNonInteractiveInstallTest extends BrowserTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
+  /**
+   * Gets the version string to use in the translation file.
+   *
+   * @return string
+   *   The version string to test, for example, '8.0.0' or '8.6.x'.
+   */
+  protected function getVersionStringToTest() {
+    include_once $this->root . '/core/includes/install.core.inc';
+    $version = _install_get_version_info(\Drupal::VERSION);
+    return $version['major'] . '.0.0';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function installParameters() {
+    $parameters = parent::installParameters();
+    // Install Drupal in German.
+    $parameters['parameters']['langcode'] = 'de';
+    // Create a po file so we don't attempt to download one from
+    // localize.drupal.org and to have a test translation that will not change.
+    \Drupal::service('file_system')->mkdir($this->publicFilesDirectory . '/translations', NULL, TRUE);
+    $contents = <<<ENDPO
+msgid ""
+msgstr ""
+
+msgid "Enter the password that accompanies your username."
+msgstr "Geben sie das Passwort für ihren Benutzernamen ein."
+
+ENDPO;
+    $version = $this->getVersionStringToTest();
+    file_put_contents($this->publicFilesDirectory . "/translations/drupal-{$version}.de.po", $contents);
+    return $parameters;
+  }
+
+  /**
+   * Tests that the expected translated text appears on the login screen.
+   */
+  public function testInstallerTranslations() {
+    $this->drupalGet('user/login');
+    $this->assertSession()->responseContains('Geben sie das Passwort für ihren Benutzernamen ein.');
+  }
+
+}

web/core/modules/locale/tests/src/Functional/LocalePathTest.php

@@ -0,0 +1,145 @@
+<?php
+
+namespace Drupal\Tests\locale\Functional;
+
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\Core\Url;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\Traits\Core\PathAliasTestTrait;
+
+/**
+ * Tests you can configure a language for individual URL aliases.
+ *
+ * @group locale
+ * @group path
+ */
+class LocalePathTest extends BrowserTestBase {
+
+  use PathAliasTestTrait;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['node', 'locale', 'path', 'views'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
+    $this->config('system.site')->set('page.front', '/node')->save();
+  }
+
+  /**
+   * Test if a language can be associated with a path alias.
+   */
+  public function testPathLanguageConfiguration() {
+    // User to add and remove language.
+    $admin_user = $this->drupalCreateUser(['administer languages', 'create page content', 'administer url aliases', 'create url aliases', 'access administration pages', 'access content overview']);
+
+    // Add custom language.
+    $this->drupalLogin($admin_user);
+    // Code for the language.
+    $langcode = 'xx';
+    // The English name for the language.
+    $name = $this->randomMachineName(16);
+    // The domain prefix.
+    $prefix = $langcode;
+    $edit = [
+      'predefined_langcode' => 'custom',
+      'langcode' => $langcode,
+      'label' => $name,
+      'direction' => LanguageInterface::DIRECTION_LTR,
+    ];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
+
+    // Set path prefix.
+    $edit = ["prefix[$langcode]" => $prefix];
+    $this->drupalPostForm('admin/config/regional/language/detection/url', $edit, t('Save configuration'));
+
+    // Check that the "xx" front page is readily available because path prefix
+    // negotiation is pre-configured.
+    $this->drupalGet($prefix);
+    $this->assertText(t('Welcome to Drupal'), 'The "xx" front page is readily available.');
+
+    // Create a node.
+    $node = $this->drupalCreateNode(['type' => 'page']);
+
+    // Create a path alias in default language (English).
+    $path = 'admin/config/search/path/add';
+    $english_path = $this->randomMachineName(8);
+    $edit = [
+      'path[0][value]' => '/node/' . $node->id(),
+      'alias[0][value]' => '/' . $english_path,
+      'langcode[0][value]' => 'en',
+    ];
+    $this->drupalPostForm($path, $edit, t('Save'));
+
+    // Create a path alias in new custom language.
+    $custom_language_path = $this->randomMachineName(8);
+    $edit = [
+      'path[0][value]' => '/node/' . $node->id(),
+      'alias[0][value]' => '/' . $custom_language_path,
+      'langcode[0][value]' => $langcode,
+    ];
+    $this->drupalPostForm($path, $edit, t('Save'));
+
+    // Confirm English language path alias works.
+    $this->drupalGet($english_path);
+    $this->assertText($node->label(), 'English alias works.');
+
+    // Confirm custom language path alias works.
+    $this->drupalGet($prefix . '/' . $custom_language_path);
+    $this->assertText($node->label(), 'Custom language alias works.');
+
+    // Create a custom path.
+    $custom_path = $this->randomMachineName(8);
+
+    // Check priority of language for alias by source path.
+    $path_alias = $this->createPathAlias('/node/' . $node->id(), '/' . $custom_path, LanguageInterface::LANGCODE_NOT_SPECIFIED);
+    $lookup_path = $this->container->get('path_alias.manager')->getAliasByPath('/node/' . $node->id(), 'en');
+    $this->assertEqual('/' . $english_path, $lookup_path, 'English language alias has priority.');
+    // Same check for language 'xx'.
+    $lookup_path = $this->container->get('path_alias.manager')->getAliasByPath('/node/' . $node->id(), $prefix);
+    $this->assertEqual('/' . $custom_language_path, $lookup_path, 'Custom language alias has priority.');
+    $path_alias->delete();
+
+    // Create language nodes to check priority of aliases.
+    $first_node = $this->drupalCreateNode(['type' => 'page', 'promote' => 1, 'langcode' => 'en']);
+    $second_node = $this->drupalCreateNode(['type' => 'page', 'promote' => 1, 'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED]);
+
+    // Assign a custom path alias to the first node with the English language.
+    $this->createPathAlias('/node/' . $first_node->id(), '/' . $custom_path, $first_node->language()->getId());
+
+    // Assign a custom path alias to second node with
+    // LanguageInterface::LANGCODE_NOT_SPECIFIED.
+    $this->createPathAlias('/node/' . $second_node->id(), '/' . $custom_path, $second_node->language()->getId());
+
+    // Test that both node titles link to our path alias.
+    $this->drupalGet('admin/content');
+    $custom_path_url = Url::fromUserInput('/' . $custom_path)->toString();
+    $elements = $this->xpath('//a[@href=:href and normalize-space(text())=:title]', [':href' => $custom_path_url, ':title' => $first_node->label()]);
+    $this->assertTrue(!empty($elements), 'First node links to the path alias.');
+    $elements = $this->xpath('//a[@href=:href and normalize-space(text())=:title]', [':href' => $custom_path_url, ':title' => $second_node->label()]);
+    $this->assertTrue(!empty($elements), 'Second node links to the path alias.');
+
+    // Confirm that the custom path leads to the first node.
+    $this->drupalGet($custom_path);
+    $this->assertText($first_node->label(), 'Custom alias returns first node.');
+
+    // Confirm that the custom path with prefix leads to the second node.
+    $this->drupalGet($prefix . '/' . $custom_path);
+    $this->assertText($second_node->label(), 'Custom alias with prefix returns second node.');
+
+  }
+
+}

web/core/modules/locale/tests/src/Functional/LocalePluralFormatTest.php

@@ -0,0 +1,457 @@
+<?php
+
+namespace Drupal\Tests\locale\Functional;
+
+use Drupal\Component\Gettext\PoItem;
+use Drupal\Core\Database\Database;
+use Drupal\Core\StringTranslation\PluralTranslatableMarkup;
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests plural handling for various languages.
+ *
+ * @group locale
+ */
+class LocalePluralFormatTest extends BrowserTestBase {
+
+  /**
+   * An admin user.
+   *
+   * @var \Drupal\user\Entity\User
+   */
+  protected $adminUser;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['locale'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->adminUser = $this->drupalCreateUser(['administer languages', 'translate interface', 'access administration pages']);
+    $this->drupalLogin($this->adminUser);
+  }
+
+  /**
+   * Tests locale_get_plural() and \Drupal::translation()->formatPlural()
+   * functionality.
+   */
+  public function testGetPluralFormat() {
+    // Import some .po files with formulas to set up the environment.
+    // These will also add the languages to the system.
+    $this->importPoFile($this->getPoFileWithSimplePlural(), [
+      'langcode' => 'fr',
+    ]);
+    $this->importPoFile($this->getPoFileWithComplexPlural(), [
+      'langcode' => 'hr',
+    ]);
+
+    // Attempt to import some broken .po files as well to prove that these
+    // will not overwrite the proper plural formula imported above.
+    $this->importPoFile($this->getPoFileWithMissingPlural(), [
+      'langcode' => 'fr',
+      'overwrite_options[not_customized]' => TRUE,
+    ]);
+    $this->importPoFile($this->getPoFileWithBrokenPlural(), [
+      'langcode' => 'hr',
+      'overwrite_options[not_customized]' => TRUE,
+    ]);
+
+    // Reset static caches from locale_get_plural() to ensure we get fresh data.
+    drupal_static_reset('locale_get_plural');
+    drupal_static_reset('locale_get_plural:plurals');
+    drupal_static_reset('locale');
+
+    // Expected plural translation strings for each plural index.
+    $plural_strings = [
+      // English is not imported in this case, so we assume built-in text
+      // and formulas.
+      'en' => [
+        0 => '1 hour',
+        1 => '@count hours',
+      ],
+      'fr' => [
+        0 => '@count heure',
+        1 => '@count heures',
+      ],
+      'hr' => [
+        0 => '@count sat',
+        1 => '@count sata',
+        2 => '@count sati',
+      ],
+      // Hungarian is not imported, so it should assume the same text as
+      // English, but it will always pick the plural form as per the built-in
+      // logic, so only index -1 is relevant with the plural value.
+      'hu' => [
+        0 => '1 hour',
+        -1 => '@count hours',
+      ],
+    ];
+
+    // Expected plural indexes precomputed base on the plural formulas with
+    // given $count value.
+    $plural_tests = [
+      'en' => [
+        1 => 0,
+        0 => 1,
+        5 => 1,
+        123 => 1,
+        235 => 1,
+      ],
+      'fr' => [
+        1 => 0,
+        0 => 0,
+        5 => 1,
+        123 => 1,
+        235 => 1,
+      ],
+      'hr' => [
+        1 => 0,
+        21 => 0,
+        0 => 2,
+        2 => 1,
+        8 => 2,
+        123 => 1,
+        235 => 2,
+      ],
+      'hu' => [
+        1 => -1,
+        21 => -1,
+        0 => -1,
+      ],
+    ];
+
+    foreach ($plural_tests as $langcode => $tests) {
+      foreach ($tests as $count => $expected_plural_index) {
+        // Assert that the we get the right plural index.
+        $this->assertIdentical(locale_get_plural($count, $langcode), $expected_plural_index, 'Computed plural index for ' . $langcode . ' for count ' . $count . ' is ' . $expected_plural_index);
+        // Assert that the we get the right translation for that. Change the
+        // expected index as per the logic for translation lookups.
+        $expected_plural_index = ($count == 1) ? 0 : $expected_plural_index;
+        $expected_plural_string = str_replace('@count', $count, $plural_strings[$langcode][$expected_plural_index]);
+        $this->assertIdentical(\Drupal::translation()->formatPlural($count, '1 hour', '@count hours', [], ['langcode' => $langcode])->render(), $expected_plural_string, 'Plural translation of 1 hours / @count hours for count ' . $count . ' in ' . $langcode . ' is ' . $expected_plural_string);
+        // DO NOT use translation to pass translated strings into
+        // PluralTranslatableMarkup::createFromTranslatedString() this way. It
+        // is designed to be used with *already* translated text like settings
+        // from configuration. We use PHP translation here just because we have
+        // the expected result data in that format.
+        $translated_string = \Drupal::translation()->translate('1 hour' . PoItem::DELIMITER . '@count hours', [], ['langcode' => $langcode]);
+        $plural = PluralTranslatableMarkup::createFromTranslatedString($count, $translated_string, [], ['langcode' => $langcode]);
+        $this->assertIdentical($plural->render(), $expected_plural_string);
+      }
+    }
+  }
+
+  /**
+   * Tests plural editing of DateFormatter strings
+   */
+  public function testPluralEditDateFormatter() {
+
+    // Import some .po files with formulas to set up the environment.
+    // These will also add the languages to the system.
+    $this->importPoFile($this->getPoFileWithSimplePlural(), [
+      'langcode' => 'fr',
+    ]);
+
+    // Set French as the site default language.
+    $this->config('system.site')->set('default_langcode', 'fr')->save();
+
+    // Visit User Info page before updating translation strings. Change the
+    // created time to ensure that the we're dealing in seconds and it can't be
+    // exactly 1 minute.
+    $this->adminUser->set('created', time() - 1)->save();
+    $this->drupalGet('user');
+
+    // Member for time should be translated.
+    $this->assertText("seconde", "'Member for' text is translated.");
+
+    $path = 'admin/config/regional/translate/';
+    $search = [
+      'langcode' => 'fr',
+      // Limit to only translated strings to ensure that database ordering does
+      // not break the test.
+      'translation' => 'translated',
+    ];
+    $this->drupalPostForm($path, $search, t('Filter'));
+    // Plural values for the langcode fr.
+    $this->assertText('@count seconde');
+    $this->assertText('@count secondes');
+
+    // Inject a plural source string to the database. We need to use a specific
+    // langcode here because the language will be English by default and will
+    // not save our source string for performance optimization if we do not ask
+    // specifically for a language.
+    \Drupal::translation()->formatPlural(1, '1 second', '@count seconds', [], ['langcode' => 'fr'])->render();
+    $lid = Database::getConnection()->query("SELECT lid FROM {locales_source} WHERE source = :source AND context = ''", [':source' => "1 second" . PoItem::DELIMITER . "@count seconds"])->fetchField();
+    // Look up editing page for this plural string and check fields.
+    $search = [
+      'string' => '1 second',
+      'langcode' => 'fr',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+
+    // Save complete translations for the string in langcode fr.
+    $edit = [
+      "strings[$lid][translations][0]" => '1 seconde updated',
+      "strings[$lid][translations][1]" => '@count secondes updated',
+    ];
+    $this->drupalPostForm($path, $edit, t('Save translations'));
+
+    // User interface input for translating seconds should not be duplicated
+    $this->assertUniqueText('@count seconds', 'Interface translation input for @count seconds only appears once.');
+
+    // Member for time should be translated. Change the created time to ensure
+    // that the we're dealing in multiple seconds and it can't be exactly 1
+    // second or minute.
+    $this->adminUser->set('created', time() - 2)->save();
+    $this->drupalGet('user');
+    $this->assertText("secondes updated", "'Member for' text is translated.");
+  }
+
+  /**
+   * Tests plural editing and export functionality.
+   */
+  public function testPluralEditExport() {
+    // Import some .po files with formulas to set up the environment.
+    // These will also add the languages to the system.
+    $this->importPoFile($this->getPoFileWithSimplePlural(), [
+      'langcode' => 'fr',
+    ]);
+    $this->importPoFile($this->getPoFileWithComplexPlural(), [
+      'langcode' => 'hr',
+    ]);
+
+    // Get the French translations.
+    $this->drupalPostForm('admin/config/regional/translate/export', [
+      'langcode' => 'fr',
+    ], t('Export'));
+    // Ensure we have a translation file.
+    $this->assertRaw('# French translation of Drupal', 'Exported French translation file.');
+    // Ensure our imported translations exist in the file.
+    $this->assertRaw("msgid \"Monday\"\nmsgstr \"lundi\"", 'French translations present in exported file.');
+    // Check for plural export specifically.
+    $this->assertRaw("msgid \"1 hour\"\nmsgid_plural \"@count hours\"\nmsgstr[0] \"@count heure\"\nmsgstr[1] \"@count heures\"", 'Plural translations exported properly.');
+
+    // Get the Croatian translations.
+    $this->drupalPostForm('admin/config/regional/translate/export', [
+      'langcode' => 'hr',
+    ], t('Export'));
+    // Ensure we have a translation file.
+    $this->assertRaw('# Croatian translation of Drupal', 'Exported Croatian translation file.');
+    // Ensure our imported translations exist in the file.
+    $this->assertRaw("msgid \"Monday\"\nmsgstr \"Ponedjeljak\"", 'Croatian translations present in exported file.');
+    // Check for plural export specifically.
+    $this->assertRaw("msgid \"1 hour\"\nmsgid_plural \"@count hours\"\nmsgstr[0] \"@count sat\"\nmsgstr[1] \"@count sata\"\nmsgstr[2] \"@count sati\"", 'Plural translations exported properly.');
+
+    // Check if the source appears on the translation page.
+    $this->drupalGet('admin/config/regional/translate');
+    $this->assertText("1 hour");
+    $this->assertText("@count hours");
+
+    // Look up editing page for this plural string and check fields.
+    $path = 'admin/config/regional/translate/';
+    $search = [
+      'langcode' => 'hr',
+    ];
+    $this->drupalPostForm($path, $search, t('Filter'));
+    // Labels for plural editing elements.
+    $this->assertText('Singular form');
+    $this->assertText('First plural form');
+    $this->assertText('2. plural form');
+    $this->assertNoText('3. plural form');
+
+    // Plural values for langcode hr.
+    $this->assertText('@count sat');
+    $this->assertText('@count sata');
+    $this->assertText('@count sati');
+
+    $connection = Database::getConnection();
+    // Edit langcode hr translations and see if that took effect.
+    $lid = $connection->query("SELECT lid FROM {locales_source} WHERE source = :source AND context = ''", [':source' => "1 hour" . PoItem::DELIMITER . "@count hours"])->fetchField();
+    $edit = [
+      "strings[$lid][translations][1]" => '@count sata edited',
+    ];
+    $this->drupalPostForm($path, $edit, t('Save translations'));
+
+    $search = [
+      'langcode' => 'fr',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    // Plural values for the langcode fr.
+    $this->assertText('@count heure');
+    $this->assertText('@count heures');
+    $this->assertNoText('2. plural form');
+
+    // Edit langcode fr translations and see if that took effect.
+    $edit = [
+      "strings[$lid][translations][0]" => '@count heure edited',
+    ];
+    $this->drupalPostForm($path, $edit, t('Save translations'));
+
+    // Inject a plural source string to the database. We need to use a specific
+    // langcode here because the language will be English by default and will
+    // not save our source string for performance optimization if we do not ask
+    // specifically for a language.
+    \Drupal::translation()->formatPlural(1, '1 day', '@count days', [], ['langcode' => 'fr'])->render();
+    $lid = $connection->query("SELECT lid FROM {locales_source} WHERE source = :source AND context = ''", [':source' => "1 day" . PoItem::DELIMITER . "@count days"])->fetchField();
+    // Look up editing page for this plural string and check fields.
+    $search = [
+      'string' => '1 day',
+      'langcode' => 'fr',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+
+    // Save complete translations for the string in langcode fr.
+    $edit = [
+      "strings[$lid][translations][0]" => '1 jour',
+      "strings[$lid][translations][1]" => '@count jours',
+    ];
+    $this->drupalPostForm($path, $edit, t('Save translations'));
+
+    // Save complete translations for the string in langcode hr.
+    $search = [
+      'string' => '1 day',
+      'langcode' => 'hr',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+
+    $edit = [
+      "strings[$lid][translations][0]" => '@count dan',
+      "strings[$lid][translations][1]" => '@count dana',
+      "strings[$lid][translations][2]" => '@count dana',
+    ];
+    $this->drupalPostForm($path, $edit, t('Save translations'));
+
+    // Get the French translations.
+    $this->drupalPostForm('admin/config/regional/translate/export', [
+      'langcode' => 'fr',
+    ], t('Export'));
+    // Check for plural export specifically.
+    $this->assertRaw("msgid \"1 hour\"\nmsgid_plural \"@count hours\"\nmsgstr[0] \"@count heure edited\"\nmsgstr[1] \"@count heures\"", 'Edited French plural translations for hours exported properly.');
+    $this->assertRaw("msgid \"1 day\"\nmsgid_plural \"@count days\"\nmsgstr[0] \"1 jour\"\nmsgstr[1] \"@count jours\"", 'Added French plural translations for days exported properly.');
+
+    // Get the Croatian translations.
+    $this->drupalPostForm('admin/config/regional/translate/export', [
+      'langcode' => 'hr',
+    ], t('Export'));
+    // Check for plural export specifically.
+    $this->assertRaw("msgid \"1 hour\"\nmsgid_plural \"@count hours\"\nmsgstr[0] \"@count sat\"\nmsgstr[1] \"@count sata edited\"\nmsgstr[2] \"@count sati\"", 'Edited Croatian plural translations exported properly.');
+    $this->assertRaw("msgid \"1 day\"\nmsgid_plural \"@count days\"\nmsgstr[0] \"@count dan\"\nmsgstr[1] \"@count dana\"\nmsgstr[2] \"@count dana\"", 'Added Croatian plural translations exported properly.');
+  }
+
+  /**
+   * Imports a standalone .po file in a given language.
+   *
+   * @param string $contents
+   *   Contents of the .po file to import.
+   * @param array $options
+   *   Additional options to pass to the translation import form.
+   */
+  public function importPoFile($contents, array $options = []) {
+    $file_system = \Drupal::service('file_system');
+    $name = $file_system->tempnam('temporary://', "po_") . '.po';
+    file_put_contents($name, $contents);
+    $options['files[file]'] = $name;
+    $this->drupalPostForm('admin/config/regional/translate/import', $options, t('Import'));
+    $file_system->unlink($name);
+  }
+
+  /**
+   * Returns a .po file with a simple plural formula.
+   */
+  public function getPoFileWithSimplePlural() {
+    return <<< EOF
+msgid ""
+msgstr ""
+"Project-Id-Version: Drupal 8\\n"
+"MIME-Version: 1.0\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\\n"
+
+msgid "1 hour"
+msgid_plural "@count hours"
+msgstr[0] "@count heure"
+msgstr[1] "@count heures"
+
+msgid "1 second"
+msgid_plural "@count seconds"
+msgstr[0] "@count seconde"
+msgstr[1] "@count secondes"
+
+msgid "Monday"
+msgstr "lundi"
+EOF;
+  }
+
+  /**
+   * Returns a .po file with a complex plural formula.
+   */
+  public function getPoFileWithComplexPlural() {
+    return <<< EOF
+msgid ""
+msgstr ""
+"Project-Id-Version: Drupal 8\\n"
+"MIME-Version: 1.0\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\\n"
+
+msgid "1 hour"
+msgid_plural "@count hours"
+msgstr[0] "@count sat"
+msgstr[1] "@count sata"
+msgstr[2] "@count sati"
+
+msgid "Monday"
+msgstr "Ponedjeljak"
+EOF;
+  }
+
+  /**
+   * Returns a .po file with a missing plural formula.
+   */
+  public function getPoFileWithMissingPlural() {
+    return <<< EOF
+msgid ""
+msgstr ""
+"Project-Id-Version: Drupal 8\\n"
+"MIME-Version: 1.0\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+
+msgid "Monday"
+msgstr "lundi"
+EOF;
+  }
+
+  /**
+   * Returns a .po file with a broken plural formula.
+   */
+  public function getPoFileWithBrokenPlural() {
+    return <<< EOF
+msgid ""
+msgstr ""
+"Project-Id-Version: Drupal 8\\n"
+"MIME-Version: 1.0\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+"Plural-Forms: broken, will not parse\\n"
+
+msgid "Monday"
+msgstr "Ponedjeljak"
+EOF;
+  }
+
+}

web/core/modules/locale/tests/src/Functional/LocaleTranslateStringTourTest.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace Drupal\Tests\locale\Functional;
+
+use Drupal\Tests\tour\Functional\TourTestBase;
+
+/**
+ * Tests the Translate Interface tour.
+ *
+ * @group locale
+ */
+class LocaleTranslateStringTourTest extends TourTestBase {
+
+  /**
+   * An admin user with administrative permissions to translate.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $adminUser;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['locale', 'tour'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->adminUser = $this->drupalCreateUser(['translate interface', 'access tour', 'administer languages']);
+    $this->drupalLogin($this->adminUser);
+  }
+
+  /**
+   * Tests locale tour tip availability.
+   */
+  public function testTranslateStringTourTips() {
+    // Add another language so there are no missing form items.
+    $edit = [];
+    $edit['predefined_langcode'] = 'es';
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
+
+    $this->drupalGet('admin/config/regional/translate');
+    $this->assertTourTips();
+  }
+
+}

web/core/modules/locale/tests/src/Functional/LocaleTranslatedSchemaDefinitionTest.php

@@ -0,0 +1,100 @@
+<?php
+
+namespace Drupal\Tests\locale\Functional;
+
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\RequirementsPageTrait;
+
+/**
+ * Adds and configures languages to check field schema definition.
+ *
+ * @group locale
+ */
+class LocaleTranslatedSchemaDefinitionTest extends BrowserTestBase {
+
+  use RequirementsPageTrait;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['language', 'locale', 'node'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'classy';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    ConfigurableLanguage::createFromLangcode('fr')->save();
+    $this->config('system.site')->set('default_langcode', 'fr')->save();
+
+    // Clear all caches so that the base field definition, its cache in the
+    // entity manager, the t() cache, etc. are all cleared.
+    drupal_flush_all_caches();
+  }
+
+  /**
+   * Tests that translated field descriptions do not affect the update system.
+   */
+  public function testTranslatedSchemaDefinition() {
+    /** @var \Drupal\locale\StringDatabaseStorage $stringStorage */
+    $stringStorage = \Drupal::service('locale.storage');
+
+    $source = $stringStorage->createString([
+      'source' => 'Revision ID',
+    ])->save();
+
+    $stringStorage->createTranslation([
+      'lid' => $source->lid,
+      'language' => 'fr',
+      'translation' => 'Translated Revision ID',
+    ])->save();
+
+    // Ensure that the field is translated when access through the API.
+    $this->assertEqual('Translated Revision ID', \Drupal::service('entity_field.manager')->getBaseFieldDefinitions('node')['vid']->getLabel());
+
+    // Assert there are no updates.
+    $this->assertFalse(\Drupal::service('entity.definition_update_manager')->needsUpdates());
+  }
+
+  /**
+   * Tests that translations do not affect the update system.
+   */
+  public function testTranslatedUpdate() {
+    // Visit the update page to collect any strings that may be translatable.
+    $user = $this->drupalCreateUser(['administer software updates']);
+    $this->drupalLogin($user);
+    $update_url = $GLOBALS['base_url'] . '/update.php';
+    $this->drupalGet($update_url, ['external' => TRUE]);
+
+    /** @var \Drupal\locale\StringDatabaseStorage $stringStorage */
+    $stringStorage = \Drupal::service('locale.storage');
+    $sources = $stringStorage->getStrings();
+
+    // Translate all source strings found.
+    foreach ($sources as $source) {
+      $stringStorage->createTranslation([
+        'lid' => $source->lid,
+        'language' => 'fr',
+        'translation' => $this->randomMachineName(100),
+      ])->save();
+    }
+
+    // Ensure that there are no updates just due to translations. Check for
+    // markup and a link instead of specific text because text may be
+    // translated.
+    $this->drupalGet($update_url . '/selection', ['external' => TRUE]);
+    $this->updateRequirementsProblem();
+    $this->drupalGet($update_url . '/selection', ['external' => TRUE]);
+    $this->assertRaw('messages--status', 'No pending updates.');
+    $this->assertNoLinkByHref('fr/update.php/run', 'No link to run updates.');
+  }
+
+}

web/core/modules/locale/tests/src/Functional/LocaleTranslationDownloadTest.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace Drupal\Tests\locale\Functional;
+
+use Drupal\Core\StreamWrapper\PublicStream;
+use Drupal\language\Entity\ConfigurableLanguage;
+use org\bovigo\vfs\vfsStream;
+
+/**
+ * Tests locale translation download.
+ *
+ * @group locale
+ */
+class LocaleTranslationDownloadTest extends LocaleUpdateBase {
+
+  /**
+   * The virtual file stream for storing translations.
+   *
+   * @var \org\bovigo\vfs\vfsStreamDirectory
+   */
+  protected $translationsStream;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $moduleHandler = $this->container->get('module_handler');
+    $moduleHandler->loadInclude('locale', 'inc', 'locale.batch');
+    ConfigurableLanguage::createFromLangcode('de')->save();
+
+    // Let the translations:// stream wrapper point to a virtual file system to
+    // make it independent from the test environment.
+    $this->translationsStream = vfsStream::setup('translations');
+    \Drupal::configFactory()->getEditable('locale.settings')
+      ->set('translation.path', $this->translationsStream->url())
+      ->save();
+  }
+
+  /**
+   * Tests translation download from remote sources.
+   */
+  public function testUpdateImportSourceRemote() {
+
+    // Provide remote and 'previously' downloaded translation file.
+    $this->setTranslationFiles();
+    vfsStream::create([
+      'contrib_module_one-8.x-1.1.de._po' => '__old_content__',
+    ], $this->translationsStream);
+
+    $url = \Drupal::service('url_generator')->generateFromRoute('<front>', [], ['absolute' => TRUE]);
+    $uri = $url . PublicStream::basePath() . '/remote/all/contrib_module_one/contrib_module_one-8.x-1.1.de._po';
+    $source_file = (object) [
+      'uri' => $uri,
+    ];
+
+    $result = locale_translation_download_source($source_file, 'translations://');
+
+    $this->assertEquals('translations://contrib_module_one-8.x-1.1.de._po', $result->uri);
+    $this->assertFileNotExists('translations://contrib_module_one-8.x-1.1.de_0._po');
+    $this->assertFileExists('translations://contrib_module_one-8.x-1.1.de._po');
+    $this->assertStringNotContainsString('__old_content__', file_get_contents('translations://contrib_module_one-8.x-1.1.de._po'));
+  }
+
+}

web/core/modules/locale/tests/src/Functional/LocaleTranslationUiTest.php

@@ -0,0 +1,549 @@
+<?php
+
+namespace Drupal\Tests\locale\Functional;
+
+use Drupal\Core\Url;
+use Drupal\Core\Database\Database;
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Core\Language\LanguageInterface;
+
+/**
+ * Adds a new locale and translates its name. Checks the validation of
+ * translation strings and search results.
+ *
+ * @group locale
+ */
+class LocaleTranslationUiTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['locale'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
+  /**
+   * Enable interface translation to English.
+   */
+  public function testEnglishTranslation() {
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
+    $this->drupalLogin($admin_user);
+
+    $this->drupalPostForm('admin/config/regional/language/edit/en', ['locale_translate_english' => TRUE], t('Save language'));
+    $this->assertLinkByHref('/admin/config/regional/translate?langcode=en', 0, 'Enabled interface translation to English.');
+  }
+
+  /**
+   * Adds a language and tests string translation by users with the appropriate permissions.
+   */
+  public function testStringTranslation() {
+    // User to add and remove language.
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
+    // User to translate and delete string.
+    $translate_user = $this->drupalCreateUser(['translate interface', 'access administration pages']);
+    // Code for the language.
+    $langcode = 'xx';
+    // The English name for the language. This will be translated.
+    $name = 'cucurbitaceae';
+    // This will be the translation of $name.
+    $translation = $this->randomMachineName(16);
+    $translation_to_en = $this->randomMachineName(16);
+
+    // Add custom language.
+    $this->drupalLogin($admin_user);
+    $edit = [
+      'predefined_langcode' => 'custom',
+      'langcode' => $langcode,
+      'label' => $name,
+      'direction' => LanguageInterface::DIRECTION_LTR,
+    ];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
+    // Add string.
+    t($name, [], ['langcode' => $langcode])->render();
+    // Reset locale cache.
+    $this->container->get('string_translation')->reset();
+    $this->assertRaw('"edit-languages-' . $langcode . '-weight"', 'Language code found.');
+    $this->assertText(t($name), 'Test language added.');
+    $this->drupalLogout();
+
+    // Search for the name and translate it.
+    $this->drupalLogin($translate_user);
+    $search = [
+      'string' => $name,
+      'langcode' => $langcode,
+      'translation' => 'untranslated',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $this->assertText($name, 'Search found the string as untranslated.');
+
+    // No t() here, it's surely not translated yet.
+    $this->assertText($name, 'name found on edit screen.');
+    $this->assertNoOption('edit-langcode', 'en', 'No way to translate the string to English.');
+    $this->drupalLogout();
+    $this->drupalLogin($admin_user);
+    $this->drupalPostForm('admin/config/regional/language/edit/en', ['locale_translate_english' => TRUE], t('Save language'));
+    $this->drupalLogout();
+    $this->drupalLogin($translate_user);
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $this->assertText($name, 'Search found the string as untranslated.');
+
+    // Assume this is the only result, given the random name.
+    $textarea = current($this->xpath('//textarea'));
+    $lid = $textarea->getAttribute('name');
+    $edit = [
+      $lid => $translation,
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
+    $this->assertText(t('The strings have been saved.'), 'The strings have been saved.');
+    $url_bits = explode('?', $this->getUrl());
+    $this->assertEqual($url_bits[0], Url::fromRoute('locale.translate_page', [], ['absolute' => TRUE])->toString(), 'Correct page redirection.');
+    $search = [
+      'string' => $name,
+      'langcode' => $langcode,
+      'translation' => 'translated',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $this->assertRaw($translation, 'Non-English translation properly saved.');
+
+    $search = [
+      'string' => $name,
+      'langcode' => 'en',
+      'translation' => 'untranslated',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $textarea = current($this->xpath('//textarea'));
+    $lid = $textarea->getAttribute('name');
+    $edit = [
+      $lid => $translation_to_en,
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
+    $search = [
+      'string' => $name,
+      'langcode' => 'en',
+      'translation' => 'translated',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $this->assertRaw($translation_to_en, 'English translation properly saved.');
+
+    $this->assertTrue($name != $translation && t($name, [], ['langcode' => $langcode]) == $translation, 't() works for non-English.');
+    // Refresh the locale() cache to get fresh data from t() below. We are in
+    // the same HTTP request and therefore t() is not refreshed by saving the
+    // translation above.
+    $this->container->get('string_translation')->reset();
+    // Now we should get the proper fresh translation from t().
+    $this->assertTrue($name != $translation_to_en && t($name, [], ['langcode' => 'en']) == $translation_to_en, 't() works for English.');
+    $this->assertTrue(t($name, [], ['langcode' => LanguageInterface::LANGCODE_SYSTEM]) == $name, 't() works for LanguageInterface::LANGCODE_SYSTEM.');
+
+    $search = [
+      'string' => $name,
+      'langcode' => 'en',
+      'translation' => 'untranslated',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $this->assertText(t('No strings available.'), 'String is translated.');
+
+    // Test invalidation of 'rendered' cache tag after string translation.
+    $this->drupalLogout();
+    $this->drupalGet('xx/user/login');
+    $this->assertText('Enter the password that accompanies your username.');
+
+    $this->drupalLogin($translate_user);
+    $search = [
+      'string' => 'accompanies your username',
+      'langcode' => $langcode,
+      'translation' => 'untranslated',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $textarea = current($this->xpath('//textarea'));
+    $lid = $textarea->getAttribute('name');
+    $edit = [
+      $lid => 'Please enter your Llama username.',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
+
+    $this->drupalLogout();
+    $this->drupalGet('xx/user/login');
+    $this->assertText('Please enter your Llama username.');
+
+    // Delete the language.
+    $this->drupalLogin($admin_user);
+    $path = 'admin/config/regional/language/delete/' . $langcode;
+    // This a confirm form, we do not need any fields changed.
+    $this->drupalPostForm($path, [], t('Delete'));
+    // We need raw here because %language and %langcode will add HTML.
+    $t_args = ['%language' => $name, '%langcode' => $langcode];
+    $this->assertRaw(t('The %language (%langcode) language has been removed.', $t_args), 'The test language has been removed.');
+    // Reload to remove $name.
+    $this->drupalGet($path);
+    // Verify that language is no longer found.
+    $this->assertSession()->statusCodeEquals(404);
+    $this->drupalLogout();
+
+    // Delete the string.
+    $this->drupalLogin($translate_user);
+    $search = [
+      'string' => $name,
+      'langcode' => 'en',
+      'translation' => 'translated',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    // Assume this is the only result, given the random name.
+    $textarea = current($this->xpath('//textarea'));
+    $lid = $textarea->getAttribute('name');
+    $edit = [
+      $lid => '',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
+    $this->assertRaw($name, 'The strings have been saved.');
+    $this->drupalLogin($translate_user);
+    $search = [
+      'string' => $name,
+      'langcode' => 'en',
+      'translation' => 'untranslated',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $this->assertNoText(t('No strings available.'), 'The translation has been removed');
+  }
+
+  /**
+   * Adds a language and checks that the JavaScript translation files are
+   * properly created and rebuilt on deletion.
+   */
+  public function testJavaScriptTranslation() {
+    $user = $this->drupalCreateUser(['translate interface', 'administer languages', 'access administration pages']);
+    $this->drupalLogin($user);
+    $config = $this->config('locale.settings');
+
+    $langcode = 'xx';
+    // The English name for the language. This will be translated.
+    $name = $this->randomMachineName(16);
+
+    // Add custom language.
+    $edit = [
+      'predefined_langcode' => 'custom',
+      'langcode' => $langcode,
+      'label' => $name,
+      'direction' => LanguageInterface::DIRECTION_LTR,
+    ];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
+    $this->container->get('language_manager')->reset();
+
+    // Build the JavaScript translation file.
+
+    // Retrieve the source string of the first string available in the
+    // {locales_source} table and translate it.
+    $query = Database::getConnection()->select('locales_source', 's');
+    $query->addJoin('INNER', 'locales_location', 'l', 's.lid = l.lid');
+    $source = $query->fields('s', ['source'])
+      ->condition('l.type', 'javascript')
+      ->range(0, 1)
+      ->execute()
+      ->fetchField();
+
+    $search = [
+      'string' => $source,
+      'langcode' => $langcode,
+      'translation' => 'all',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+
+    $textarea = current($this->xpath('//textarea'));
+    $lid = $textarea->getAttribute('name');
+    $edit = [
+      $lid => $this->randomMachineName(),
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
+
+    // Trigger JavaScript translation parsing and building.
+    _locale_rebuild_js($langcode);
+
+    $locale_javascripts = \Drupal::state()->get('locale.translation.javascript') ?: [];
+    $js_file = 'public://' . $config->get('javascript.directory') . '/' . $langcode . '_' . $locale_javascripts[$langcode] . '.js';
+    $this->assertFileExists($js_file);
+
+    // Test JavaScript translation rebuilding.
+    \Drupal::service('file_system')->delete($js_file);
+    $this->assertFileNotExists($js_file);
+    _locale_rebuild_js($langcode);
+    $this->assertFileExists($js_file);
+  }
+
+  /**
+   * Tests the validation of the translation input.
+   */
+  public function testStringValidation() {
+    // User to add language and strings.
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages', 'translate interface']);
+    $this->drupalLogin($admin_user);
+    $langcode = 'xx';
+    // The English name for the language. This will be translated.
+    $name = $this->randomMachineName(16);
+
+    // These will be the invalid translations of $name.
+    $key = $this->randomMachineName(16);
+    $bad_translations[$key] = "<script>alert('xss');</script>" . $key;
+    $key = $this->randomMachineName(16);
+    $bad_translations[$key] = '<img SRC="javascript:alert(\'xss\');">' . $key;
+    $key = $this->randomMachineName(16);
+    $bad_translations[$key] = '<<SCRIPT>alert("xss");//<</SCRIPT>' . $key;
+    $key = $this->randomMachineName(16);
+    $bad_translations[$key] = "<BODY ONLOAD=alert('xss')>" . $key;
+
+    // Add custom language.
+    $edit = [
+      'predefined_langcode' => 'custom',
+      'langcode' => $langcode,
+      'label' => $name,
+      'direction' => LanguageInterface::DIRECTION_LTR,
+    ];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
+    // Add string.
+    t($name, [], ['langcode' => $langcode])->render();
+    // Reset locale cache.
+    $search = [
+      'string' => $name,
+      'langcode' => $langcode,
+      'translation' => 'all',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    // Find the edit path.
+
+    $textarea = current($this->xpath('//textarea'));
+    $lid = $textarea->getAttribute('name');
+    foreach ($bad_translations as $translation) {
+      $edit = [
+        $lid => $translation,
+      ];
+      $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
+      // Check for a form error on the textarea.
+      $form_class = $this->xpath('//form[@id="locale-translate-edit-form"]//textarea/@class');
+      $this->assertStringContainsString('error', $form_class[0]->getText(), 'The string was rejected as unsafe.');
+      $this->assertNoText(t('The string has been saved.'), 'The string was not saved.');
+    }
+  }
+
+  /**
+   * Tests translation search form.
+   */
+  public function testStringSearch() {
+    // User to add and remove language.
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
+    // User to translate and delete string.
+    $translate_user = $this->drupalCreateUser(['translate interface', 'access administration pages']);
+
+    // Code for the language.
+    $langcode = 'xx';
+    // The English name for the language. This will be translated.
+    $name = $this->randomMachineName(16);
+    // This will be the translation of $name.
+    $translation = $this->randomMachineName(16);
+
+    // Add custom language.
+    $this->drupalLogin($admin_user);
+    $edit = [
+      'predefined_langcode' => 'custom',
+      'langcode' => $langcode,
+      'label' => $name,
+      'direction' => LanguageInterface::DIRECTION_LTR,
+    ];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
+
+    $edit = [
+      'predefined_langcode' => 'custom',
+      'langcode' => 'yy',
+      'label' => $this->randomMachineName(16),
+      'direction' => LanguageInterface::DIRECTION_LTR,
+    ];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
+
+    // Add string.
+    t($name, [], ['langcode' => $langcode])->render();
+    // Reset locale cache.
+    $this->container->get('string_translation')->reset();
+    $this->drupalLogout();
+
+    // Search for the name.
+    $this->drupalLogin($translate_user);
+    $search = [
+      'string' => $name,
+      'langcode' => $langcode,
+      'translation' => 'all',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    // assertText() seems to remove the input field where $name always could be
+    // found, so this is not a false assert. See how assertNoText succeeds
+    // later.
+    $this->assertText($name, 'Search found the string.');
+
+    // Ensure untranslated string doesn't appear if searching on 'only
+    // translated strings'.
+    $search = [
+      'string' => $name,
+      'langcode' => $langcode,
+      'translation' => 'translated',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $this->assertText(t('No strings available.'), "Search didn't find the string.");
+
+    // Ensure untranslated string appears if searching on 'only untranslated
+    // strings'.
+    $search = [
+      'string' => $name,
+      'langcode' => $langcode,
+      'translation' => 'untranslated',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $this->assertNoText(t('No strings available.'), 'Search found the string.');
+
+    // Add translation.
+    // Assume this is the only result, given the random name.
+    // We save the lid from the path.
+    $textarea = current($this->xpath('//textarea'));
+    $lid = $textarea->getAttribute('name');
+    $edit = [
+      $lid => $translation,
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
+
+    // Ensure translated string does appear if searching on 'only
+    // translated strings'.
+    $search = [
+      'string' => $translation,
+      'langcode' => $langcode,
+      'translation' => 'translated',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $this->assertNoText(t('No strings available.'), 'Search found the translation.');
+
+    // Ensure translated source string doesn't appear if searching on 'only
+    // untranslated strings'.
+    $search = [
+      'string' => $name,
+      'langcode' => $langcode,
+      'translation' => 'untranslated',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $this->assertText(t('No strings available.'), "Search didn't find the source string.");
+
+    // Ensure translated string doesn't appear if searching on 'only
+    // untranslated strings'.
+    $search = [
+      'string' => $translation,
+      'langcode' => $langcode,
+      'translation' => 'untranslated',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $this->assertText(t('No strings available.'), "Search didn't find the translation.");
+
+    // Ensure translated string does appear if searching on the custom language.
+    $search = [
+      'string' => $translation,
+      'langcode' => $langcode,
+      'translation' => 'all',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $this->assertNoText(t('No strings available.'), 'Search found the translation.');
+
+    // Ensure translated string doesn't appear if searching in System (English).
+    $search = [
+      'string' => $translation,
+      'langcode' => 'yy',
+      'translation' => 'all',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $this->assertText(t('No strings available.'), "Search didn't find the translation.");
+
+    // Search for a string that isn't in the system.
+    $unavailable_string = $this->randomMachineName(16);
+    $search = [
+      'string' => $unavailable_string,
+      'langcode' => $langcode,
+      'translation' => 'all',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $this->assertText(t('No strings available.'), "Search didn't find the invalid string.");
+  }
+
+  /**
+   * Tests that only changed strings are saved customized when edited.
+   */
+  public function testUICustomizedStrings() {
+    $user = $this->drupalCreateUser(['translate interface', 'administer languages', 'access administration pages']);
+    $this->drupalLogin($user);
+    ConfigurableLanguage::createFromLangcode('de')->save();
+
+    // Create test source string.
+    $string = $this->container->get('locale.storage')->createString([
+      'source' => $this->randomMachineName(100),
+      'context' => $this->randomMachineName(20),
+    ])->save();
+
+    // Create translation for new string and save it as non-customized.
+    $translation = $this->container->get('locale.storage')->createTranslation([
+      'lid' => $string->lid,
+      'language' => 'de',
+      'translation' => $this->randomMachineName(100),
+      'customized' => 0,
+    ])->save();
+
+    // Reset locale cache.
+    $this->container->get('string_translation')->reset();
+
+    // Ensure non-customized translation string does appear if searching
+    // non-customized translation.
+    $search = [
+      'string' => $string->getString(),
+      'langcode' => 'de',
+      'translation' => 'translated',
+      'customized' => '0',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+
+    $this->assertText($translation->getString(), 'Translation is found in search result.');
+
+    // Submit the translations without changing the translation.
+    $textarea = current($this->xpath('//textarea'));
+    $lid = $textarea->getAttribute('name');
+    $edit = [
+      $lid => $translation->getString(),
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
+
+    // Ensure unchanged translation string does appear if searching
+    // non-customized translation.
+    $search = [
+      'string' => $string->getString(),
+      'langcode' => 'de',
+      'translation' => 'translated',
+      'customized' => '0',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $this->assertText($string->getString(), 'Translation is not marked as customized.');
+
+    // Submit the translations with a new translation.
+    $textarea = current($this->xpath('//textarea'));
+    $lid = $textarea->getAttribute('name');
+    $edit = [
+      $lid => $this->randomMachineName(100),
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
+
+    // Ensure changed translation string does appear if searching customized
+    // translation.
+    $search = [
+      'string' => $string->getString(),
+      'langcode' => 'de',
+      'translation' => 'translated',
+      'customized' => '1',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $this->assertText($string->getString(), "Translation is marked as customized.");
+  }
+
+}

web/core/modules/locale/tests/src/Functional/LocaleUpdateBase.php

@@ -0,0 +1,309 @@
+<?php
+
+namespace Drupal\Tests\locale\Functional;
+
+use Drupal\Core\Database\Database;
+use Drupal\Core\File\FileSystemInterface;
+use Drupal\Core\StreamWrapper\PublicStream;
+use Drupal\file\Entity\File;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Component\Render\FormattableMarkup;
+
+/**
+ * Base class for testing updates to string translations.
+ */
+abstract class LocaleUpdateBase extends BrowserTestBase {
+
+  /**
+   * Timestamp for an old translation.
+   *
+   * @var int
+   */
+  protected $timestampOld;
+
+  /**
+   * Timestamp for a medium aged translation.
+   *
+   * @var int
+   */
+  protected $timestampMedium;
+
+  /**
+   * Timestamp for a new translation.
+   *
+   * @var int
+   */
+  protected $timestampNew;
+
+  /**
+   * Timestamp for current time.
+   *
+   * @var int
+   */
+  protected $timestampNow;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['locale', 'locale_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Setup timestamps to identify old and new translation sources.
+    $this->timestampOld = REQUEST_TIME - 300;
+    $this->timestampMedium = REQUEST_TIME - 200;
+    $this->timestampNew = REQUEST_TIME - 100;
+    $this->timestampNow = REQUEST_TIME;
+
+    // Enable import of translations. By default this is disabled for automated
+    // tests.
+    $this->config('locale.settings')
+      ->set('translation.import_enabled', TRUE)
+      ->set('translation.use_source', LOCALE_TRANSLATION_USE_SOURCE_LOCAL)
+      ->save();
+  }
+
+  /**
+   * Sets the value of the default translations directory.
+   *
+   * @param string $path
+   *   Path of the translations directory relative to the drupal installation
+   *   directory.
+   */
+  protected function setTranslationsDirectory($path) {
+    \Drupal::service('file_system')->prepareDirectory($path, FileSystemInterface::CREATE_DIRECTORY);
+    $this->config('locale.settings')->set('translation.path', $path)->save();
+  }
+
+  /**
+   * Adds a language.
+   *
+   * @param string $langcode
+   *   The language code of the language to add.
+   */
+  protected function addLanguage($langcode) {
+    $edit = ['predefined_langcode' => $langcode];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
+    $this->container->get('language_manager')->reset();
+    $this->assertNotEmpty(\Drupal::languageManager()->getLanguage($langcode), new FormattableMarkup('Language %langcode added.', ['%langcode' => $langcode]));
+  }
+
+  /**
+   * Creates a translation file and tests its timestamp.
+   *
+   * @param string $path
+   *   Path of the file relative to the public file path.
+   * @param string $filename
+   *   Name of the file to create.
+   * @param int $timestamp
+   *   (optional) Timestamp to set the file to. Defaults to current time.
+   * @param array $translations
+   *   (optional) Array of source/target value translation strings. Only
+   *   singular strings are supported, no plurals. No double quotes are allowed
+   *   in source and translations strings.
+   */
+  protected function makePoFile($path, $filename, $timestamp = NULL, array $translations = []) {
+    $timestamp = $timestamp ? $timestamp : REQUEST_TIME;
+    $path = 'public://' . $path;
+    $text = '';
+    $po_header = <<<EOF
+msgid ""
+msgstr ""
+"Project-Id-Version: Drupal 8\\n"
+"MIME-Version: 1.0\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\\n"
+
+EOF;
+
+    // Convert array of translations to Gettext source and translation strings.
+    if ($translations) {
+      foreach ($translations as $source => $target) {
+        $text .= 'msgid "' . $source . '"' . "\n";
+        $text .= 'msgstr "' . $target . '"' . "\n";
+      }
+    }
+
+    \Drupal::service('file_system')->prepareDirectory($path, FileSystemInterface::CREATE_DIRECTORY);
+    $file = File::create([
+      'uid' => 1,
+      'filename' => $filename,
+      'uri' => $path . '/' . $filename,
+      'filemime' => 'text/x-gettext-translation',
+      'timestamp' => $timestamp,
+      'status' => FILE_STATUS_PERMANENT,
+    ]);
+    file_put_contents($file->getFileUri(), $po_header . $text);
+    touch(\Drupal::service('file_system')->realpath($file->getFileUri()), $timestamp);
+    $file->save();
+  }
+
+  /**
+   * Setup the environment containing local and remote translation files.
+   *
+   * Update tests require a simulated environment for local and remote files.
+   * Normally remote files are located at a remote server (e.g. ftp.drupal.org).
+   * For testing we can not rely on this. A directory in the file system of the
+   * test site is designated for remote files and is addressed using an absolute
+   * URL. Because Drupal does not allow files with a po extension to be accessed
+   * (denied in .htaccess) the translation files get a _po extension. Another
+   * directory is designated for local translation files.
+   *
+   * The environment is set up with the following files. File creation times are
+   * set to create different variations in test conditions.
+   *   contrib_module_one
+   *    - remote file: timestamp new
+   *    - local file:  timestamp old
+   *   contrib_module_two
+   *    - remote file: timestamp old
+   *    - local file:  timestamp new
+   *   contrib_module_three
+   *    - remote file: timestamp old
+   *    - local file:  timestamp old
+   *   custom_module_one
+   *    - local file:  timestamp new
+   * Time stamp of current translation set by setCurrentTranslations() is always
+   * timestamp medium. This makes it easy to predict which translation will be
+   * imported.
+   */
+  protected function setTranslationFiles() {
+    $config = $this->config('locale.settings');
+
+    // A flag is set to let the locale_test module replace the project data with
+    // a set of test projects which match the below project files.
+    \Drupal::state()->set('locale.test_projects_alter', TRUE);
+    \Drupal::state()->set('locale.remove_core_project', FALSE);
+
+    // Setup the environment.
+    $public_path = PublicStream::basePath();
+    $this->setTranslationsDirectory($public_path . '/local');
+    $config->set('translation.default_filename', '%project-%version.%language._po')->save();
+
+    // Setting up sets of translations for the translation files.
+    $translations_one = ['January' => 'Januar_1', 'February' => 'Februar_1', 'March' => 'Marz_1'];
+    $translations_two = ['February' => 'Februar_2', 'March' => 'Marz_2', 'April' => 'April_2'];
+    $translations_three = ['April' => 'April_3', 'May' => 'Mai_3', 'June' => 'Juni_3'];
+
+    // Add a number of files to the local file system to serve as remote
+    // translation server and match the project definitions set in
+    // locale_test_locale_translation_projects_alter().
+    $this->makePoFile('remote/all/contrib_module_one', 'contrib_module_one-8.x-1.1.de._po', $this->timestampNew, $translations_one);
+    $this->makePoFile('remote/all/contrib_module_two', 'contrib_module_two-8.x-2.0-beta4.de._po', $this->timestampOld, $translations_two);
+    $this->makePoFile('remote/all/contrib_module_three', 'contrib_module_three-8.x-1.0.de._po', $this->timestampOld, $translations_three);
+
+    // Add a number of files to the local file system to serve as local
+    // translation files and match the project definitions set in
+    // locale_test_locale_translation_projects_alter().
+    $this->makePoFile('local', 'contrib_module_one-8.x-1.1.de._po', $this->timestampOld, $translations_one);
+    $this->makePoFile('local', 'contrib_module_two-8.x-2.0-beta4.de._po', $this->timestampNew, $translations_two);
+    $this->makePoFile('local', 'contrib_module_three-8.x-1.0.de._po', $this->timestampOld, $translations_three);
+    $this->makePoFile('local', 'custom_module_one.de.po', $this->timestampNew);
+  }
+
+  /**
+   * Setup existing translations in the database and set up the status of
+   * existing translations.
+   */
+  protected function setCurrentTranslations() {
+    // Add non customized translations to the database.
+    $langcode = 'de';
+    $context = '';
+    $non_customized_translations = [
+      'March' => 'Marz',
+      'June' => 'Juni',
+    ];
+    foreach ($non_customized_translations as $source => $translation) {
+      $string = $this->container->get('locale.storage')->createString([
+        'source' => $source,
+        'context' => $context,
+      ])
+        ->save();
+      $this->container->get('locale.storage')->createTranslation([
+        'lid' => $string->getId(),
+        'language' => $langcode,
+        'translation' => $translation,
+        'customized' => LOCALE_NOT_CUSTOMIZED,
+      ])->save();
+    }
+
+    // Add customized translations to the database.
+    $customized_translations = [
+      'January' => 'Januar_customized',
+      'February' => 'Februar_customized',
+      'May' => 'Mai_customized',
+    ];
+    foreach ($customized_translations as $source => $translation) {
+      $string = $this->container->get('locale.storage')->createString([
+        'source' => $source,
+        'context' => $context,
+      ])
+        ->save();
+      $this->container->get('locale.storage')->createTranslation([
+        'lid' => $string->getId(),
+        'language' => $langcode,
+        'translation' => $translation,
+        'customized' => LOCALE_CUSTOMIZED,
+      ])->save();
+    }
+
+    // Add a state of current translations in locale_files.
+    $default = [
+      'langcode' => $langcode,
+      'uri' => '',
+      'timestamp' => $this->timestampMedium,
+      'last_checked' => $this->timestampMedium,
+    ];
+    $data[] = [
+      'project' => 'contrib_module_one',
+      'filename' => 'contrib_module_one-8.x-1.1.de._po',
+      'version' => '8.x-1.1',
+    ];
+    $data[] = [
+      'project' => 'contrib_module_two',
+      'filename' => 'contrib_module_two-8.x-2.0-beta4.de._po',
+      'version' => '8.x-2.0-beta4',
+    ];
+    $data[] = [
+      'project' => 'contrib_module_three',
+      'filename' => 'contrib_module_three-8.x-1.0.de._po',
+      'version' => '8.x-1.0',
+    ];
+    $data[] = [
+      'project' => 'custom_module_one',
+      'filename' => 'custom_module_one.de.po',
+      'version' => '',
+    ];
+    $connection = Database::getConnection();
+    foreach ($data as $file) {
+      $file = array_merge($default, $file);
+      $connection->insert('locale_file')->fields($file)->execute();
+    }
+  }
+
+  /**
+   * Checks the translation of a string.
+   *
+   * @param string $source
+   *   Translation source string.
+   * @param string $translation
+   *   Translation to check. Use empty string to check for a not existing
+   *   translation.
+   * @param string $langcode
+   *   Language code of the language to translate to.
+   * @param string $message
+   *   (optional) A message to display with the assertion.
+   */
+  protected function assertTranslation($source, $translation, $langcode, $message = '') {
+    $db_translation = Database::getConnection()->query('SELECT translation FROM {locales_target} lt INNER JOIN {locales_source} ls ON ls.lid = lt.lid WHERE ls.source = :source AND lt.language = :langcode', [':source' => $source, ':langcode' => $langcode])->fetchField();
+    $db_translation = $db_translation == FALSE ? '' : $db_translation;
+    $this->assertEqual($translation, $db_translation, $message ? $message : new FormattableMarkup('Correct translation of %source (%language)', ['%source' => $source, '%language' => $langcode]));
+  }
+
+}

web/core/modules/locale/tests/src/Functional/LocaleUpdateCronTest.php

@@ -0,0 +1,120 @@
+<?php
+
+namespace Drupal\Tests\locale\Functional;
+
+use Drupal\Core\Database\Database;
+use Drupal\Tests\Traits\Core\CronRunTrait;
+
+/**
+ * Tests for using cron to update project interface translations.
+ *
+ * @group locale
+ */
+class LocaleUpdateCronTest extends LocaleUpdateBase {
+
+  use CronRunTrait;
+
+  protected $batchOutput = [];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $admin_user = $this->drupalCreateUser(['administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'translate interface']);
+    $this->drupalLogin($admin_user);
+    $this->addLanguage('de');
+  }
+
+  /**
+   * Tests interface translation update using cron.
+   */
+  public function testUpdateCron() {
+    // Set a flag to let the locale_test module replace the project data with a
+    // set of test projects.
+    \Drupal::state()->set('locale.test_projects_alter', TRUE);
+
+    // Setup local and remote translations files.
+    $this->setTranslationFiles();
+    $this->config('locale.settings')->set('translation.default_filename', '%project-%version.%language._po')->save();
+
+    // Update translations using batch to ensure a clean test starting point.
+    $this->drupalGet('admin/reports/translations/check');
+    $this->drupalPostForm('admin/reports/translations', [], t('Update translations'));
+
+    // Store translation status for comparison.
+    $initial_history = locale_translation_get_file_history();
+
+    // Prepare for test: Simulate new translations being available.
+    // Change the last updated timestamp of a translation file.
+    $contrib_module_two_uri = 'public://local/contrib_module_two-8.x-2.0-beta4.de._po';
+    touch(\Drupal::service('file_system')->realpath($contrib_module_two_uri), REQUEST_TIME);
+
+    // Prepare for test: Simulate that the file has not been checked for a long
+    // time. Set the last_check timestamp to zero.
+    $query = Database::getConnection()->update('locale_file');
+    $query->fields(['last_checked' => 0]);
+    $query->condition('project', 'contrib_module_two');
+    $query->condition('langcode', 'de');
+    $query->execute();
+
+    // Test: Disable cron update and verify that no tasks are added to the
+    // queue.
+    $edit = [
+      'update_interval_days' => 0,
+    ];
+    $this->drupalPostForm('admin/config/regional/translate/settings', $edit, t('Save configuration'));
+
+    // Execute locale cron tasks to add tasks to the queue.
+    locale_cron();
+
+    // Check whether no tasks are added to the queue.
+    $queue = \Drupal::queue('locale_translation', TRUE);
+    $this->assertEqual($queue->numberOfItems(), 0, 'Queue is empty');
+
+    // Test: Enable cron update and check if update tasks are added to the
+    // queue.
+    // Set cron update to Weekly.
+    $edit = [
+      'update_interval_days' => 7,
+    ];
+    $this->drupalPostForm('admin/config/regional/translate/settings', $edit, t('Save configuration'));
+
+    // Execute locale cron tasks to add tasks to the queue.
+    locale_cron();
+
+    // Check whether tasks are added to the queue.
+    $queue = \Drupal::queue('locale_translation', TRUE);
+    $this->assertEqual($queue->numberOfItems(), 2, 'Queue holds tasks for one project.');
+    $item = $queue->claimItem();
+    $queue->releaseItem($item);
+    $this->assertEqual($item->data[1][0], 'contrib_module_two', 'Queue holds tasks for contrib module one.');
+
+    // Test: Run cron for a second time and check if tasks are not added to
+    // the queue twice.
+    locale_cron();
+
+    // Check whether no more tasks are added to the queue.
+    $queue = \Drupal::queue('locale_translation', TRUE);
+    $this->assertEqual($queue->numberOfItems(), 2, 'Queue holds tasks for one project.');
+
+    // Ensure last checked is updated to a greater time than the initial value.
+    sleep(1);
+    // Test: Execute cron and check if tasks are executed correctly.
+    // Run cron to process the tasks in the queue.
+    $this->cronRun();
+
+    drupal_static_reset('locale_translation_get_file_history');
+    $history = locale_translation_get_file_history();
+    $initial = $initial_history['contrib_module_two']['de'];
+    $current = $history['contrib_module_two']['de'];
+    $this->assertTrue($current->timestamp > $initial->timestamp, 'Timestamp is updated');
+    $this->assertTrue($current->last_checked > $initial->last_checked, 'Last checked is updated');
+  }
+
+}

web/core/modules/locale/tests/src/Functional/LocaleUpdateDevelopmentReleaseTest.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Drupal\Tests\locale\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Test for proper version fallback in case of a development release.
+ *
+ * @group language
+ */
+class LocaleUpdateDevelopmentReleaseTest extends BrowserTestBase {
+
+  public static $modules = ['locale', 'locale_test_development_release'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
+  protected function setUp() {
+    parent::setUp();
+    module_load_include('compare.inc', 'locale');
+    $admin_user = $this->drupalCreateUser(['administer modules', 'administer languages', 'access administration pages', 'translate interface']);
+    $this->drupalLogin($admin_user);
+    $this->drupalPostForm('admin/config/regional/language/add', ['predefined_langcode' => 'hu'], t('Add language'));
+  }
+
+  public function testLocaleUpdateDevelopmentRelease() {
+    $projects = locale_translation_build_projects();
+    $this->verbose($projects['drupal']->info['version']);
+    $this->assertEqual($projects['drupal']->info['version'], '8.0.x', 'The branch of the core dev release.');
+    $this->verbose($projects['contrib']->info['version']);
+    $this->assertEqual($projects['contrib']->info['version'], '12.x-10.x', 'The branch of the contrib module dev release.');
+  }
+
+}

web/core/modules/locale/tests/src/Functional/LocaleUpdateInterfaceTest.php

@@ -0,0 +1,128 @@
+<?php
+
+namespace Drupal\Tests\locale\Functional;
+
+use Drupal\Core\Url;
+use Drupal\Component\Render\FormattableMarkup;
+
+/**
+ * Tests for the user interface of project interface translations.
+ *
+ * @group locale
+ */
+class LocaleUpdateInterfaceTest extends LocaleUpdateBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['locale_test_translate'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $admin_user = $this->drupalCreateUser(['administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'translate interface']);
+    $this->drupalLogin($admin_user);
+  }
+
+  /**
+   * Tests the user interfaces of the interface translation update system.
+   *
+   * Testing the Available updates summary on the side wide status page and the
+   * Available translation updates page.
+   */
+  public function testInterface() {
+    // No language added.
+    // Check status page and Available translation updates page.
+    $this->drupalGet('admin/reports/status');
+    $this->assertNoText(t('Translation update status'), 'No status message');
+
+    $this->drupalGet('admin/reports/translations');
+    $this->assertRaw(t('No translatable languages available. <a href=":add_language">Add a language</a> first.', [':add_language' => Url::fromRoute('entity.configurable_language.collection')->toString()]), 'Language message');
+
+    // Add German language.
+    $this->addLanguage('de');
+
+    // Override Drupal core translation status as 'up-to-date'.
+    $status = locale_translation_get_status();
+    $status['drupal']['de']->type = 'current';
+    \Drupal::keyValue('locale.translation_status')->set('drupal', $status['drupal']);
+
+    // One language added, all translations up to date.
+    $this->drupalGet('admin/reports/status');
+    $this->assertText(t('Translation update status'), 'Status message');
+    $this->assertText(t('Up to date'), 'Translations up to date');
+    $this->drupalGet('admin/reports/translations');
+    $this->assertText(t('All translations up to date.'), 'Translations up to date');
+
+    // Set locale_test_translate module to have a local translation available.
+    $status = locale_translation_get_status();
+    $status['locale_test_translate']['de']->type = 'local';
+    \Drupal::keyValue('locale.translation_status')->set('locale_test_translate', $status['locale_test_translate']);
+
+    // Check if updates are available for German.
+    $this->drupalGet('admin/reports/status');
+    $this->assertText(t('Translation update status'), 'Status message');
+    $this->assertRaw(t('Updates available for: @languages. See the <a href=":updates">Available translation updates</a> page for more information.', ['@languages' => t('German'), ':updates' => Url::fromRoute('locale.translate_status')->toString()]), 'Updates available message');
+    $this->drupalGet('admin/reports/translations');
+    $this->assertText(t('Updates for: @modules', ['@modules' => 'Locale test translate']), 'Translations available');
+
+    // Set locale_test_translate module to have a dev release and no
+    // translation found.
+    $status = locale_translation_get_status();
+    $status['locale_test_translate']['de']->version = '1.3-dev';
+    $status['locale_test_translate']['de']->type = '';
+    \Drupal::keyValue('locale.translation_status')->set('locale_test_translate', $status['locale_test_translate']);
+
+    // Check if no updates were found.
+    $this->drupalGet('admin/reports/status');
+    $this->assertText(t('Translation update status'), 'Status message');
+    $this->assertRaw(t('Missing translations for: @languages. See the <a href=":updates">Available translation updates</a> page for more information.', ['@languages' => t('German'), ':updates' => Url::fromRoute('locale.translate_status')->toString()]), 'Missing translations message');
+    $this->drupalGet('admin/reports/translations');
+    $this->assertText(t('Missing translations for one project'), 'No translations found');
+    $release_details = new FormattableMarkup('@module (@version). @info', [
+      '@module' => 'Locale test translate',
+      '@version' => '1.3-dev',
+      '@info' => t('File not found at %local_path', ['%local_path' => 'core/modules/locale/tests/test.de.po']),
+    ]);
+    $this->assertRaw($release_details->__toString(), 'Release details');
+
+    // Override Drupal core translation status as 'no translations found'.
+    $status = locale_translation_get_status();
+    $status['drupal']['de']->type = '';
+    $status['drupal']['de']->timestamp = 0;
+    $status['drupal']['de']->version = '8.1.1';
+    \Drupal::keyValue('locale.translation_status')->set('drupal', $status['drupal']);
+
+    // Check if Drupal core is not translated.
+    $this->drupalGet('admin/reports/translations');
+    $this->assertText(t('Missing translations for 2 projects'), 'No translations found');
+    $this->assertText(t('@module (@version).', ['@module' => t('Drupal core'), '@version' => '8.1.1']), 'Release details');
+
+    // Override Drupal core translation status as 'translations available'.
+    $status = locale_translation_get_status();
+    $status['drupal']['de']->type = 'local';
+    $status['drupal']['de']->files['local']->timestamp = REQUEST_TIME;
+    $status['drupal']['de']->files['local']->info['version'] = '8.1.1';
+    \Drupal::keyValue('locale.translation_status')->set('drupal', $status['drupal']);
+
+    // Check if translations are available for Drupal core.
+    $this->drupalGet('admin/reports/translations');
+    $this->assertText(t('Updates for: @project', ['@project' => t('Drupal core')]), 'Translations found');
+    $this->assertText(new FormattableMarkup('@module (@date)', [
+      '@module' => t('Drupal core'),
+      '@date' => $this->container->get('date.formatter')->format(REQUEST_TIME, 'html_date'),
+    ]), 'Core translation update');
+    $update_button = $this->xpath('//input[@type="submit"][@value="' . t('Update translations') . '"]');
+    $this->assertNotEmpty($update_button, 'Update translations button');
+  }
+
+}

web/core/modules/locale/tests/src/Functional/LocaleUpdateTest.php

@@ -0,0 +1,432 @@
+<?php
+
+namespace Drupal\Tests\locale\Functional;
+
+use Drupal\Core\Database\Database;
+use Drupal\Core\Language\LanguageInterface;
+
+/**
+ * Tests for updating the interface translations of projects.
+ *
+ * @group locale
+ */
+class LocaleUpdateTest extends LocaleUpdateBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    module_load_include('compare.inc', 'locale');
+    module_load_include('fetch.inc', 'locale');
+    $admin_user = $this->drupalCreateUser(['administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'translate interface']);
+    $this->drupalLogin($admin_user);
+    // We use German as test language. This language must match the translation
+    // file that come with the locale_test module (test.de.po) and can therefore
+    // not be chosen randomly.
+    $this->addLanguage('de');
+  }
+
+  /**
+   * Checks if local or remote translation sources are detected.
+   *
+   * The translation status process by default checks the status of the
+   * installed projects. For testing purpose a predefined set of modules with
+   * fixed file names and release versions is used. This custom project
+   * definition is applied using a hook_locale_translation_projects_alter
+   * implementation in the locale_test module.
+   *
+   * This test generates a set of local and remote translation files in their
+   * respective local and remote translation directory. The test checks whether
+   * the most recent files are selected in the different check scenarios: check
+   * for local files only, check for both local and remote files.
+   */
+  public function testUpdateCheckStatus() {
+    // Case when contributed modules are absent.
+    $this->drupalGet('admin/reports/translations');
+    $this->assertText(t('Missing translations for one project'));
+
+    $config = $this->config('locale.settings');
+    // Set a flag to let the locale_test module replace the project data with a
+    // set of test projects.
+    \Drupal::state()->set('locale.test_projects_alter', TRUE);
+
+    // Create local and remote translations files.
+    $this->setTranslationFiles();
+    $config->set('translation.default_filename', '%project-%version.%language._po')->save();
+
+    // Set the test conditions.
+    $edit = [
+      'use_source' => LOCALE_TRANSLATION_USE_SOURCE_LOCAL,
+    ];
+    $this->drupalPostForm('admin/config/regional/translate/settings', $edit, t('Save configuration'));
+
+    // Get status of translation sources at local file system.
+    $this->drupalGet('admin/reports/translations/check');
+    $result = locale_translation_get_status();
+    $this->assertEqual($result['contrib_module_one']['de']->type, LOCALE_TRANSLATION_LOCAL, 'Translation of contrib_module_one found');
+    $this->assertEqual($result['contrib_module_one']['de']->timestamp, $this->timestampOld, 'Translation timestamp found');
+    $this->assertEqual($result['contrib_module_two']['de']->type, LOCALE_TRANSLATION_LOCAL, 'Translation of contrib_module_two found');
+    $this->assertEqual($result['contrib_module_two']['de']->timestamp, $this->timestampNew, 'Translation timestamp found');
+    $this->assertEqual($result['locale_test']['de']->type, LOCALE_TRANSLATION_LOCAL, 'Translation of locale_test found');
+    $this->assertEqual($result['custom_module_one']['de']->type, LOCALE_TRANSLATION_LOCAL, 'Translation of custom_module_one found');
+
+    // Set the test conditions.
+    $edit = [
+      'use_source' => LOCALE_TRANSLATION_USE_SOURCE_REMOTE_AND_LOCAL,
+    ];
+    $this->drupalPostForm('admin/config/regional/translate/settings', $edit, t('Save configuration'));
+
+    // Get status of translation sources at both local and remote locations.
+    $this->drupalGet('admin/reports/translations/check');
+    $result = locale_translation_get_status();
+    $this->assertEqual($result['contrib_module_one']['de']->type, LOCALE_TRANSLATION_REMOTE, 'Translation of contrib_module_one found');
+    $this->assertEqual($result['contrib_module_one']['de']->timestamp, $this->timestampNew, 'Translation timestamp found');
+    $this->assertEqual($result['contrib_module_two']['de']->type, LOCALE_TRANSLATION_LOCAL, 'Translation of contrib_module_two found');
+    $this->assertEqual($result['contrib_module_two']['de']->timestamp, $this->timestampNew, 'Translation timestamp found');
+    $this->assertEqual($result['contrib_module_three']['de']->type, LOCALE_TRANSLATION_LOCAL, 'Translation of contrib_module_three found');
+    $this->assertEqual($result['contrib_module_three']['de']->timestamp, $this->timestampOld, 'Translation timestamp found');
+    $this->assertEqual($result['locale_test']['de']->type, LOCALE_TRANSLATION_LOCAL, 'Translation of locale_test found');
+    $this->assertEqual($result['custom_module_one']['de']->type, LOCALE_TRANSLATION_LOCAL, 'Translation of custom_module_one found');
+  }
+
+  /**
+   * Tests translation import from remote sources.
+   *
+   * Test conditions:
+   *  - Source: remote and local files
+   *  - Import overwrite: all existing translations
+   */
+  public function testUpdateImportSourceRemote() {
+    $config = $this->config('locale.settings');
+
+    // Build the test environment.
+    $this->setTranslationFiles();
+    $this->setCurrentTranslations();
+    $config->set('translation.default_filename', '%project-%version.%language._po');
+
+    // Set the update conditions for this test.
+    $edit = [
+      'use_source' => LOCALE_TRANSLATION_USE_SOURCE_REMOTE_AND_LOCAL,
+      'overwrite' => LOCALE_TRANSLATION_OVERWRITE_ALL,
+    ];
+    $this->drupalPostForm('admin/config/regional/translate/settings', $edit, t('Save configuration'));
+
+    // Get the translation status.
+    $this->drupalGet('admin/reports/translations/check');
+
+    // Check the status on the Available translation status page.
+    $this->assertRaw('<label for="edit-langcodes-de" class="visually-hidden">Update German</label>', 'German language found');
+    $this->assertText('Updates for: Contributed module one, Contributed module two, Custom module one, Locale test', 'Updates found');
+    /** @var \Drupal\Core\Datetime\DateFormatterInterface $date_formatter */
+    $date_formatter = $this->container->get('date.formatter');
+    $this->assertText('Contributed module one (' . $date_formatter->format($this->timestampNew, 'html_date') . ')', 'Updates for Contrib module one');
+    $this->assertText('Contributed module two (' . $date_formatter->format($this->timestampNew, 'html_date') . ')', 'Updates for Contrib module two');
+
+    // Execute the translation update.
+    $this->drupalPostForm('admin/reports/translations', [], t('Update translations'));
+
+    // Check if the translation has been updated, using the status cache.
+    $status = locale_translation_get_status();
+    $this->assertEqual($status['contrib_module_one']['de']->type, LOCALE_TRANSLATION_CURRENT, 'Translation of contrib_module_one found');
+    $this->assertEqual($status['contrib_module_two']['de']->type, LOCALE_TRANSLATION_CURRENT, 'Translation of contrib_module_two found');
+    $this->assertEqual($status['contrib_module_three']['de']->type, LOCALE_TRANSLATION_CURRENT, 'Translation of contrib_module_three found');
+
+    // Check the new translation status.
+    // The static cache needs to be flushed first to get the most recent data
+    // from the database. The function was called earlier during this test.
+    drupal_static_reset('locale_translation_get_file_history');
+    $history = locale_translation_get_file_history();
+    $this->assertTrue($history['contrib_module_one']['de']->timestamp >= $this->timestampNow, 'Translation of contrib_module_one is imported');
+    $this->assertTrue($history['contrib_module_one']['de']->last_checked >= $this->timestampNow, 'Translation of contrib_module_one is updated');
+    $this->assertEqual($history['contrib_module_two']['de']->timestamp, $this->timestampNew, 'Translation of contrib_module_two is imported');
+    $this->assertTrue($history['contrib_module_two']['de']->last_checked >= $this->timestampNow, 'Translation of contrib_module_two is updated');
+    $this->assertEqual($history['contrib_module_three']['de']->timestamp, $this->timestampMedium, 'Translation of contrib_module_three is not imported');
+    $this->assertEqual($history['contrib_module_three']['de']->last_checked, $this->timestampMedium, 'Translation of contrib_module_three is not updated');
+
+    // Check whether existing translations have (not) been overwritten.
+    $this->assertEqual(t('January', [], ['langcode' => 'de']), 'Januar_1', 'Translation of January');
+    $this->assertEqual(t('February', [], ['langcode' => 'de']), 'Februar_2', 'Translation of February');
+    $this->assertEqual(t('March', [], ['langcode' => 'de']), 'Marz_2', 'Translation of March');
+    $this->assertEqual(t('April', [], ['langcode' => 'de']), 'April_2', 'Translation of April');
+    $this->assertEqual(t('May', [], ['langcode' => 'de']), 'Mai_customized', 'Translation of May');
+    $this->assertEqual(t('June', [], ['langcode' => 'de']), 'Juni', 'Translation of June');
+    $this->assertEqual(t('Monday', [], ['langcode' => 'de']), 'Montag', 'Translation of Monday');
+  }
+
+  /**
+   * Tests translation import from local sources.
+   *
+   * Test conditions:
+   *  - Source: local files only
+   *  - Import overwrite: all existing translations
+   */
+  public function testUpdateImportSourceLocal() {
+    $config = $this->config('locale.settings');
+
+    // Build the test environment.
+    $this->setTranslationFiles();
+    $this->setCurrentTranslations();
+    $config->set('translation.default_filename', '%project-%version.%language._po');
+
+    // Set the update conditions for this test.
+    $edit = [
+      'use_source' => LOCALE_TRANSLATION_USE_SOURCE_LOCAL,
+      'overwrite' => LOCALE_TRANSLATION_OVERWRITE_ALL,
+    ];
+    $this->drupalPostForm('admin/config/regional/translate/settings', $edit, t('Save configuration'));
+
+    // Execute the translation update.
+    $this->drupalGet('admin/reports/translations/check');
+    $this->drupalPostForm('admin/reports/translations', [], t('Update translations'));
+
+    // Check if the translation has been updated, using the status cache.
+    $status = locale_translation_get_status();
+    $this->assertEqual($status['contrib_module_one']['de']->type, LOCALE_TRANSLATION_CURRENT, 'Translation of contrib_module_one found');
+    $this->assertEqual($status['contrib_module_two']['de']->type, LOCALE_TRANSLATION_CURRENT, 'Translation of contrib_module_two found');
+    $this->assertEqual($status['contrib_module_three']['de']->type, LOCALE_TRANSLATION_CURRENT, 'Translation of contrib_module_three found');
+
+    // Check the new translation status.
+    // The static cache needs to be flushed first to get the most recent data
+    // from the database. The function was called earlier during this test.
+    drupal_static_reset('locale_translation_get_file_history');
+    $history = locale_translation_get_file_history();
+    $this->assertTrue($history['contrib_module_one']['de']->timestamp >= $this->timestampMedium, 'Translation of contrib_module_one is imported');
+    $this->assertEqual($history['contrib_module_one']['de']->last_checked, $this->timestampMedium, 'Translation of contrib_module_one is updated');
+    $this->assertEqual($history['contrib_module_two']['de']->timestamp, $this->timestampNew, 'Translation of contrib_module_two is imported');
+    $this->assertTrue($history['contrib_module_two']['de']->last_checked >= $this->timestampNow, 'Translation of contrib_module_two is updated');
+    $this->assertEqual($history['contrib_module_three']['de']->timestamp, $this->timestampMedium, 'Translation of contrib_module_three is not imported');
+    $this->assertEqual($history['contrib_module_three']['de']->last_checked, $this->timestampMedium, 'Translation of contrib_module_three is not updated');
+
+    // Check whether existing translations have (not) been overwritten.
+    $this->assertEqual(t('January', [], ['langcode' => 'de']), 'Januar_customized', 'Translation of January');
+    $this->assertEqual(t('February', [], ['langcode' => 'de']), 'Februar_2', 'Translation of February');
+    $this->assertEqual(t('March', [], ['langcode' => 'de']), 'Marz_2', 'Translation of March');
+    $this->assertEqual(t('April', [], ['langcode' => 'de']), 'April_2', 'Translation of April');
+    $this->assertEqual(t('May', [], ['langcode' => 'de']), 'Mai_customized', 'Translation of May');
+    $this->assertEqual(t('June', [], ['langcode' => 'de']), 'Juni', 'Translation of June');
+    $this->assertEqual(t('Monday', [], ['langcode' => 'de']), 'Montag', 'Translation of Monday');
+  }
+
+  /**
+   * Tests translation import and only overwrite non-customized translations.
+   *
+   * Test conditions:
+   *  - Source: remote and local files
+   *  - Import overwrite: only overwrite non-customized translations
+   */
+  public function testUpdateImportModeNonCustomized() {
+    $config = $this->config('locale.settings');
+
+    // Build the test environment.
+    $this->setTranslationFiles();
+    $this->setCurrentTranslations();
+    $config->set('translation.default_filename', '%project-%version.%language._po');
+
+    // Set the test conditions.
+    $edit = [
+      'use_source' => LOCALE_TRANSLATION_USE_SOURCE_REMOTE_AND_LOCAL,
+      'overwrite' => LOCALE_TRANSLATION_OVERWRITE_NON_CUSTOMIZED,
+    ];
+    $this->drupalPostForm('admin/config/regional/translate/settings', $edit, t('Save configuration'));
+
+    // Execute translation update.
+    $this->drupalGet('admin/reports/translations/check');
+    $this->drupalPostForm('admin/reports/translations', [], t('Update translations'));
+
+    // Check whether existing translations have (not) been overwritten.
+    $this->assertEqual(t('January', [], ['langcode' => 'de']), 'Januar_customized', 'Translation of January');
+    $this->assertEqual(t('February', [], ['langcode' => 'de']), 'Februar_customized', 'Translation of February');
+    $this->assertEqual(t('March', [], ['langcode' => 'de']), 'Marz_2', 'Translation of March');
+    $this->assertEqual(t('April', [], ['langcode' => 'de']), 'April_2', 'Translation of April');
+    $this->assertEqual(t('May', [], ['langcode' => 'de']), 'Mai_customized', 'Translation of May');
+    $this->assertEqual(t('June', [], ['langcode' => 'de']), 'Juni', 'Translation of June');
+    $this->assertEqual(t('Monday', [], ['langcode' => 'de']), 'Montag', 'Translation of Monday');
+  }
+
+  /**
+   * Tests translation import and don't overwrite any translation.
+   *
+   * Test conditions:
+   *  - Source: remote and local files
+   *  - Import overwrite: don't overwrite any existing translation
+   */
+  public function testUpdateImportModeNone() {
+    $config = $this->config('locale.settings');
+
+    // Build the test environment.
+    $this->setTranslationFiles();
+    $this->setCurrentTranslations();
+    $config->set('translation.default_filename', '%project-%version.%language._po');
+
+    // Set the test conditions.
+    $edit = [
+      'use_source' => LOCALE_TRANSLATION_USE_SOURCE_REMOTE_AND_LOCAL,
+      'overwrite' => LOCALE_TRANSLATION_OVERWRITE_NONE,
+    ];
+    $this->drupalPostForm('admin/config/regional/translate/settings', $edit, t('Save configuration'));
+
+    // Execute translation update.
+    $this->drupalGet('admin/reports/translations/check');
+    $this->drupalPostForm('admin/reports/translations', [], t('Update translations'));
+
+    // Check whether existing translations have (not) been overwritten.
+    $this->assertTranslation('January', 'Januar_customized', 'de');
+    $this->assertTranslation('February', 'Februar_customized', 'de');
+    $this->assertTranslation('March', 'Marz', 'de');
+    $this->assertTranslation('April', 'April_2', 'de');
+    $this->assertTranslation('May', 'Mai_customized', 'de');
+    $this->assertTranslation('June', 'Juni', 'de');
+    $this->assertTranslation('Monday', 'Montag', 'de');
+  }
+
+  /**
+   * Tests automatic translation import when a module is enabled.
+   */
+  public function testEnableUninstallModule() {
+    // Make the hidden test modules look like a normal custom module.
+    \Drupal::state()->set('locale.test_system_info_alter', TRUE);
+
+    // Check if there is no translation yet.
+    $this->assertTranslation('Tuesday', '', 'de');
+
+    // Enable a module.
+    $edit = [
+      'modules[locale_test_translate][enable]' => 'locale_test_translate',
+    ];
+    $this->drupalPostForm('admin/modules', $edit, t('Install'));
+
+    // Check if translations have been imported.
+    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.',
+      ['%number' => 7, '%update' => 0, '%delete' => 0]), 'One translation file imported.');
+    $this->assertTranslation('Tuesday', 'Dienstag', 'de');
+
+    $edit = [
+      'uninstall[locale_test_translate]' => 1,
+    ];
+    $this->drupalPostForm('admin/modules/uninstall', $edit, t('Uninstall'));
+    $this->drupalPostForm(NULL, [], t('Uninstall'));
+
+    // Check if the file data is removed from the database.
+    $history = locale_translation_get_file_history();
+    $this->assertFalse(isset($history['locale_test_translate']), 'Project removed from the file history');
+    $projects = locale_translation_get_projects();
+    $this->assertFalse(isset($projects['locale_test_translate']), 'Project removed from the project list');
+  }
+
+  /**
+   * Tests automatic translation import when a language is added.
+   *
+   * When a language is added, the system will check for translations files of
+   * enabled modules and will import them. When a language is removed the system
+   * will remove all translations of that language from the database.
+   */
+  public function testEnableLanguage() {
+    // Make the hidden test modules look like a normal custom module.
+    \Drupal::state()->set('locale.test_system_info_alter', TRUE);
+
+    // Enable a module.
+    $edit = [
+      'modules[locale_test_translate][enable]' => 'locale_test_translate',
+    ];
+    $this->drupalPostForm('admin/modules', $edit, t('Install'));
+
+    // Check if there is no Dutch translation yet.
+    $this->assertTranslation('Extraday', '', 'nl');
+    $this->assertTranslation('Tuesday', 'Dienstag', 'de');
+
+    // Add a language.
+    $edit = [
+      'predefined_langcode' => 'nl',
+    ];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
+
+    // Check if the right number of translations are added.
+    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.',
+      ['%number' => 8, '%update' => 0, '%delete' => 0]), 'One language added.');
+    $this->assertTranslation('Extraday', 'extra dag', 'nl');
+
+    // Check if the language data is added to the database.
+    $connection = Database::getConnection();
+    $result = $connection->query("SELECT project FROM {locale_file} WHERE langcode='nl'")->fetchField();
+    $this->assertNotEmpty($result, 'Files added to file history');
+
+    // Remove a language.
+    $this->drupalPostForm('admin/config/regional/language/delete/nl', [], t('Delete'));
+
+    // Check if the language data is removed from the database.
+    $result = $connection->query("SELECT project FROM {locale_file} WHERE langcode='nl'")->fetchField();
+    $this->assertFalse($result, 'Files removed from file history');
+
+    // Check that the Dutch translation is gone.
+    $this->assertTranslation('Extraday', '', 'nl');
+    $this->assertTranslation('Tuesday', 'Dienstag', 'de');
+  }
+
+  /**
+   * Tests automatic translation import when a custom language is added.
+   */
+  public function testEnableCustomLanguage() {
+    // Make the hidden test modules look like a normal custom module.
+    \Drupal::state()->set('locale.test_system_info_alter', TRUE);
+
+    // Enable a module.
+    $edit = [
+      'modules[locale_test_translate][enable]' => 'locale_test_translate',
+    ];
+    $this->drupalPostForm('admin/modules', $edit, t('Install'));
+
+    // Create a custom language with language code 'xx' and a random
+    // name.
+    $langcode = 'xx';
+    $name = $this->randomMachineName(16);
+    $edit = [
+      'predefined_langcode' => 'custom',
+      'langcode' => $langcode,
+      'label' => $name,
+      'direction' => LanguageInterface::DIRECTION_LTR,
+    ];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
+
+    // Ensure the translation file is automatically imported when the language
+    // was added.
+    $this->assertText(t('One translation file imported.'), 'Language file automatically imported.');
+    $this->assertText(t('One translation string was skipped because of disallowed or malformed HTML'), 'Language file automatically imported.');
+
+    // Ensure the strings were successfully imported.
+    $search = [
+      'string' => 'lundi',
+      'langcode' => $langcode,
+      'translation' => 'translated',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $this->assertNoText(t('No strings available.'), 'String successfully imported.');
+
+    // Ensure the multiline string was imported.
+    $search = [
+      'string' => 'Source string for multiline translation',
+      'langcode' => $langcode,
+      'translation' => 'all',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $this->assertText('Multiline translation string to make sure that import works with it.', 'String successfully imported.');
+
+    // Ensure 'Allowed HTML source string' was imported but the translation for
+    // 'Another allowed HTML source string' was not because it contains invalid
+    // HTML.
+    $search = [
+      'string' => 'HTML source string',
+      'langcode' => $langcode,
+      'translation' => 'all',
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $this->assertText('Allowed HTML source string', 'String successfully imported.');
+    $this->assertNoText('Another allowed HTML source string', 'String with disallowed translation not imported.');
+  }
+
+}

web/core/modules/locale/tests/src/Kernel/LocaleBuildTest.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace Drupal\Tests\locale\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests building the translatable project information.
+ *
+ * @group locale
+ */
+class LocaleBuildTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = [
+    'locale',
+    'locale_test',
+    'system',
+  ];
+
+  /**
+   * Checks if a list of translatable projects gets built.
+   */
+  public function testBuildProjects() {
+    $this->container->get('module_handler')->loadInclude('locale', 'compare.inc');
+    /** @var \Drupal\Core\Extension\ExtensionList $module_list */
+    $module_list = \Drupal::service('extension.list.module');
+
+    // Make the test modules look like a normal custom module. I.e. make the
+    // modules not hidden. locale_test_system_info_alter() modifies the project
+    // info of the locale_test and locale_test_translate modules.
+    \Drupal::state()->set('locale.test_system_info_alter', TRUE);
+
+    // Confirm the project name and core value before the module is altered.
+    $projects = locale_translation_build_projects();
+    $this->assertSame('locale_test', $projects['locale_test']->name);
+    $this->assertSame('all', $projects['locale_test']->core);
+
+    $projects['locale_test']->langcode = 'de';
+    $this->assertSame('/all/locale_test/locale_test-1.2.de.po', locale_translation_build_server_pattern($projects['locale_test'], '/%core/%project/%project-%version.%language.po'));
+
+    // Alter both the name and core value of the project.
+    \Drupal::state()->set('locale.test_system_info_alter_name_core', TRUE);
+    drupal_static_reset('locale_translation_project_list');
+    $module_list->reset();
+
+    // Confirm the name and core value are changed in $module->info.
+    $module = $module_list->get('locale_test');
+    $this->assertSame('locale_test_alter', $module->info['name']);
+    $this->assertSame('8.6.7', $module->info['core']);
+    $this->assertSame('locale_test', $module->getName());
+
+    // Confirm the name and core value are not changed in the project.
+    $projects = locale_translation_build_projects();
+    $this->assertSame('locale_test', $projects['locale_test']->name);
+    $this->assertSame('all', $projects['locale_test']->core);
+
+    $projects['locale_test']->langcode = 'de';
+    $this->assertSame('/all/locale_test/locale_test-1.2.de.po', locale_translation_build_server_pattern($projects['locale_test'], '/%core/%project/%project-%version.%language.po'));
+  }
+
+}

web/core/modules/locale/tests/src/Kernel/LocaleConfigManagerTest.php

@@ -0,0 +1,129 @@
+<?php
+
+namespace Drupal\Tests\locale\Kernel;
+
+use Drupal\block\Entity\Block;
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests that the locale config manager operates correctly.
+ *
+ * @group locale
+ */
+class LocaleConfigManagerTest extends KernelTestBase {
+
+  /**
+   * A list of modules to install for this test.
+   *
+   * @var array
+   */
+  public static $modules = [
+    'system',
+    'language',
+    'locale',
+    'locale_test',
+    'block',
+  ];
+
+  /**
+   * This test creates simple config on the fly breaking schema checking.
+   *
+   * @var bool
+   */
+  protected $strictConfigSchema = FALSE;
+
+  /**
+   * Tests hasTranslation().
+   */
+  public function testHasTranslation() {
+    $this->installSchema('locale', ['locales_location', 'locales_source', 'locales_target']);
+    $this->installConfig(['locale_test']);
+    $locale_config_manager = \Drupal::service('locale.config_manager');
+
+    $language = ConfigurableLanguage::createFromLangcode('de');
+    $language->save();
+    $result = $locale_config_manager->hasTranslation('locale_test.no_translation', $language->getId());
+    $this->assertFalse($result, 'There is no translation for locale_test.no_translation configuration.');
+
+    $result = $locale_config_manager->hasTranslation('locale_test.translation', $language->getId());
+    $this->assertTrue($result, 'There is a translation for locale_test.translation configuration.');
+  }
+
+  /**
+   * Tests getStringTranslation().
+   */
+  public function testGetStringTranslation() {
+    $this->installSchema('locale', ['locales_location', 'locales_source', 'locales_target']);
+    $this->installConfig(['locale_test']);
+
+    $locale_config_manager = \Drupal::service('locale.config_manager');
+
+    $language = ConfigurableLanguage::createFromLangcode('de');
+    $language->save();
+
+    $translation_before = $locale_config_manager->getStringTranslation('locale_test.no_translation', $language->getId(), 'Test', '');
+    $this->assertTrue($translation_before->isNew());
+    $translation_before->setString('translation')->save();
+
+    $translation_after = $locale_config_manager->getStringTranslation('locale_test.no_translation', $language->getId(), 'Test', '');
+    $this->assertFalse($translation_after->isNew());
+    $translation_after->setString('updated_translation')->save();
+  }
+
+  /**
+   * Tests getDefaultConfigLangcode().
+   */
+  public function testGetDefaultConfigLangcode() {
+    // Install the Language module's configuration so we can use the
+    // module_installer service.
+    $this->installConfig(['language']);
+    $this->assertNull(\Drupal::service('locale.config_manager')->getDefaultConfigLangcode('locale_test_translate.settings'), 'Before installing a module the locale config manager can not access the shipped configuration.');
+    \Drupal::service('module_installer')->install(['locale_test_translate']);
+    $this->assertEqual('en', \Drupal::service('locale.config_manager')->getDefaultConfigLangcode('locale_test_translate.settings'), 'After installing a module the locale config manager can get the shipped configuration langcode.');
+
+    $simple_config = \Drupal::configFactory()->getEditable('locale_test_translate.simple_config_extra');
+    $simple_config->set('foo', 'bar')->save();
+    $this->assertNull(\Drupal::service('locale.config_manager')->getDefaultConfigLangcode($simple_config->getName()), 'Simple config created through the API is not treated as shipped configuration.');
+
+    $block = Block::create([
+      'id' => 'test_default_config',
+      'theme' => 'classy',
+      'status' => TRUE,
+      'region' => 'content',
+      'plugin' => 'local_tasks_block',
+      'settings' => [
+        'id' => 'local_tasks_block',
+        'label' => $this->randomMachineName(),
+        'provider' => 'core',
+        'label_display' => FALSE,
+        'primary' => TRUE,
+        'secondary' => TRUE,
+      ],
+    ]);
+    $block->save();
+
+    // Install the theme after creating the block as installing the theme will
+    // install the block provided by the locale_test module.
+    \Drupal::service('theme_installer')->install(['classy']);
+
+    // The test_default_config block provided by the locale_test module will not
+    // be installed because a block with the same ID already exists.
+    $this->installConfig(['locale_test']);
+    $this->assertNull(\Drupal::service('locale.config_manager')->getDefaultConfigLangcode('block.block.test_default_config'), 'The block.block.test_default_config is not shipped configuration.');
+    // Delete the block so we can install the one provided by the locale_test
+    // module.
+    $block->delete();
+    $this->installConfig(['locale_test']);
+    $this->assertEqual('en', \Drupal::service('locale.config_manager')->getDefaultConfigLangcode('block.block.test_default_config'), 'The block.block.test_default_config is shipped configuration.');
+
+    // Test the special case for configurable_language config entities.
+    $fr_language = ConfigurableLanguage::createFromLangcode('fr');
+    $fr_language->save();
+    $this->assertEqual('en', \Drupal::service('locale.config_manager')->getDefaultConfigLangcode('language.entity.fr'), 'The language.entity.fr is treated as shipped configuration because it is a configurable_language config entity and in the standard language list.');
+    $custom_language = ConfigurableLanguage::createFromLangcode('custom');
+    $custom_language->save();
+    $this->assertNull(\Drupal::service('locale.config_manager')->getDefaultConfigLangcode('language.entity.custom'), 'The language.entity.custom is not shipped configuration because it is not in the standard language list.');
+  }
+
+}

web/core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberForeignTest.php

@@ -0,0 +1,168 @@
+<?php
+
+namespace Drupal\Tests\locale\Kernel;
+
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Core\Language\Language;
+use Drupal\language\Entity\ConfigurableLanguage;
+
+/**
+ * Tests default configuration handling with a foreign default language.
+ *
+ * @group locale
+ */
+class LocaleConfigSubscriberForeignTest extends LocaleConfigSubscriberTest {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function register(ContainerBuilder $container) {
+    parent::register($container);
+
+    $language = Language::$defaultValues;
+    $language['id'] = 'hu';
+    $language['name'] = 'Hungarian';
+    $container->setParameter('language.default_values', $language);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpLanguages() {
+    parent::setUpLanguages();
+    ConfigurableLanguage::createFromLangcode('hu')->save();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpLocale() {
+    parent::setUpLocale();
+    $this->setUpTranslation('locale_test.translation', 'test', 'English test', 'Hungarian test', 'hu', TRUE);
+  }
+
+  /**
+   * Tests that the language of default configuration was updated.
+   */
+  public function testDefaultConfigLanguage() {
+    $this->assertEqual('hu', $this->configFactory->getEditable('locale_test.no_translation')->get('langcode'));
+    $this->assertEqual('hu', $this->configFactory->getEditable('locale_test.translation')->get('langcode'));
+    $this->assertEqual($this->configFactory->getEditable('locale_test.translation')->get('test'), 'Hungarian test');
+  }
+
+  /**
+   * Tests creating translations of shipped configuration.
+   */
+  public function testCreateActiveTranslation() {
+    $config_name = 'locale_test.no_translation';
+    $this->saveLanguageActive($config_name, 'test', 'Test (Hungarian)', 'hu');
+    $this->assertTranslation($config_name, 'Test (Hungarian)', 'hu');
+  }
+
+  /**
+   * Tests importing community translations of shipped configuration.
+   */
+  public function testLocaleCreateActiveTranslation() {
+    $config_name = 'locale_test.no_translation';
+    $this->saveLocaleTranslationData($config_name, 'test', 'Test', 'Test (Hungarian)', 'hu', TRUE);
+    $this->assertTranslation($config_name, 'Test (Hungarian)', 'hu', FALSE);
+  }
+
+  /**
+   * Tests updating translations of shipped configuration.
+   */
+  public function testUpdateActiveTranslation() {
+    $config_name = 'locale_test.translation';
+    $this->saveLanguageActive($config_name, 'test', 'Updated Hungarian test', 'hu');
+    $this->assertTranslation($config_name, 'Updated Hungarian test', 'hu');
+  }
+
+  /**
+   * Tests updating community translations of shipped configuration.
+   */
+  public function testLocaleUpdateActiveTranslation() {
+    $config_name = 'locale_test.translation';
+    $this->saveLocaleTranslationData($config_name, 'test', 'English test', 'Updated Hungarian test', 'hu', TRUE);
+    $this->assertTranslation($config_name, 'Updated Hungarian test', 'hu', FALSE);
+  }
+
+  /**
+   * Tests deleting a translation override.
+   */
+  public function testDeleteTranslation() {
+    $config_name = 'locale_test.translation';
+    $this->deleteLanguageOverride($config_name, 'test', 'English test', 'de');
+    // The German translation in this case will be forced to the Hungarian
+    // source so its not overwritten with locale data later.
+    $this->assertTranslation($config_name, 'Hungarian test', 'de');
+  }
+
+  /**
+   * Tests deleting translations of shipped configuration.
+   */
+  public function testDeleteActiveTranslation() {
+    $config_name = 'locale_test.translation';
+    $this->configFactory->getEditable($config_name)->delete();
+    // Deleting active configuration should not change the locale translation.
+    $this->assertTranslation($config_name, 'Hungarian test', 'hu', FALSE);
+  }
+
+  /**
+   * Tests deleting community translations of shipped configuration.
+   */
+  public function testLocaleDeleteActiveTranslation() {
+    $config_name = 'locale_test.translation';
+    $this->deleteLocaleTranslationData($config_name, 'test', 'English test', 'hu');
+    // Deleting the locale translation should not change active config.
+    $this->assertEqual($this->configFactory->getEditable($config_name)->get('test'), 'Hungarian test');
+  }
+
+  /**
+   * Tests that adding English creates a translation override.
+   */
+  public function testEnglish() {
+    $config_name = 'locale_test.translation';
+    ConfigurableLanguage::createFromLangcode('en')->save();
+    // Adding a language on the UI would normally call updateConfigTranslations.
+    $this->localeConfigManager->updateConfigTranslations([$config_name], ['en']);
+    $this->assertConfigOverride($config_name, 'test', 'English test', 'en');
+
+    $this->configFactory->getEditable('locale.settings')->set('translate_english', TRUE)->save();
+    $this->saveLocaleTranslationData($config_name, 'test', 'English test', 'Updated English test', 'en');
+    $this->assertTranslation($config_name, 'Updated English test', 'en', FALSE);
+
+    $this->saveLanguageOverride($config_name, 'test', 'Updated English', 'en');
+    $this->assertTranslation($config_name, 'Updated English', 'en');
+
+    $this->deleteLocaleTranslationData($config_name, 'test', 'English test', 'en');
+    $this->assertNoConfigOverride($config_name, 'en');
+  }
+
+  /**
+   * Saves a language override.
+   *
+   * This will invoke LocaleConfigSubscriber through the event dispatcher. To
+   * make sure the configuration was persisted correctly, the configuration
+   * value is checked. Because LocaleConfigSubscriber temporarily disables the
+   * override state of the configuration factory we check that the correct value
+   * is restored afterwards.
+   *
+   * @param string $config_name
+   *   The configuration name.
+   * @param string $key
+   *   The configuration key.
+   * @param string $value
+   *   The configuration value to save.
+   * @param string $langcode
+   *   The language code.
+   */
+  protected function saveLanguageActive($config_name, $key, $value, $langcode) {
+    $this
+      ->configFactory
+      ->getEditable($config_name)
+      ->set($key, $value)
+      ->save();
+    $this->assertActiveConfig($config_name, $key, $value, $langcode);
+  }
+
+}

web/core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberTest.php

@@ -0,0 +1,486 @@
+<?php
+
+namespace Drupal\Tests\locale\Kernel;
+
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\locale\Locale;
+use Drupal\locale\StringInterface;
+use Drupal\locale\TranslationString;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests that shipped configuration translations are updated correctly.
+ *
+ * @group locale
+ */
+class LocaleConfigSubscriberTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['language', 'locale', 'system', 'locale_test'];
+
+  /**
+   * The configurable language manager used in this test.
+   *
+   * @var \Drupal\language\ConfigurableLanguageManagerInterface
+   */
+  protected $languageManager;
+
+  /**
+   * The configuration factory used in this test.
+   *
+   * @var \Drupal\Core\Config\ConfigFactoryInterface
+   */
+  protected $configFactory;
+
+  /**
+   * The string storage used in this test.
+   *
+   * @var \Drupal\locale\StringStorageInterface
+   */
+  protected $stringStorage;
+
+  /**
+   * The locale configuration manager used in this test.
+   *
+   * @var \Drupal\locale\LocaleConfigManager
+   */
+  protected $localeConfigManager;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->setUpDefaultLanguage();
+
+    $this->installSchema('locale', ['locales_source', 'locales_target', 'locales_location']);
+
+    $this->setupLanguages();
+
+    $this->installConfig(['locale_test']);
+    // Simulate this hook invoked which would happen if in a non-kernel test
+    // or normal environment.
+    // @see locale_modules_installed()
+    // @see locale_system_update()
+    locale_system_set_config_langcodes();
+    $langcodes = array_keys(\Drupal::languageManager()->getLanguages());
+    $names = Locale::config()->getComponentNames();
+    Locale::config()->updateConfigTranslations($names, $langcodes);
+
+    $this->configFactory = $this->container->get('config.factory');
+    $this->stringStorage = $this->container->get('locale.storage');
+    $this->localeConfigManager = $this->container->get('locale.config_manager');
+    $this->languageManager = $this->container->get('language_manager');
+
+    $this->setUpLocale();
+  }
+
+  /**
+   * Sets up default language for this test.
+   */
+  protected function setUpDefaultLanguage() {
+    // Keep the default English.
+  }
+
+  /**
+   * Sets up languages needed for this test.
+   */
+  protected function setUpLanguages() {
+    ConfigurableLanguage::createFromLangcode('de')->save();
+  }
+
+  /**
+   * Sets up the locale storage strings to be in line with configuration.
+   */
+  protected function setUpLocale() {
+    // Set up the locale database the same way we have in the config samples.
+    $this->setUpNoTranslation('locale_test.no_translation', 'test', 'Test', 'de');
+    $this->setUpTranslation('locale_test.translation', 'test', 'English test', 'German test', 'de');
+    $this->setUpTranslation('locale_test.translation_multiple', 'test', 'English test', 'German test', 'de');
+  }
+
+  /**
+   * Tests creating translations of shipped configuration.
+   */
+  public function testCreateTranslation() {
+    $config_name = 'locale_test.no_translation';
+
+    $this->saveLanguageOverride($config_name, 'test', 'Test (German)', 'de');
+    $this->assertTranslation($config_name, 'Test (German)', 'de');
+  }
+
+  /**
+   * Tests creating translations configuration with multi value settings.
+   */
+  public function testCreateTranslationMultiValue() {
+    $config_name = 'locale_test.translation_multiple';
+
+    $this->saveLanguageOverride($config_name, 'test_multiple', ['string' => 'String (German)', 'another_string' => 'Another string (German)'], 'de');
+    $this->saveLanguageOverride($config_name, 'test_after_multiple', ['string' => 'After string (German)', 'another_string' => 'After another string (German)'], 'de');
+    $strings = $this->stringStorage->getTranslations([
+      'type' => 'configuration',
+      'name' => $config_name,
+      'language' => 'de',
+      'translated' => TRUE,
+    ]);
+    $this->assertCount(5, $strings);
+  }
+
+  /**
+   * Tests importing community translations of shipped configuration.
+   */
+  public function testLocaleCreateTranslation() {
+    $config_name = 'locale_test.no_translation';
+
+    $this->saveLocaleTranslationData($config_name, 'test', 'Test', 'Test (German)', 'de');
+    $this->assertTranslation($config_name, 'Test (German)', 'de', FALSE);
+  }
+
+  /**
+   * Tests updating translations of shipped configuration.
+   */
+  public function testUpdateTranslation() {
+    $config_name = 'locale_test.translation';
+
+    $this->saveLanguageOverride($config_name, 'test', 'Updated German test', 'de');
+    $this->assertTranslation($config_name, 'Updated German test', 'de');
+  }
+
+  /**
+   * Tests updating community translations of shipped configuration.
+   */
+  public function testLocaleUpdateTranslation() {
+    $config_name = 'locale_test.translation';
+
+    $this->saveLocaleTranslationData($config_name, 'test', 'English test', 'Updated German test', 'de');
+    $this->assertTranslation($config_name, 'Updated German test', 'de', FALSE);
+  }
+
+  /**
+   * Tests deleting translations of shipped configuration.
+   */
+  public function testDeleteTranslation() {
+    $config_name = 'locale_test.translation';
+
+    $this->deleteLanguageOverride($config_name, 'test', 'English test', 'de');
+    // Instead of deleting the translation, we need to keep a translation with
+    // the source value and mark it as customized to prevent the deletion being
+    // reverted by importing community translations.
+    $this->assertTranslation($config_name, 'English test', 'de');
+  }
+
+  /**
+   * Tests deleting community translations of shipped configuration.
+   */
+  public function testLocaleDeleteTranslation() {
+    $config_name = 'locale_test.translation';
+
+    $this->deleteLocaleTranslationData($config_name, 'test', 'English test', 'de');
+    $this->assertNoTranslation($config_name, 'de');
+  }
+
+  /**
+   * Sets up a configuration string without a translation.
+   *
+   * The actual configuration is already available by installing locale_test
+   * module, as it is done in LocaleConfigSubscriberTest::setUp(). This sets up
+   * the necessary source string and verifies that everything is as expected to
+   * avoid false positives.
+   *
+   * @param string $config_name
+   *   The configuration name.
+   * @param string $key
+   *   The configuration key.
+   * @param string $source
+   *   The source string.
+   * @param string $langcode
+   *   The language code.
+   */
+  protected function setUpNoTranslation($config_name, $key, $source, $langcode) {
+    $this->localeConfigManager->updateConfigTranslations([$config_name], [$langcode]);
+    $this->assertNoConfigOverride($config_name, $key, $source, $langcode);
+    $this->assertNoTranslation($config_name, $langcode);
+  }
+
+  /**
+   * Sets up a configuration string with a translation.
+   *
+   * The actual configuration is already available by installing locale_test
+   * module, as it is done in LocaleConfigSubscriberTest::setUp(). This sets up
+   * the necessary source and translation strings and verifies that everything
+   * is as expected to avoid false positives.
+   *
+   * @param string $config_name
+   *   The configuration name.
+   * @param string $key
+   *   The configuration key.
+   * @param string $source
+   *   The source string.
+   * @param string $translation
+   *   The translation string.
+   * @param string $langcode
+   *   The language code.
+   * @param bool $is_active
+   *   Whether the update will affect the active configuration.
+   */
+  protected function setUpTranslation($config_name, $key, $source, $translation, $langcode, $is_active = FALSE) {
+    // Create source and translation strings for the configuration value and add
+    // the configuration name as a location. This would be performed by
+    // locale_translate_batch_import() invoking
+    // LocaleConfigManager::updateConfigTranslations() normally.
+    $this->localeConfigManager->reset();
+    $this->localeConfigManager
+      ->getStringTranslation($config_name, $langcode, $source, '')
+      ->setString($translation)
+      ->setCustomized(FALSE)
+      ->save();
+    $this->configFactory->reset($config_name);
+    $this->localeConfigManager->reset();
+    $this->localeConfigManager->updateConfigTranslations([$config_name], [$langcode]);
+
+    if ($is_active) {
+      $this->assertActiveConfig($config_name, $key, $translation, $langcode);
+    }
+    else {
+      $this->assertConfigOverride($config_name, $key, $translation, $langcode);
+    }
+    $this->assertTranslation($config_name, $translation, $langcode, FALSE);
+  }
+
+  /**
+   * Saves a language override.
+   *
+   * This will invoke LocaleConfigSubscriber through the event dispatcher. To
+   * make sure the configuration was persisted correctly, the configuration
+   * value is checked. Because LocaleConfigSubscriber temporarily disables the
+   * override state of the configuration factory we check that the correct value
+   * is restored afterwards.
+   *
+   * @param string $config_name
+   *   The configuration name.
+   * @param string $key
+   *   The configuration key.
+   * @param string|array $value
+   *   The configuration value to save.
+   * @param string $langcode
+   *   The language code.
+   */
+  protected function saveLanguageOverride($config_name, $key, $value, $langcode) {
+    $translation_override = $this->languageManager
+      ->getLanguageConfigOverride($langcode, $config_name);
+    $translation_override
+      ->set($key, $value)
+      ->save();
+    $this->configFactory->reset($config_name);
+
+    $this->assertConfigOverride($config_name, $key, $value, $langcode);
+  }
+
+  /**
+   * Saves translation data from locale module.
+   *
+   * This will invoke LocaleConfigSubscriber through the event dispatcher. To
+   * make sure the configuration was persisted correctly, the configuration
+   * value is checked. Because LocaleConfigSubscriber temporarily disables the
+   * override state of the configuration factory we check that the correct value
+   * is restored afterwards.
+   *
+   * @param string $config_name
+   *   The configuration name.
+   * @param string $key
+   *   The configuration key.
+   * @param string $source
+   *   The source string.
+   * @param string $translation
+   *   The translation string to save.
+   * @param string $langcode
+   *   The language code.
+   * @param bool $is_active
+   *   Whether the update will affect the active configuration.
+   */
+  protected function saveLocaleTranslationData($config_name, $key, $source, $translation, $langcode, $is_active = FALSE) {
+    $this->localeConfigManager->reset();
+    $this->localeConfigManager
+      ->getStringTranslation($config_name, $langcode, $source, '')
+      ->setString($translation)
+      ->save();
+    $this->localeConfigManager->reset();
+    $this->localeConfigManager->updateConfigTranslations([$config_name], [$langcode]);
+    $this->configFactory->reset($config_name);
+
+    if ($is_active) {
+      $this->assertActiveConfig($config_name, $key, $translation, $langcode);
+    }
+    else {
+      $this->assertConfigOverride($config_name, $key, $translation, $langcode);
+    }
+  }
+
+  /**
+   * Deletes a language override.
+   *
+   * This will invoke LocaleConfigSubscriber through the event dispatcher. To
+   * make sure the configuration was persisted correctly, the configuration
+   * value is checked. Because LocaleConfigSubscriber temporarily disables the
+   * override state of the configuration factory we check that the correct value
+   * is restored afterwards.
+   *
+   * @param string $config_name
+   *   The configuration name.
+   * @param string $key
+   *   The configuration key.
+   * @param string $source_value
+   *   The source configuration value to verify the correct value is returned
+   *   from the configuration factory after the deletion.
+   * @param string $langcode
+   *   The language code.
+   */
+  protected function deleteLanguageOverride($config_name, $key, $source_value, $langcode) {
+    $translation_override = $this->languageManager
+      ->getLanguageConfigOverride($langcode, $config_name);
+    $translation_override
+      ->clear($key)
+      ->save();
+    $this->configFactory->reset($config_name);
+
+    $this->assertNoConfigOverride($config_name, $key, $source_value, $langcode);
+  }
+
+  /**
+   * Deletes translation data from locale module.
+   *
+   * This will invoke LocaleConfigSubscriber through the event dispatcher. To
+   * make sure the configuration was persisted correctly, the configuration
+   * value is checked. Because LocaleConfigSubscriber temporarily disables the
+   * override state of the configuration factory we check that the correct value
+   * is restored afterwards.
+   *
+   * @param string $config_name
+   *   The configuration name.
+   * @param string $key
+   *   The configuration key.
+   * @param string $source_value
+   *   The source configuration value to verify the correct value is returned
+   *   from the configuration factory after the deletion.
+   * @param string $langcode
+   *   The language code.
+   */
+  protected function deleteLocaleTranslationData($config_name, $key, $source_value, $langcode) {
+    $this->localeConfigManager
+      ->getStringTranslation($config_name, $langcode, $source_value, '')
+      ->delete();
+    $this->localeConfigManager->reset();
+    $this->localeConfigManager->updateConfigTranslations([$config_name], [$langcode]);
+    $this->configFactory->reset($config_name);
+
+    $this->assertNoConfigOverride($config_name, $key, $source_value, $langcode);
+  }
+
+  /**
+   * Ensures configuration override is not present anymore.
+   *
+   * @param string $config_name
+   *   The configuration name.
+   * @param string $langcode
+   *   The language code.
+   */
+  protected function assertNoConfigOverride($config_name, $langcode) {
+    $config_langcode = $this->configFactory->getEditable($config_name)->get('langcode');
+    $override = $this->languageManager->getLanguageConfigOverride($langcode, $config_name);
+    $this->assertNotEqual($config_langcode, $langcode);
+    $this->assertEqual($override->isNew(), TRUE);
+  }
+
+  /**
+   * Ensures configuration was saved correctly.
+   *
+   * @param string $config_name
+   *   The configuration name.
+   * @param string $key
+   *   The configuration key.
+   * @param string $value
+   *   The configuration value.
+   * @param string $langcode
+   *   The language code.
+   */
+  protected function assertConfigOverride($config_name, $key, $value, $langcode) {
+    $config_langcode = $this->configFactory->getEditable($config_name)->get('langcode');
+    $override = $this->languageManager->getLanguageConfigOverride($langcode, $config_name);
+    $this->assertNotEqual($config_langcode, $langcode);
+    $this->assertEqual($override->get($key), $value);
+  }
+
+  /**
+   * Ensures configuration was saved correctly.
+   *
+   * @param string $config_name
+   *   The configuration name.
+   * @param string $key
+   *   The configuration key.
+   * @param string $value
+   *   The configuration value.
+   * @param string $langcode
+   *   The language code.
+   */
+  protected function assertActiveConfig($config_name, $key, $value, $langcode) {
+    $config = $this->configFactory->getEditable($config_name);
+    $this->assertEqual($config->get('langcode'), $langcode);
+    $this->assertIdentical($config->get($key), $value);
+  }
+
+  /**
+   * Ensures no translation exists.
+   *
+   * @param string $config_name
+   *   The configuration name.
+   * @param string $langcode
+   *   The language code.
+   */
+  protected function assertNoTranslation($config_name, $langcode) {
+    $strings = $this->stringStorage->getTranslations([
+      'type' => 'configuration',
+      'name' => $config_name,
+      'language' => $langcode,
+      'translated' => TRUE,
+    ]);
+    $this->assertIdentical([], $strings);
+  }
+
+  /**
+   * Ensures a translation exists and is marked as customized.
+   *
+   * @param string $config_name
+   *   The configuration name.
+   * @param string|array $translation
+   *   The translation.
+   * @param string $langcode
+   *   The language code.
+   * @param bool $customized
+   *   Whether or not the string should be asserted to be customized or not
+   *   customized.
+   */
+  protected function assertTranslation($config_name, $translation, $langcode, $customized = TRUE) {
+    // Make sure a string exists.
+    $strings = $this->stringStorage->getTranslations([
+      'type' => 'configuration',
+      'name' => $config_name,
+      'language' => $langcode,
+      'translated' => TRUE,
+    ]);
+    $this->assertCount(1, $strings);
+    $string = reset($strings);
+    $this->assertInstanceOf(StringInterface::class, $string);
+    /** @var \Drupal\locale\StringInterface $string */
+    $this->assertIdentical($translation, $string->getString());
+    $this->assertTrue($string->isTranslation());
+    $this->assertInstanceOf(TranslationString::class, $string);
+    /** @var \Drupal\locale\TranslationString $string */
+    // Make sure the string is marked as customized so that it does not get
+    // overridden when the string translations are updated.
+    $this->assertEquals($customized, (bool) $string->customized);
+  }
+
+}

web/core/modules/locale/tests/src/Kernel/LocaleConfigurableLanguageManagerTest.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace Drupal\Tests\locale\Kernel;
+
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests that the configurable language manager and locale operate correctly.
+ *
+ * @group locale
+ */
+class LocaleConfigurableLanguageManagerTest extends KernelTestBase {
+
+  /**
+   * A list of modules to install for this test.
+   *
+   * @var array
+   */
+  public static $modules = ['language', 'locale'];
+
+  public function testGetLanguages() {
+    $this->installSchema('locale', ['locales_source', 'locales_target', 'locales_location']);
+    $default_language = new ConfigurableLanguage(['label' => $this->randomMachineName(), 'id' => 'default', 'weight' => 0], 'configurable_language');
+    $default_language->save();
+
+    // Set new default language.
+    \Drupal::service('language.default')->set($default_language);
+    \Drupal::service('string_translation')->setDefaultLangcode($default_language->getId());
+
+    $languages = \Drupal::service('language_manager')->getLanguages(LanguageInterface::STATE_ALL);
+    $this->assertEqual(['default', 'und', 'zxx'], array_keys($languages));
+
+    $configurableLanguage = new ConfigurableLanguage(['label' => $this->randomMachineName(), 'id' => 'test', 'weight' => 1], 'configurable_language');
+    // Simulate a configuration sync by setting the flag otherwise the locked
+    // language weights would be updated whilst saving.
+    // @see \Drupal\language\Entity\ConfigurableLanguage::postSave()
+    $configurableLanguage->setSyncing(TRUE)->save();
+
+    $languages = \Drupal::service('language_manager')->getLanguages(LanguageInterface::STATE_ALL);
+    $this->assertEqual(['default', 'test', 'und', 'zxx'], array_keys($languages));
+  }
+
+}

web/core/modules/locale/tests/src/Kernel/LocaleDeprecationsTest.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Drupal\Tests\locale\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests deprecations in the locale module.
+ *
+ * @group locale
+ * @group legacy
+ */
+class LocaleDeprecationsTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['locale', 'system'];
+
+  /**
+   * @expectedDeprecation locale_translation_manual_status() is deprecated in Drupal 8.5.0 and will be removed before Drupal 9.0.0. It is unused by Drupal core. Duplicate this function in your own extension if you need its behavior.
+   */
+  public function testLocaleTranslationManualStatusDeprecation() {
+    module_load_include('pages.inc', 'locale');
+    $this->assertNotNull(\locale_translation_manual_status());
+  }
+
+}

web/core/modules/locale/tests/src/Kernel/LocaleLibraryAlterTest.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Drupal\Tests\locale\Kernel;
+
+use Drupal\Core\Asset\AttachedAssets;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests localization of the JavaScript libraries.
+ *
+ * Currently, only the jQuery datepicker is localized using Drupal translations.
+ *
+ * @group locale
+ */
+class LocaleLibraryAlterTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = ['locale'];
+
+  /**
+   * Verifies that the datepicker can be localized.
+   *
+   * @see locale_library_alter()
+   */
+  public function testLibraryAlter() {
+    $this->installSchema('locale', [
+      'locales_location',
+      'locales_source',
+    ]);
+
+    $assets = new AttachedAssets();
+    $assets->setLibraries(['core/jquery.ui.datepicker']);
+    $js_assets = $this->container->get('asset.resolver')->getJsAssets($assets, FALSE)[1];
+    $this->assertArrayHasKey('core/modules/locale/locale.datepicker.js', $js_assets);
+  }
+
+}

web/core/modules/locale/tests/src/Kernel/LocaleStringIsSafeTest.php

@@ -0,0 +1,101 @@
+<?php
+
+namespace Drupal\Tests\locale\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests locale translation safe string handling.
+ *
+ * @group locale
+ */
+class LocaleStringIsSafeTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['locale', 'locale_test'];
+
+  /**
+   * Tests for locale_string_is_safe().
+   */
+  public function testLocaleStringIsSafe() {
+    // Check a translatable string without HTML.
+    $string = 'Hello world!';
+    $result = locale_string_is_safe($string);
+    $this->assertTrue($result);
+
+    // Check a translatable string which includes trustable HTML.
+    $string = 'Hello <strong>world</strong>!';
+    $result = locale_string_is_safe($string);
+    $this->assertTrue($result);
+
+    // Check an untranslatable string which includes untrustable HTML (according
+    // to the locale_string_is_safe() function definition).
+    $string = 'Hello <img src="world.png" alt="world" />!';
+    $result = locale_string_is_safe($string);
+    $this->assertFalse($result);
+
+    // Check a translatable string which includes a token in an href attribute.
+    $string = 'Hi <a href="[current-user:url]">user</a>';
+    $result = locale_string_is_safe($string);
+    $this->assertTrue($result);
+  }
+
+  /**
+   * Tests if a translated and tokenized string is properly escaped by Twig.
+   *
+   * In each assert* call we add a new line at the expected result to match the
+   * newline at the end of the template file.
+   */
+  public function testLocalizedTokenizedString() {
+    $tests_to_do = [
+      1 => [
+        'original' => 'Go to the <a href="[locale_test:security_test1]">frontpage</a>',
+        'replaced' => 'Go to the &lt;a href=&quot;javascript:alert(&amp;#039;Mooooh!&amp;#039;);&quot;&gt;frontpage&lt;/a&gt;',
+      ],
+      2 => [
+        'original' => 'Hello <strong>[locale_test:security_test2]</strong>!',
+        'replaced' => 'Hello &lt;strong&gt;&amp;lt;script&amp;gt;alert(&amp;#039;Mooooh!&amp;#039;);&amp;lt;/script&amp;gt;&lt;/strong&gt;!',
+      ],
+    ];
+
+    foreach ($tests_to_do as $i => $test) {
+      $original_string = $test['original'];
+      $rendered_original_string = \Drupal::theme()->render('locale_test_tokenized', ['content' => $original_string]);
+      // Twig assumes that strings are unsafe so it escapes them, and so the
+      // original and the rendered version should be different.
+      $this->assertNotEqual(
+        $rendered_original_string,
+        $original_string . "\n",
+        'Security test ' . $i . ' before translation'
+      );
+
+      // Pass the original string to the t() function to get it marked as safe.
+      $safe_string = t($original_string);
+      $rendered_safe_string = \Drupal::theme()->render('locale_test_tokenized', ['content' => $safe_string]);
+      // t() function always marks the string as safe so it won't be escaped,
+      // and should be the same as the original.
+      $this->assertEqual(
+        $rendered_safe_string,
+        $original_string . "\n",
+        'Security test ' . $i . ' after translation before token replacement'
+      );
+
+      // Replace tokens in the safe string to inject it with dangerous content.
+      // @see locale_test_tokens().
+      $unsafe_string = \Drupal::token()->replace($safe_string);
+      $rendered_unsafe_string = \Drupal::theme()->render('locale_test_tokenized', ['content' => $unsafe_string]);
+      // Token replacement changes the string so it is not marked as safe
+      // anymore. Check it is escaped the way we expect.
+      $this->assertEqual(
+        $rendered_unsafe_string,
+        $test['replaced'] . "\n",
+        'Security test ' . $i . ' after translation  after token replacement'
+      );
+    }
+  }
+
+}

web/core/modules/locale/tests/src/Kernel/LocaleStringTest.php

@@ -0,0 +1,237 @@
+<?php
+
+namespace Drupal\Tests\locale\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\locale\StringInterface;
+
+/**
+ * Tests the locale string storage, string objects and data API.
+ *
+ * @group locale
+ */
+class LocaleStringTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = [
+    'language',
+    'locale',
+   ];
+
+  /**
+   * The locale storage.
+   *
+   * @var \Drupal\locale\StringStorageInterface
+   */
+  protected $storage;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Add a default locale storage for all these tests.
+    $this->storage = $this->container->get('locale.storage');
+    // Create two languages: Spanish and German.
+    foreach (['es', 'de'] as $langcode) {
+      ConfigurableLanguage::createFromLangcode($langcode)->save();
+    }
+    $this->installSchema('locale', [
+      'locales_location',
+      'locales_source',
+      'locales_target',
+    ]);
+  }
+
+  /**
+   * Test CRUD API.
+   */
+  public function testStringCrudApi() {
+    // Create source string.
+    $source = $this->buildSourceString()->save();
+    $this->assertNotEmpty($source->lid);
+
+    // Load strings by lid and source.
+    $string1 = $this->storage->findString(['lid' => $source->lid]);
+    $this->assertEquals($source, $string1);
+    $string2 = $this->storage->findString(['source' => $source->source, 'context' => $source->context]);
+    $this->assertEquals($source, $string2);
+    $string3 = $this->storage->findString(['source' => $source->source, 'context' => '']);
+    $this->assertNull($string3);
+
+    // Check version handling and updating.
+    $this->assertEquals('none', $source->version);
+    $string = $this->storage->findTranslation(['lid' => $source->lid]);
+    $this->assertEquals(\Drupal::VERSION, $string->version);
+
+    // Create translation and find it by lid and source.
+    $langcode = 'es';
+    $translation = $this->createTranslation($source, $langcode);
+    $this->assertEquals(LOCALE_NOT_CUSTOMIZED, $translation->customized);
+    $string1 = $this->storage->findTranslation(['language' => $langcode, 'lid' => $source->lid]);
+    $this->assertEquals($translation->translation, $string1->translation);
+    $string2 = $this->storage->findTranslation(['language' => $langcode, 'source' => $source->source, 'context' => $source->context]);
+    $this->assertEquals($translation->translation, $string2->translation);
+    $translation
+      ->setCustomized()
+      ->save();
+    $translation = $this->storage->findTranslation(['language' => $langcode, 'lid' => $source->lid]);
+    $this->assertEquals(LOCALE_CUSTOMIZED, $translation->customized);
+
+    // Delete translation.
+    $translation->delete();
+    $deleted = $this->storage->findTranslation(['language' => $langcode, 'lid' => $source->lid]);
+    $this->assertNull($deleted->translation);
+
+    // Create some translations and then delete string and all of its
+    // translations.
+    $lid = $source->lid;
+    $this->createAllTranslations($source);
+    $search = $this->storage->getTranslations(['lid' => $source->lid]);
+    $this->assertCount(3, $search);
+
+    $source->delete();
+    $string = $this->storage->findString(['lid' => $lid]);
+    $this->assertNull($string);
+    $deleted = $search = $this->storage->getTranslations(['lid' => $lid]);
+    $this->assertEmpty($deleted);
+
+    // Tests that locations of different types and arbitrary lengths can be
+    // added to a source string. Too long locations will be cut off.
+    $source_string = $this->buildSourceString();
+    $source_string->addLocation('javascript', $this->randomString(8));
+    $source_string->addLocation('configuration', $this->randomString(50));
+    $source_string->addLocation('code', $this->randomString(100));
+    $source_string->addLocation('path', $location = $this->randomString(300));
+    $source_string->save();
+
+    $rows = $this->container->get('database')->select('locales_location')
+      ->fields('locales_location')
+      ->condition('sid', $source_string->lid)
+      ->execute()
+      ->fetchAllAssoc('type');
+    $this->assertCount(4, $rows);
+    $this->assertEquals(substr($location, 0, 255), $rows['path']->name);
+  }
+
+  /**
+   * Test Search API loading multiple objects.
+   */
+  public function testStringSearchApi() {
+    $language_count = 3;
+    // Strings 1 and 2 will have some common prefix.
+    // Source 1 will have all translations, not customized.
+    // Source 2 will have all translations, customized.
+    // Source 3 will have no translations.
+    $prefix = $this->randomMachineName(100);
+    $source1 = $this->buildSourceString(['source' => $prefix . $this->randomMachineName(100)])->save();
+    $source2 = $this->buildSourceString(['source' => $prefix . $this->randomMachineName(100)])->save();
+    $source3 = $this->buildSourceString()->save();
+
+    // Load all source strings.
+    $strings = $this->storage->getStrings([]);
+    $this->assertCount(3, $strings);
+    // Load all source strings matching a given string.
+    $filter_options['filters'] = ['source' => $prefix];
+    $strings = $this->storage->getStrings([], $filter_options);
+    $this->assertCount(2, $strings);
+
+    // Not customized translations.
+    $translate1 = $this->createAllTranslations($source1);
+    // Customized translations.
+    $this->createAllTranslations($source2, ['customized' => LOCALE_CUSTOMIZED]);
+    // Try quick search function with different field combinations.
+    $langcode = 'es';
+    $found = $this->storage->findTranslation(['language' => $langcode, 'source' => $source1->source, 'context' => $source1->context]);
+    $this->assertTrue($found && isset($found->language) && isset($found->translation) && !$found->isNew(), 'Translation not found searching by source and context.');
+    $this->assertEquals($translate1[$langcode]->translation, $found->translation);
+    // Now try a translation not found.
+    $found = $this->storage->findTranslation(['language' => $langcode, 'source' => $source3->source, 'context' => $source3->context]);
+    $this->assertTrue($found && $found->lid == $source3->lid && !isset($found->translation) && $found->isNew());
+
+    // Load all translations. For next queries we'll be loading only translated
+    // strings.
+    $translations = $this->storage->getTranslations(['translated' => TRUE]);
+    $this->assertCount(2 * $language_count, $translations);
+
+    // Load all customized translations.
+    $translations = $this->storage->getTranslations(['customized' => LOCALE_CUSTOMIZED, 'translated' => TRUE]);
+    $this->assertCount($language_count, $translations);
+
+    // Load all Spanish customized translations.
+    $translations = $this->storage->getTranslations(['language' => 'es', 'customized' => LOCALE_CUSTOMIZED, 'translated' => TRUE]);
+    $this->assertCount(1, $translations);
+
+    // Load all source strings without translation (1).
+    $translations = $this->storage->getStrings(['translated' => FALSE]);
+    $this->assertCount(1, $translations);
+
+    // Load Spanish translations using string filter.
+    $filter_options['filters'] = ['source' => $prefix];
+    $translations = $this->storage->getTranslations(['language' => 'es'], $filter_options);
+    $this->assertCount(2, $translations);
+  }
+
+  /**
+   * Creates random source string object.
+   *
+   * @param array $values
+   *   The values array.
+   *
+   * @return \Drupal\locale\StringInterface
+   *   A locale string.
+   */
+  protected function buildSourceString(array $values = []) {
+    return $this->storage->createString($values += [
+      'source' => $this->randomMachineName(100),
+      'context' => $this->randomMachineName(20),
+    ]);
+  }
+
+  /**
+   * Creates translations for source string and all languages.
+   *
+   * @param \Drupal\locale\StringInterface $source
+   *   The source string.
+   * @param array $values
+   *   The values array.
+   *
+   * @return array
+   *   Translation list.
+   */
+  protected function createAllTranslations(StringInterface $source, array $values = []) {
+    $list = [];
+    /* @var $language_manager \Drupal\Core\Language\LanguageManagerInterface */
+    $language_manager = $this->container->get('language_manager');
+    foreach ($language_manager->getLanguages() as $language) {
+      $list[$language->getId()] = $this->createTranslation($source, $language->getId(), $values);
+    }
+    return $list;
+  }
+
+  /**
+   * Creates single translation for source string.
+   *
+   * @param \Drupal\locale\StringInterface $source
+   *   The source string.
+   * @param string $langcode
+   *   The language code.
+   * @param array $values
+   *   The values array.
+   *
+   * @return \Drupal\locale\StringInterface
+   *   The translated string object.
+   */
+  protected function createTranslation(StringInterface $source, $langcode, array $values = []) {
+    return $this->storage->createTranslation($values + [
+      'lid' => $source->lid,
+      'language' => $langcode,
+      'translation' => $this->randomMachineName(100),
+    ])->save();
+  }
+
+}

web/core/modules/locale/tests/src/Kernel/LocaleTranslationProjectsTest.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace Drupal\Tests\locale\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests locale translation project handling.
+ *
+ * @group locale
+ */
+class LocaleTranslationProjectsTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['locale', 'locale_test', 'system'];
+
+  /**
+   * The module handler used in this test.
+   *
+   * @var \Drupal\Core\Extension\ModuleHandlerInterface
+   */
+  protected $moduleHandler;
+
+  /**
+   * The locale project storage used in this test.
+   *
+   * @var \Drupal\locale\LocaleProjectStorageInterface
+   */
+  protected $projectStorage;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->moduleHandler = $this->container->get('module_handler');
+    $this->projectStorage = $this->container->get('locale.project');
+    \Drupal::state()->set('locale.remove_core_project', TRUE);
+  }
+
+  /**
+   * Tests locale_translation_clear_cache_projects().
+   */
+  public function testLocaleTranslationClearCacheProjects() {
+    $this->moduleHandler->loadInclude('locale', 'inc', 'locale.translation');
+
+    $expected = [];
+    $this->assertIdentical($expected, locale_translation_get_projects());
+
+    $this->projectStorage->set('foo', []);
+    $expected['foo'] = new \stdClass();
+    $this->assertEqual($expected, locale_translation_get_projects());
+
+    $this->projectStorage->set('bar', []);
+    locale_translation_clear_cache_projects();
+    $expected['bar'] = new \stdClass();
+    $this->assertEqual($expected, locale_translation_get_projects());
+  }
+
+}

web/core/modules/locale/tests/src/Kernel/LocaleUpdateTest.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace Drupal\Tests\locale\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests for updating the interface translations of projects.
+ *
+ * @group locale
+ */
+class LocaleUpdateTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = [
+    'locale',
+    'locale_test',
+    'system',
+  ];
+
+  /**
+   * Checks if a list of translatable projects gets build.
+   */
+  public function testUpdateProjects() {
+    $this->container->get('module_handler')->loadInclude('locale', 'compare.inc');
+
+    // Make the test modules look like a normal custom module. I.e. make the
+    // modules not hidden. locale_test_system_info_alter() modifies the project
+    // info of the locale_test and locale_test_translate modules.
+    \Drupal::state()->set('locale.test_system_info_alter', TRUE);
+
+    // Check if interface translation data is collected from hook_info.
+    $projects = locale_translation_project_list();
+    $this->assertArrayNotHasKey('locale_test_translate', $projects);
+    $this->assertEquals('core/modules/locale/test/test.%language.po', $projects['locale_test']['info']['interface translation server pattern']);
+    $this->assertEquals('locale_test', $projects['locale_test']['name']);
+  }
+
+}

web/core/modules/locale/tests/src/Kernel/Migrate/MigrateLocaleConfigsTest.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Drupal\Tests\locale\Kernel\Migrate;
+
+use Drupal\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade variables to locale.settings.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateLocaleConfigsTest extends MigrateDrupal6TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['locale', 'language'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('locale_settings');
+  }
+
+  /**
+   * Tests migration of locale variables to locale.settings.yml.
+   */
+  public function testLocaleSettings() {
+    $config = $this->config('locale.settings');
+    $this->assertIdentical(TRUE, $config->get('cache_strings'));
+    $this->assertIdentical('languages', $config->get('javascript.directory'));
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'locale.settings', $config->get());
+  }
+
+}

web/core/modules/locale/tests/src/Unit/LocaleLookupTest.php

@@ -0,0 +1,337 @@
+<?php
+
+namespace Drupal\Tests\locale\Unit;
+
+use Drupal\Component\Gettext\PoItem;
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\locale\LocaleLookup;
+use Drupal\Tests\UnitTestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+/**
+ * @coversDefaultClass \Drupal\locale\LocaleLookup
+ * @group locale
+ */
+class LocaleLookupTest extends UnitTestCase {
+
+  /**
+   * A mocked storage to use when instantiating LocaleTranslation objects.
+   *
+   * @var \Drupal\locale\StringStorageInterface|\PHPUnit\Framework\MockObject\MockObject
+   */
+  protected $storage;
+
+  /**
+   * A mocked cache object.
+   *
+   * @var \Drupal\Core\Cache\CacheBackendInterface|\PHPUnit\Framework\MockObject\MockObject
+   */
+  protected $cache;
+
+  /**
+   * A mocked lock object.
+   *
+   * @var \Drupal\Core\Lock\LockBackendInterface|\PHPUnit\Framework\MockObject\MockObject
+   */
+  protected $lock;
+
+  /**
+   * A mocked user object built from AccountInterface.
+   *
+   * @var \Drupal\Core\Session\AccountInterface|\PHPUnit\Framework\MockObject\MockObject
+   */
+  protected $user;
+
+  /**
+   * A mocked config factory built with UnitTestCase::getConfigFactoryStub().
+   *
+   * @var \Drupal\Core\Config\ConfigFactory|\PHPUnit\Framework\MockObject\MockBuilder
+   */
+  protected $configFactory;
+
+  /**
+   * A mocked language manager built from LanguageManagerInterface.
+   *
+   * @var \Drupal\Core\Language\LanguageManagerInterface|\PHPUnit\Framework\MockObject\MockObject
+   */
+  protected $languageManager;
+
+  /**
+   * The request stack.
+   *
+   * @var \Symfony\Component\HttpFoundation\RequestStack
+   */
+  protected $requestStack;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    $this->storage = $this->createMock('Drupal\locale\StringStorageInterface');
+    $this->cache = $this->createMock('Drupal\Core\Cache\CacheBackendInterface');
+    $this->lock = $this->createMock('Drupal\Core\Lock\LockBackendInterface');
+    $this->lock->expects($this->never())
+      ->method($this->anything());
+
+    $this->user = $this->createMock('Drupal\Core\Session\AccountInterface');
+    $this->user->expects($this->any())
+      ->method('getRoles')
+      ->will($this->returnValue(['anonymous']));
+
+    $this->configFactory = $this->getConfigFactoryStub(['locale.settings' => ['cache_strings' => FALSE]]);
+
+    $this->languageManager = $this->createMock('Drupal\Core\Language\LanguageManagerInterface');
+    $this->requestStack = new RequestStack();
+
+    $container = new ContainerBuilder();
+    $container->set('current_user', $this->user);
+    \Drupal::setContainer($container);
+  }
+
+  /**
+   * Tests locale lookups without fallback.
+   *
+   * @covers ::resolveCacheMiss
+   */
+  public function testResolveCacheMissWithoutFallback() {
+    $args = [
+      'language' => 'en',
+      'source' => 'test',
+      'context' => 'irrelevant',
+    ];
+
+    $result = (object) [
+      'translation' => 'test',
+    ];
+
+    $this->cache->expects($this->once())
+      ->method('get')
+      ->with('locale:en:irrelevant:anonymous', FALSE);
+
+    $this->storage->expects($this->once())
+      ->method('findTranslation')
+      ->with($this->equalTo($args))
+      ->will($this->returnValue($result));
+
+    $locale_lookup = $this->getMockBuilder('Drupal\locale\LocaleLookup')
+      ->setConstructorArgs(['en', 'irrelevant', $this->storage, $this->cache, $this->lock, $this->configFactory, $this->languageManager, $this->requestStack])
+      ->setMethods(['persist'])
+      ->getMock();
+    $locale_lookup->expects($this->never())
+      ->method('persist');
+    $this->assertSame('test', $locale_lookup->get('test'));
+  }
+
+  /**
+   * Tests locale lookups with fallback.
+   *
+   * Note that context is irrelevant here. It is not used but it is required.
+   *
+   * @covers ::resolveCacheMiss
+   *
+   * @dataProvider resolveCacheMissWithFallbackProvider
+   */
+  public function testResolveCacheMissWithFallback($langcode, $string, $context, $expected) {
+    // These are fake words!
+    $translations = [
+      'en' => [
+        'test' => 'test',
+        'fake' => 'fake',
+        'missing pl' => 'missing pl',
+        'missing cs' => 'missing cs',
+        'missing both' => 'missing both',
+      ],
+      'pl' => [
+        'test' => 'test po polsku',
+        'fake' => 'ściema',
+        'missing cs' => 'zaginiony czech',
+      ],
+      'cs' => [
+        'test' => 'test v české',
+        'fake' => 'falešný',
+        'missing pl' => 'chybějící pl',
+      ],
+    ];
+    $this->storage->expects($this->any())
+      ->method('findTranslation')
+      ->will($this->returnCallback(function ($argument) use ($translations) {
+        if (isset($translations[$argument['language']][$argument['source']])) {
+          return (object) ['translation' => $translations[$argument['language']][$argument['source']]];
+        }
+        return TRUE;
+      }));
+
+    $this->languageManager->expects($this->any())
+      ->method('getFallbackCandidates')
+      ->will($this->returnCallback(function (array $context = []) {
+        switch ($context['langcode']) {
+          case 'pl':
+            return ['cs', 'en'];
+
+          case 'cs':
+            return ['en'];
+
+          default:
+            return [];
+        }
+      }));
+
+    $this->cache->expects($this->once())
+      ->method('get')
+      ->with('locale:' . $langcode . ':' . $context . ':anonymous', FALSE);
+
+    $locale_lookup = new LocaleLookup($langcode, $context, $this->storage, $this->cache, $this->lock, $this->configFactory, $this->languageManager, $this->requestStack);
+    $this->assertSame($expected, $locale_lookup->get($string));
+  }
+
+  /**
+   * Provides test data for testResolveCacheMissWithFallback().
+   */
+  public function resolveCacheMissWithFallbackProvider() {
+    return [
+      ['cs', 'test', 'irrelevant', 'test v české'],
+      ['cs', 'fake', 'irrelevant', 'falešný'],
+      ['cs', 'missing pl', 'irrelevant', 'chybějící pl'],
+      ['cs', 'missing cs', 'irrelevant', 'missing cs'],
+      ['cs', 'missing both', 'irrelevant', 'missing both'],
+
+      // Testing PL with fallback to cs, en.
+      ['pl', 'test', 'irrelevant', 'test po polsku'],
+      ['pl', 'fake', 'irrelevant', 'ściema'],
+      ['pl', 'missing pl', 'irrelevant', 'chybějící pl'],
+      ['pl', 'missing cs', 'irrelevant', 'zaginiony czech'],
+      ['pl', 'missing both', 'irrelevant', 'missing both'],
+    ];
+  }
+
+  /**
+   * Tests locale lookups with persistent tracking.
+   *
+   * @covers ::resolveCacheMiss
+   */
+  public function testResolveCacheMissWithPersist() {
+    $args = [
+      'language' => 'en',
+      'source' => 'test',
+      'context' => 'irrelevant',
+    ];
+
+    $result = (object) [
+      'translation' => 'test',
+    ];
+
+    $this->storage->expects($this->once())
+      ->method('findTranslation')
+      ->with($this->equalTo($args))
+      ->will($this->returnValue($result));
+
+    $this->configFactory = $this->getConfigFactoryStub(['locale.settings' => ['cache_strings' => TRUE]]);
+    $locale_lookup = $this->getMockBuilder('Drupal\locale\LocaleLookup')
+      ->setConstructorArgs(['en', 'irrelevant', $this->storage, $this->cache, $this->lock, $this->configFactory, $this->languageManager, $this->requestStack])
+      ->setMethods(['persist'])
+      ->getMock();
+    $locale_lookup->expects($this->once())
+      ->method('persist');
+
+    $this->assertSame('test', $locale_lookup->get('test'));
+  }
+
+  /**
+   * Tests locale lookups without a found translation.
+   *
+   * @covers ::resolveCacheMiss
+   */
+  public function testResolveCacheMissNoTranslation() {
+    $string = $this->createMock('Drupal\locale\StringInterface');
+    $string->expects($this->once())
+      ->method('addLocation')
+      ->will($this->returnSelf());
+    $this->storage->expects($this->once())
+      ->method('findTranslation')
+      ->will($this->returnValue(NULL));
+    $this->storage->expects($this->once())
+      ->method('createString')
+      ->will($this->returnValue($string));
+
+    $request = Request::create('/test');
+    $this->requestStack->push($request);
+
+    $locale_lookup = $this->getMockBuilder('Drupal\locale\LocaleLookup')
+      ->setConstructorArgs(['en', 'irrelevant', $this->storage, $this->cache, $this->lock, $this->configFactory, $this->languageManager, $this->requestStack])
+      ->setMethods(['persist'])
+      ->getMock();
+    $locale_lookup->expects($this->never())
+      ->method('persist');
+
+    $this->assertTrue($locale_lookup->get('test'));
+  }
+
+  /**
+   * Tests locale lookups with old plural style of translations.
+   *
+   * @param array $translations
+   *   The source with translations.
+   * @param string $langcode
+   *   The language code of translation string.
+   * @param string $string
+   *   The string for translation.
+   * @param bool $is_fix
+   *   The flag about expected fix translation.
+   *
+   * @covers ::resolveCacheMiss
+   * @dataProvider providerFixOldPluralTranslationProvider
+   */
+  public function testFixOldPluralStyleTranslations($translations, $langcode, $string, $is_fix) {
+    $this->storage->expects($this->any())
+      ->method('findTranslation')
+      ->will($this->returnCallback(function ($argument) use ($translations) {
+        if (isset($translations[$argument['language']][$argument['source']])) {
+          return (object) ['translation' => $translations[$argument['language']][$argument['source']]];
+        }
+        return TRUE;
+      }));
+    $this->languageManager->expects($this->any())
+      ->method('getFallbackCandidates')
+      ->will($this->returnCallback(function (array $context = []) {
+        switch ($context['langcode']) {
+          case 'by':
+            return ['ru'];
+        }
+      }));
+    $this->cache->expects($this->once())
+      ->method('get')
+      ->with('locale:' . $langcode . '::anonymous', FALSE);
+
+    $locale_lookup = new LocaleLookup($langcode, '', $this->storage, $this->cache, $this->lock, $this->configFactory, $this->languageManager, $this->requestStack);
+    if ($is_fix) {
+      $this->assertStringNotContainsString('@count[2]', $locale_lookup->get($string));
+    }
+    else {
+      $this->assertStringContainsString('@count[2]', $locale_lookup->get($string));
+    }
+  }
+
+  /**
+   * Provides test data for testResolveCacheMissWithFallback().
+   */
+  public function providerFixOldPluralTranslationProvider() {
+    $translations = [
+      'by' => [
+        'word1' => '@count[2] word-by',
+        'word2' => implode(PoItem::DELIMITER, ['word-by', '@count[2] word-by']),
+      ],
+      'ru' => [
+        'word3' => '@count[2] word-ru',
+        'word4' => implode(PoItem::DELIMITER, ['word-ru', '@count[2] word-ru']),
+      ],
+    ];
+    return [
+      'no-plural' => [$translations, 'by', 'word1', FALSE],
+      'no-plural from other language' => [$translations, 'by', 'word3', FALSE],
+      'plural' => [$translations, 'by', 'word2', TRUE],
+      'plural from other language' => [$translations, 'by', 'word4', TRUE],
+    ];
+  }
+
+}

web/core/modules/locale/tests/src/Unit/LocaleTranslationTest.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace Drupal\Tests\locale\Unit;
+
+use Drupal\locale\LocaleTranslation;
+use Drupal\Tests\UnitTestCase;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+/**
+ * @coversDefaultClass \Drupal\locale\LocaleTranslation
+ * @group locale
+ */
+class LocaleTranslationTest extends UnitTestCase {
+
+  /**
+   * A mocked storage to use when instantiating LocaleTranslation objects.
+   *
+   * @var \PHPUnit\Framework\MockObject\MockObject
+   */
+  protected $storage;
+
+  /**
+   * A mocked language manager built from LanguageManagerInterface.
+   *
+   * @var \Drupal\Core\Language\LanguageManagerInterface|\PHPUnit\Framework\MockObject\MockObject
+   */
+  protected $languageManager;
+
+  /**
+   * The request stack.
+   *
+   * @var \Symfony\Component\HttpFoundation\RequestStack
+   */
+  protected $requestStack;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    $this->storage = $this->createMock('Drupal\locale\StringStorageInterface');
+    $this->cache = $this->createMock('Drupal\Core\Cache\CacheBackendInterface');
+    $this->lock = $this->createMock('Drupal\Core\Lock\LockBackendInterface');
+    $this->languageManager = $this->createMock('Drupal\Core\Language\LanguageManagerInterface');
+    $this->requestStack = new RequestStack();
+  }
+
+  /**
+   * Tests for \Drupal\locale\LocaleTranslation::destruct().
+   */
+  public function testDestruct() {
+    $translation = new LocaleTranslation($this->storage, $this->cache, $this->lock, $this->getConfigFactoryStub(), $this->languageManager, $this->requestStack);
+    // Prove that destruction works without errors when translations are empty.
+    $this->assertAttributeEmpty('translations', $translation);
+    $translation->destruct();
+  }
+
+}

web/core/modules/locale/tests/src/Unit/Menu/LocaleLocalTasksTest.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace Drupal\Tests\locale\Unit\Menu;
+
+use Drupal\Tests\Core\Menu\LocalTaskIntegrationTestBase;
+
+/**
+ * Tests locale local tasks.
+ *
+ * @group locale
+ */
+class LocaleLocalTasksTest extends LocalTaskIntegrationTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    $this->directoryList = [
+      'locale' => 'core/modules/locale',
+    ];
+    parent::setUp();
+  }
+
+  /**
+   * Checks locale listing local tasks.
+   *
+   * @dataProvider getLocalePageRoutes
+   */
+  public function testLocalePageLocalTasks($route) {
+    $tasks = [
+      0 => ['locale.translate_page', 'locale.translate_import', 'locale.translate_export', 'locale.settings'],
+    ];
+    $this->assertLocalTasks($route, $tasks);
+  }
+
+  /**
+   * Provides a list of routes to test.
+   */
+  public function getLocalePageRoutes() {
+    return [
+      ['locale.translate_page'],
+      ['locale.translate_import'],
+      ['locale.translate_export'],
+      ['locale.settings'],
+    ];
+  }
+
+}

web/core/modules/locale/tests/src/Unit/StringBaseTest.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\Tests\locale\Unit;
+
+use Drupal\locale\SourceString;
+use Drupal\locale\StringStorageException;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\locale\StringBase
+ * @group locale
+ */
+class StringBaseTest extends UnitTestCase {
+
+  /**
+   * @covers ::save
+   */
+  public function testSaveWithoutStorage() {
+    $string = new SourceString(['source' => 'test']);
+    $this->expectException(StringStorageException::class);
+    $this->expectExceptionMessage('The string cannot be saved because its not bound to a storage: test');
+    $string->save();
+  }
+
+  /**
+   * @covers ::delete
+   */
+  public function testDeleteWithoutStorage() {
+    $string = new SourceString(['lid' => 1, 'source' => 'test']);
+    $this->expectException(StringStorageException::class);
+    $this->expectExceptionMessage('The string cannot be deleted because its not bound to a storage: test');
+    $string->delete();
+  }
+
+}

web/core/modules/locale/tests/test.af.po

@@ -0,0 +1,13 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Drupal 8\\n"
+"MIME-Version: 1.0\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\\n"
+
+msgid "@site is currently under maintenance. We should be back shortly. Thank you for your patience."
+msgstr "Ons is tans besig met onderhoud op @site. Wees asseblief geduldig, ons sal binnekort weer terug wees."
+
+msgid "Locale can translate"
+msgstr "Locale can translate Afrikaans"

web/core/modules/locale/tests/test.de.po

@@ -0,0 +1,28 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Drupal 7\\n"
+"MIME-Version: 1.0\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\\n"
+
+msgid "Monday"
+msgstr "Montag"
+
+msgid "Tuesday"
+msgstr "Dienstag"
+
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+msgid "Thursday"
+msgstr "Donnerstag"
+
+msgid "Friday"
+msgstr "Freitag"
+
+msgid "Saturday"
+msgstr "Samstag"
+
+msgid "Sunday"
+msgstr "Sonntag"

web/core/modules/locale/tests/test.nl.po

@@ -0,0 +1,31 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Drupal 7\\n"
+"MIME-Version: 1.0\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\\n"
+
+msgid "Monday"
+msgstr "maandag"
+
+msgid "Tuesday"
+msgstr "dinsdag"
+
+msgid "Wednesday"
+msgstr "woensdag"
+
+msgid "Thursday"
+msgstr "donderdag"
+
+msgid "Extraday"
+msgstr "extra dag"
+
+msgid "Friday"
+msgstr "vrijdag"
+
+msgid "Saturday"
+msgstr "zaterdag"
+
+msgid "Sunday"
+msgstr "zondag"

web/core/modules/locale/tests/test.xx.po

@@ -0,0 +1,40 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Drupal 7\\n"
+"MIME-Version: 1.0\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\\n"
+
+msgid "Monday"
+msgstr "lundi"
+
+msgid "Tuesday"
+msgstr "mardi"
+
+msgid "Wednesday"
+msgstr "mercredi"
+
+msgid "Thursday"
+msgstr "jeudi"
+
+msgid "Friday"
+msgstr "vendredi"
+
+msgid "Saturday"
+msgstr "samedi"
+
+msgid "Sunday"
+msgstr "dimanche"
+
+msgid "Allowed HTML source string"
+msgstr "<strong>Allowed HTML translation string</strong>"
+
+msgid "Another allowed HTML source string"
+msgstr "<script>Disallowed HTML translation string</script>"
+
+msgid "Source string for multiline translation"
+msgstr ""
+"Multiline translation string "
+"to make sure that "
+"import works with it."