diff -u b/core/modules/config_translation/migration_templates/d6_i18n_user_profile_field_instance.yml b/core/modules/config_translation/migration_templates/d6_i18n_user_profile_field_instance.yml --- b/core/modules/config_translation/migration_templates/d6_i18n_user_profile_field_instance.yml +++ b/core/modules/config_translation/migration_templates/d6_i18n_user_profile_field_instance.yml @@ -1,4 +1,4 @@ -id: i18n_user_profile_field_instance +id: d6_i18n_user_profile_field_instance label: User profile field instance configuration migration_tags: - Drupal 6 diff -u b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nUserProfileFieldInstanceTest.php b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nUserProfileFieldInstanceTest.php --- b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nUserProfileFieldInstanceTest.php +++ b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nUserProfileFieldInstanceTest.php @@ -24,7 +24,7 @@ $this->executeMigrations([ 'user_profile_field', 'user_profile_field_instance', - 'i18n_user_profile_field_instance', + 'd6_i18n_user_profile_field_instance', ]); } diff -u b/core/modules/migrate/src/Plugin/migrate/destination/EntityConfigBase.php b/core/modules/migrate/src/Plugin/migrate/destination/EntityConfigBase.php --- b/core/modules/migrate/src/Plugin/migrate/destination/EntityConfigBase.php +++ b/core/modules/migrate/src/Plugin/migrate/destination/EntityConfigBase.php @@ -121,11 +121,11 @@ * The row object to update from. */ protected function updateEntity(EntityInterface $entity, Row $row) { - // If this row has a language code and it is not the default language + // If this row has a language code and it is not the active language // and the language manager is configurable then this is a row with a // translation string. if ($row->hasDestinationProperty('langcode') && - ($row->getDestinationProperty('langcode') != $this->languageManager->getDefaultLanguage()->getId()) && + ($row->getDestinationProperty('langcode') != $this->languageManager->getCurrentLanguage()->getId()) && ($this->languageManager instanceof ConfigurableLanguageManagerInterface)) { $config = $entity->getConfigDependencyName(); $config_override = $this->languageManager->getLanguageConfigOverride($row->getDestinationProperty('langcode'), $config);