commit 5e3f12dbc17db240a999a50e985a3fbf56631ae1 Author: Joel Pittet Date: Mon Oct 5 11:59:54 2015 -0700 further tidy up diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc index 939a736..d04be99 100644 --- a/core/modules/system/system.admin.inc +++ b/core/modules/system/system.admin.inc @@ -298,8 +298,6 @@ function template_preprocess_system_modules_uninstall(&$variables) { $form = $variables['form']; $variables['modules'] = []; - $variables['empty'] = t('No modules are available to uninstall.'); - // Iterate through all the modules, which are children of this element. foreach (Element::children($form['modules']) as $key) { $module = $form['modules'][$key]; @@ -310,7 +308,8 @@ function template_preprocess_system_modules_uninstall(&$variables) { if (!empty($module['#validation_reasons'])) { $module['validation_reasons'] = $module['#validation_reasons']; $module['reasons_count'] = count($module['validation_reasons']); - } else { + } + else { $module['reasons_count'] = 0; } if (!empty($module['#required_by'])) { @@ -322,7 +321,7 @@ function template_preprocess_system_modules_uninstall(&$variables) { '#items' => $module['#required_by'], '#context' => ['list_style' => 'comma-list'], ]; - $module['required_by'] = t('Required by @module-list', array('@module-list' => $renderer->render($required_by))); + $module['required_by'] = $renderer->render($required_by); $module['reasons_count'] = $module['reasons_count'] + 1; } $module['attributes'] = new Attribute($module['#attributes']); diff --git a/core/modules/system/templates/system-modules-uninstall.html.twig b/core/modules/system/templates/system-modules-uninstall.html.twig index b1a98bc..be7cf53 100644 --- a/core/modules/system/templates/system-modules-uninstall.html.twig +++ b/core/modules/system/templates/system-modules-uninstall.html.twig @@ -25,15 +25,9 @@ - - - + + + @@ -60,7 +54,7 @@
  • {{ reason }}
  • {% endfor %} {% if module.required_by %} -
  • {{ module.required_by }}
  • +
  • {{ 'Required by: @module-list'|t({'@module-list': module.required_by}) }}
  • {% endif %} @@ -70,7 +64,7 @@ {% else %} - + {% endfor %}
    - {{ 'Uninstall'|t }} - - {{ 'Name'|t }} - - {{ 'Description'|t }} - {{ 'Uninstall'|t }}{{ 'Name'|t }}{{ 'Description'|t }}
    {{ empty }}{{ 'No modules are available to uninstall.'|t }}