diff --git a/core/composer.json b/core/composer.json index e4130d8c81..acd62ae972 100644 --- a/core/composer.json +++ b/core/composer.json @@ -137,8 +137,8 @@ "drupal/menu_ui": "self.version", "drupal/migrate": "self.version", "drupal/migrate_drupal": "self.version", + "drupal/migrate_drupal_multilingual": "self.version", "drupal/migrate_drupal_ui": "self.version", - "drupal/migrate_drupal_i18n": "self.version", "drupal/node": "self.version", "drupal/options": "self.version", "drupal/page_cache": "self.version", diff --git a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemMaintenanceTranslationTest.php b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemMaintenanceTranslationTest.php index 8d64a7ba18..f67ba87dda 100644 --- a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemMaintenanceTranslationTest.php +++ b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemMaintenanceTranslationTest.php @@ -15,7 +15,7 @@ class MigrateSystemMaintenanceTranslationTest extends MigrateDrupal6TestBase { public static $modules = [ 'language', 'config_translation', - 'migrate_drupal_i18n', + 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemSiteTranslationTest.php b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemSiteTranslationTest.php index daaf538767..5e84616eb6 100644 --- a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemSiteTranslationTest.php +++ b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemSiteTranslationTest.php @@ -15,7 +15,7 @@ class MigrateSystemSiteTranslationTest extends MigrateDrupal6TestBase { public static $modules = [ 'language', 'config_translation', - 'migrate_drupal_i18n', + 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTranslationTest.php b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTranslationTest.php index 09e1d3dea9..c7a065091e 100644 --- a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTranslationTest.php +++ b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTranslationTest.php @@ -19,7 +19,7 @@ class MigrateUserConfigsTranslationTest extends MigrateDrupal6TestBase { 'language', 'locale', 'config_translation', - 'migrate_drupal_i18n', + 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserProfileFieldInstanceTranslationTest.php b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserProfileFieldInstanceTranslationTest.php index 9baec9e7d1..cd53f44ef9 100644 --- a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserProfileFieldInstanceTranslationTest.php +++ b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserProfileFieldInstanceTranslationTest.php @@ -20,7 +20,7 @@ class MigrateUserProfileFieldInstanceTranslationTest extends MigrateDrupal6TestB 'locale', 'language', 'field', - 'migrate_drupal_i18n', + 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/content_translation/migrations/d7_entity_translation_settings.yml b/core/modules/content_translation/migrations/d7_entity_translation_settings.yml index 1a8e526c3c..bd82446339 100644 --- a/core/modules/content_translation/migrations/d7_entity_translation_settings.yml +++ b/core/modules/content_translation/migrations/d7_entity_translation_settings.yml @@ -3,6 +3,7 @@ label: Drupal 7 Entity Translation settings migration_tags: - Drupal 7 - Configuration + - Multilingual source: plugin: d7_entity_translation_settings process: diff --git a/core/modules/content_translation/tests/src/Kernel/Migrate/d7/MigrateEntityTranslationSettingsTest.php b/core/modules/content_translation/tests/src/Kernel/Migrate/d7/MigrateEntityTranslationSettingsTest.php index 5fb6ddde60..10e22bd3ff 100644 --- a/core/modules/content_translation/tests/src/Kernel/Migrate/d7/MigrateEntityTranslationSettingsTest.php +++ b/core/modules/content_translation/tests/src/Kernel/Migrate/d7/MigrateEntityTranslationSettingsTest.php @@ -20,6 +20,7 @@ class MigrateEntityTranslationSettingsTest extends MigrateDrupal7TestBase { 'content_translation', 'language', 'menu_ui', + 'migrate_drupal_multilingual', 'node', 'taxonomy', 'text', diff --git a/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTranslationTest.php b/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTranslationTest.php index 87f516afdf..d590018749 100644 --- a/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTranslationTest.php +++ b/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTranslationTest.php @@ -20,7 +20,7 @@ class MigrateMenuLinkTranslationTest extends MigrateDrupal6TestBase { 'menu_link_content', 'language', 'content_translation', - 'migrate_drupal_i18n', + 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/migrate_drupal/migrate_drupal.install b/core/modules/migrate_drupal/migrate_drupal.install index 90b01a7558..bf498eb89d 100644 --- a/core/modules/migrate_drupal/migrate_drupal.install +++ b/core/modules/migrate_drupal/migrate_drupal.install @@ -26,9 +26,9 @@ function migrate_drupal_update_8502() { } /** - * Install migrate_drupal_i18n since migrate_drupal is installed. + * Install migrate_drupal_multilingual since migrate_drupal is installed. */ function migrate_drupal_update_8601() { $moduleInstaller = \Drupal::service('module_installer'); - $moduleInstaller->install(['migrate_drupal_i18n']); + $moduleInstaller->install(['migrate_drupal_multilingual']); } diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php index 5cdd7314ee..ca86ebe35a 100644 --- a/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php +++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php @@ -104,11 +104,13 @@ public static function create(ContainerInterface $container, array $configuratio public function checkRequirements() { if ($this->pluginDefinition['requirements_met'] === TRUE) { - // For i18n translations migrate_drupal_i18n must be enabled. - if (strpos($this->getSourceModule(), 'i18n') !== FALSE) { + // For entity and i18n translations migrate_drupal_multilingual must be + // enabled. + if ((in_array('Multilingual', $this->migration->getMigrationTags()) + || (strpos($this->getSourceModule(), 'i18n') !== FALSE))) { if (!\Drupal::service('module_handler') - ->moduleExists('migrate_drupal_i18n')) { - throw new RequirementsException("The module migrate_drupal_i18n is not enabled on the new site."); + ->moduleExists('migrate_drupal_multilingual')) { + throw new RequirementsException("The module migrate_drupal_multilingual is not enabled on the new site."); } } diff --git a/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.info.yml b/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.info.yml index ad5bc63965..c4d30dedf4 100644 --- a/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.info.yml +++ b/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.info.yml @@ -1,6 +1,6 @@ -name: 'Migrate Drupal i18n' +name: 'Migrate Drupal Multilingual' type: module -description: 'Provides a requirement for all i18n migrations.' +description: 'Provides a requirement for entity and i18n migrations.' package: 'Core (Experimental)' core: 8.x dependencies: diff --git a/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.module b/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.module index b050a47c95..bd361e925c 100644 --- a/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.module +++ b/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.module @@ -10,12 +10,12 @@ /** * Implements hook_help(). */ -function migrate_drupal_i18n_help($route_name, RouteMatchInterface $route_match) { +function migrate_drupal_multilingual_help($route_name, RouteMatchInterface $route_match) { switch ($route_name) { - case 'help.page.migrate_drupal_i18n': + case 'help.page.migrate_drupal_multilingual': $output = ''; $output .= '

' . t('About') . '

'; - $output .= '

' . t('The Migrate Drupal i18n module is a requirement for migrating i18n translations. It does not provide a user interface. For more information, see the online documentation for the Migrate Drupal i18n module.', [':migrate_drupal_i18n' => 'https://www.drupal.org/docs/8/core/modules/experimental-migrate-drupal-i18n']) . '

'; + $output .= '

' . t('The Migrate Drupal i18n module is a requirement for migrating entity and i18n translations. It does not provide a user interface. For more information, see the online documentation for the Migrate Drupal Multilingual module.', [':migrate_drupal_multilingual' => 'https://www.drupal.org/docs/8/core/modules/experimental-migrate-drupal-i18n']) . '

'; return $output; } } diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6I18nTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6I18nTest.php index da4e8365f9..1950b560c0 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6I18nTest.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6I18nTest.php @@ -20,7 +20,7 @@ class MigrateUpgrade6I18nTest extends MigrateUpgrade6Test { * @var array */ public static $modules = [ - 'migrate_drupal_i18n', + 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyVocabularyTranslationTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyVocabularyTranslationTest.php index ff6c4eaf1b..bed6a8fbd4 100644 --- a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyVocabularyTranslationTest.php +++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyVocabularyTranslationTest.php @@ -14,7 +14,11 @@ class MigrateTaxonomyVocabularyTranslationTest extends MigrateDrupal6TestBase { /** * {@inheritdoc} */ - public static $modules = ['language', 'taxonomy', 'migrate_drupal_i18n']; + public static $modules = [ + 'language', + 'taxonomy', + 'migrate_drupal_multilingual', + ]; /** * {@inheritdoc}