only in patch2: unchanged: --- a/core/modules/locale/lib/Drupal/locale/Tests/LocaleTranslationTest.php +++ b/core/modules/locale/lib/Drupal/locale/Tests/LocaleTranslationTest.php @@ -62,7 +62,7 @@ function testStringTranslation() { // Add string. t($name, array(), array('langcode' => $langcode)); // Reset locale cache. - locale_reset(); + drupal_container()->get('locale.translation')->reset(); $this->assertRaw('"edit-site-default-' . $langcode .'"', t('Language code found.')); $this->assertText(t($name), t('Test language added.')); $this->drupalLogout(); @@ -137,7 +137,7 @@ function testStringTranslation() { // 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. - locale_reset(); + drupal_container()->get('locale.translation')->reset(); // Now we should get the proper fresh translation from t(). $this->assertTrue($name != $translation_to_en && t($name, array(), array('langcode' => 'en')) == $translation_to_en, t('t() works for English.')); $this->assertTrue(t($name, array(), array('langcode' => LANGUAGE_SYSTEM)) == $name, t('t() works for LANGUAGE_SYSTEM.')); @@ -352,7 +352,7 @@ function testStringSearch() { // Add string. t($name, array(), array('langcode' => $langcode)); // Reset locale cache. - locale_reset(); + drupal_container()->get('locale.translation')->reset(); $this->drupalLogout(); // Search for the name.