Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2667242 by Anul, felribeiro, eojthebrave, pranavbabbar: Use consistent terminology when referencing administration themes in the UI (not "admin theme")

8.2.x
xjm 2016-07-28 18:58:39 -05:00
parent 21a4b87099
commit e94c581e09
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Drupal/Core/Extension/ThemeInstaller.php
View File

@ -223,7 +223,7 @@ class ThemeInstaller implements ThemeInstallerInterface {
throw new \InvalidArgumentException("The current default theme $key cannot be uninstalled."); throw new \InvalidArgumentException("The current default theme $key cannot be uninstalled.");
} }
if ($key === $theme_config->get('admin')) { if ($key === $theme_config->get('admin')) {
throw new \InvalidArgumentException("The current admin theme $key cannot be uninstalled."); throw new \InvalidArgumentException("The current administration theme $key cannot be uninstalled.");
} }
// Base themes cannot be uninstalled if sub themes are installed, and if // Base themes cannot be uninstalled if sub themes are installed, and if
// they are not uninstalled at the same time. // they are not uninstalled at the same time.

2
core/modules/node/config/schema/node.schema.yml
View File

@ -6,7 +6,7 @@ node.settings:
mapping: mapping:
use_admin_theme: use_admin_theme:
type: boolean type: boolean
label: 'Use admin theme when editing or creating content' label: 'Use administration theme when editing or creating content'
node.type.*: node.type.*:
type: config_entity type: config_entity

2
core/modules/system/src/Controller/SystemController.php
View File

@ -307,7 +307,7 @@ class SystemController extends ControllerBase {
$theme->notes[] = $this->t('default theme'); $theme->notes[] = $this->t('default theme');
} }
if ($theme->is_admin) { if ($theme->is_admin) {
$theme->notes[] = $this->t('admin theme'); $theme->notes[] = $this->t('administration theme');
} }
// Sort installed and uninstalled themes into their own groups. // Sort installed and uninstalled themes into their own groups.

2
core/themes/seven/seven.info.yml
View File

@ -4,7 +4,7 @@
# As the UI of Drupal improves between minor versions, the mark up and assets # As the UI of Drupal improves between minor versions, the mark up and assets
# in the Seven theme will change. The Seven theme is not backwards # in the Seven theme will change. The Seven theme is not backwards
# compatible. If you wish to modify the output or assets of Seven you can: # compatible. If you wish to modify the output or assets of Seven you can:
# 1. Copy the whole of Seven and rename it as your own admin theme. You # 1. Copy the whole of Seven and rename it as your own administration theme. You
# will need to manually manage your own updates if you want to stay up to # will need to manually manage your own updates if you want to stay up to
# date with Seven's bug fixes and feature support. # date with Seven's bug fixes and feature support.
# #