only in patch2: unchanged: --- a/core/modules/locale/lib/Drupal/locale/Tests/LocaleImportFunctionalTest.php +++ b/core/modules/locale/lib/Drupal/locale/Tests/LocaleImportFunctionalTest.php @@ -111,7 +111,7 @@ function testStandalonePoFile() { 'langcode' => 'fr', 'translation' => 'translated', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('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. @@ -133,7 +133,7 @@ function testStandalonePoFile() { 'langcode' => 'fr', 'translation' => 'translated', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('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::state()->get('locale.translation.plurals') ?: array(); @@ -169,7 +169,7 @@ function testStandalonePoFile() { 'langcode' => 'fr', 'translation' => 'translated', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('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 @@ -188,7 +188,7 @@ function testStandalonePoFile() { 'langcode' => 'fr', 'translation' => 'translated', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('admin/config/regional/translate', $search, t('Filter')); $this->assertNoText(t('No strings available.'), 'Customized string overwritten by imported string.'); } @@ -233,7 +233,7 @@ function testEmptyMsgstr() { 'langcode' => $langcode, 'translation' => 'untranslated', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('admin/config/regional/translate', $search, t('Filter')); $this->assertText($str, 'Search found the string as untranslated.'); } @@ -287,7 +287,7 @@ function testConfigPoFile() { 'langcode' => $langcode, 'translation' => 'all', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('admin/config/regional/translate', $search, t('Filter')); $this->assertText($config_string[1], format_string('Translation of @string found.', array('@string' => $config_string[0]))); } only in patch2: unchanged: --- a/core/modules/locale/lib/Drupal/locale/Tests/LocaleTranslationUiTest.php +++ b/core/modules/locale/lib/Drupal/locale/Tests/LocaleTranslationUiTest.php @@ -39,7 +39,7 @@ function testEnglishTranslation() { $this->drupalLogin($admin_user); $this->drupalPost('admin/config/regional/language/edit/en', array('locale_translate_english' => TRUE), t('Save language')); - $this->assertLinkByHref('/admin/config/regional/translate/translate?langcode=en', 0, 'Enabled interface translation to English.'); + $this->assertLinkByHref('/admin/config/regional/translate?langcode=en', 0, 'Enabled interface translation to English.'); } /** @@ -87,7 +87,7 @@ function testStringTranslation() { 'langcode' => $langcode, 'translation' => 'untranslated', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('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. @@ -105,7 +105,7 @@ function testStringTranslation() { $this->drupalPost('admin/config/regional/language/edit/en', array('locale_translate_english' => TRUE), t('Save language')); $this->drupalLogout(); $this->drupalLogin($translate_user); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('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. @@ -114,15 +114,15 @@ function testStringTranslation() { $edit = array( $lid => $translation, ); - $this->drupalPost('admin/config/regional/translate/translate', $edit, t('Save translations')); + $this->drupalPost('admin/config/regional/translate', $edit, t('Save translations')); $this->assertText(t('The strings have been saved.'), 'The strings have been saved.'); - $this->assertEqual($this->getUrl(), url('admin/config/regional/translate/translate', array('absolute' => TRUE)), 'Correct page redirection.'); + $this->assertEqual($this->getUrl(), url('admin/config/regional/translate', array('absolute' => TRUE)), 'Correct page redirection.'); $search = array( 'string' => $name, 'langcode' => $langcode, 'translation' => 'translated', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('admin/config/regional/translate', $search, t('Filter')); $this->assertRaw($translation, 'Non-English translation properly saved.'); @@ -131,19 +131,19 @@ function testStringTranslation() { 'langcode' => 'en', 'translation' => 'untranslated', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('admin/config/regional/translate', $search, t('Filter')); $textarea = current($this->xpath('//textarea')); $lid = (string) $textarea[0]['name']; $edit = array( $lid => $translation_to_en, ); - $this->drupalPost('admin/config/regional/translate/translate', $edit, t('Save translations')); + $this->drupalPost('admin/config/regional/translate', $edit, t('Save translations')); $search = array( 'string' => $name, 'langcode' => 'en', 'translation' => 'translated', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('admin/config/regional/translate', $search, t('Filter')); $this->assertRaw($translation_to_en, 'English translation properly saved.'); // Reset the tag cache on the tester side in order to pick up the call to @@ -164,7 +164,7 @@ function testStringTranslation() { 'langcode' => 'en', 'translation' => 'untranslated', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('admin/config/regional/translate', $search, t('Filter')); $this->assertText(t('No strings available.'), 'String is translated.'); $this->drupalLogout(); @@ -190,14 +190,14 @@ function testStringTranslation() { 'langcode' => 'en', 'translation' => 'translated', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('admin/config/regional/translate', $search, t('Filter')); // Assume this is the only result, given the random name. $textarea = current($this->xpath('//textarea')); $lid = (string) $textarea[0]['name']; $edit = array( $lid => '', ); - $this->drupalPost('admin/config/regional/translate/translate', $edit, t('Save translations')); + $this->drupalPost('admin/config/regional/translate', $edit, t('Save translations')); $this->assertRaw($name, 'The strings have been saved.'); $this->drupalLogin($translate_user); $search = array( @@ -205,7 +205,7 @@ function testStringTranslation() { 'langcode' => 'en', 'translation' => 'untranslated', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('admin/config/regional/translate', $search, t('Filter')); $this->assertNoText(t('No strings available.'), 'The translation has been removed'); } @@ -248,14 +248,14 @@ function testJavaScriptTranslation() { 'langcode' => $langcode, 'translation' => 'all', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('admin/config/regional/translate', $search, t('Filter')); $textarea = current($this->xpath('//textarea')); $lid = (string) $textarea[0]['name']; $edit = array( $lid => $this->randomName(), ); - $this->drupalPost('admin/config/regional/translate/translate', $edit, t('Save translations')); + $this->drupalPost('admin/config/regional/translate', $edit, t('Save translations')); // Trigger JavaScript translation parsing and building. _locale_rebuild_js($langcode); @@ -311,7 +311,7 @@ function testStringValidation() { 'langcode' => $langcode, 'translation' => 'all', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('admin/config/regional/translate', $search, t('Filter')); // Find the edit path. $textarea = current($this->xpath('//textarea')); @@ -320,7 +320,7 @@ function testStringValidation() { $edit = array( $lid => $translation, ); - $this->drupalPost('admin/config/regional/translate/translate', $edit, t('Save translations')); + $this->drupalPost('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->assertNotIdentical(FALSE, strpos($form_class[0], 'error'), 'The string was rejected as unsafe.'); @@ -380,7 +380,7 @@ function testStringSearch() { 'langcode' => $langcode, 'translation' => 'all', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('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. @@ -393,7 +393,7 @@ function testStringSearch() { 'langcode' => $langcode, 'translation' => 'translated', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('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 @@ -403,7 +403,7 @@ function testStringSearch() { 'langcode' => $langcode, 'translation' => 'untranslated', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('admin/config/regional/translate', $search, t('Filter')); $this->assertNoText(t('No strings available.'), 'Search found the string.'); // Add translation. @@ -414,7 +414,7 @@ function testStringSearch() { $edit = array( $lid => $translation, ); - $this->drupalPost('admin/config/regional/translate/translate', $edit, t('Save translations')); + $this->drupalPost('admin/config/regional/translate', $edit, t('Save translations')); // Ensure translated string does appear if searching on 'only // translated strings'. @@ -423,7 +423,7 @@ function testStringSearch() { 'langcode' => $langcode, 'translation' => 'translated', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('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 @@ -433,7 +433,7 @@ function testStringSearch() { 'langcode' => $langcode, 'translation' => 'untranslated', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('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 @@ -443,7 +443,7 @@ function testStringSearch() { 'langcode' => $langcode, 'translation' => 'untranslated', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('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. @@ -452,7 +452,7 @@ function testStringSearch() { 'langcode' => $langcode, 'translation' => 'all', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('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). @@ -461,7 +461,7 @@ function testStringSearch() { 'langcode' => 'yy', 'translation' => 'all', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('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. @@ -471,7 +471,7 @@ function testStringSearch() { 'langcode' => $langcode, 'translation' => 'all', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('admin/config/regional/translate', $search, t('Filter')); $this->assertText(t('No strings available.'), "Search didn't find the invalid string."); } @@ -508,7 +508,7 @@ function testUICustomizedStrings(){ 'translation' => 'translated', 'customized' => '0', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('admin/config/regional/translate', $search, t('Filter')); $source = $this->assertText($translation->getString(), 'Translation is found in search result.'); @@ -518,7 +518,7 @@ function testUICustomizedStrings(){ $edit = array( $lid => $translation->getString(), ); - $this->drupalPost('admin/config/regional/translate/translate', $edit, t('Save translations')); + $this->drupalPost('admin/config/regional/translate', $edit, t('Save translations')); // Ensure unchanged translation string does appear if searching non-customized translation. $search = array( @@ -527,7 +527,7 @@ function testUICustomizedStrings(){ 'translation' => 'translated', 'customized' => '0', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('admin/config/regional/translate', $search, t('Filter')); $source = $this->assertText($string->getString(), 'Translation is not marked as customized.'); // Submit the translations with a new translation. @@ -536,7 +536,7 @@ function testUICustomizedStrings(){ $edit = array( $lid => $this->randomName(100), ); - $this->drupalPost('admin/config/regional/translate/translate', $edit, t('Save translations')); + $this->drupalPost('admin/config/regional/translate', $edit, t('Save translations')); // Ensure changed translation string does appear if searching customized translation. $search = array( @@ -545,7 +545,7 @@ function testUICustomizedStrings(){ 'translation' => 'translated', 'customized' => '1', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('admin/config/regional/translate', $search, t('Filter')); $this->assertText($string->getString(), "Translation is marked as customized."); } } only in patch2: unchanged: --- a/core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateTest.php +++ b/core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateTest.php @@ -452,7 +452,7 @@ function testEnableCustomLanguage() { 'langcode' => $langcode, 'translation' => 'translated', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('admin/config/regional/translate', $search, t('Filter')); $this->assertNoText(t('No strings available.'), 'String successfully imported.'); // Ensure the multiline string was imported. @@ -461,7 +461,7 @@ function testEnableCustomLanguage() { 'langcode' => $langcode, 'translation' => 'all', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('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 @@ -472,7 +472,7 @@ function testEnableCustomLanguage() { 'langcode' => $langcode, 'translation' => 'all', ); - $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->drupalPost('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.'); }