diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 4cc6424..8451ed1 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -1322,6 +1322,12 @@ function template_preprocess_html(&$variables) { } } + // Early in the installer the site name is unknown. In this case we need to + // fallback to the distribution's name. + if (empty($head_title['name']) && drupal_installation_attempted() && function_exists('drupal_install_profile_distribution_name')) { + $head_title['name'] = drupal_install_profile_distribution_name(); + } + $variables['head_title'] = $head_title; // @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0. $variables['head_title_array'] = $head_title; diff --git a/core/modules/locale/src/LocaleConfigManager.php b/core/modules/locale/src/LocaleConfigManager.php index facdaeb..e67f3bc 100644 --- a/core/modules/locale/src/LocaleConfigManager.php +++ b/core/modules/locale/src/LocaleConfigManager.php @@ -603,12 +603,10 @@ public function updateConfigTranslations(array $names, array $langcodes = []) { $count++; } } - elseif (locale_is_translatable($langcode) && $name != 'system.site') { + elseif (locale_is_translatable($langcode)) { // If the language code is the active storage language, we should // update. If it is English, we should only update if English is also - // translatable. The system.site configuration is special because it - // is written during installation using the langcode at installation - // time. + // translatable. $active = NestedArray::mergeDeepArray([$active, $processed], TRUE); $this->saveTranslationActive($name, $active); $count++; diff --git a/core/modules/system/config/install/system.site.yml b/core/modules/system/config/install/system.site.yml index b5a932b..d1ab8de 100644 --- a/core/modules/system/config/install/system.site.yml +++ b/core/modules/system/config/install/system.site.yml @@ -1,5 +1,5 @@ uuid: '' -name: 'Drupal' +name: '' mail: '' slogan: '' page: