diff --git a/core/modules/system/src/Tests/Module/UninstallTest.php b/core/modules/system/src/Tests/Module/UninstallTest.php index a124fa1..4f5e193 100644 --- a/core/modules/system/src/Tests/Module/UninstallTest.php +++ b/core/modules/system/src/Tests/Module/UninstallTest.php @@ -61,7 +61,7 @@ function testUninstallPage() { // @see regression https://www.drupal.org/node/2512106 $this->assertRaw(''); - $this->assertText(\Drupal::translation()->translate('The following reason prevent Node from being uninstalled: There is content for the entity type: Content'), 'Content prevents uninstalling node module.'); + $this->assertText(\Drupal::translation()->translate('The following reason prevents Node from being uninstalled:')); $this->assertText(\Drupal::translation()->translate('There is content for the entity type: Content')); // Delete the node to allow node to be uninstalled. $node->delete(); diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc index 683904a..9577a49 100644 --- a/core/modules/system/system.admin.inc +++ b/core/modules/system/system.admin.inc @@ -316,9 +316,9 @@ function theme_system_modules_uninstall($variables) { ]; $disabled_reasons = drupal_render($disabled_reasons); $disabled_header = \Drupal::translation()->formatPlural(count($form['modules'][$module]['#validation_reasons']), - 'The following reason prevent @module from being uninstalled: @reasons', - 'The following reasons prevent @module from being uninstalled: @reasons', - array('@module' => $form['modules'][$module]['#module_name'], '@reasons' => implode('; ', $form['modules'][$module]['#validation_reasons']))); + 'The following reason prevents @module from being uninstalled:', + 'The following reasons prevent @module from being uninstalled:', + array('@module' => $form['modules'][$module]['#module_name'])); } $rows[] = array( array('data' => drupal_render($form['uninstall'][$module]), 'align' => 'center'),