Issue #3175729 by quietone, Pooja Ganjage, Wim Leers, benjifisher, catch: Mark...

Issue #3175729 by quietone, Pooja Ganjage, Wim Leers, benjifisher, catch: Mark i18n migrations as finished

core/modules/config_translation/migrations/state/config_translation.migrate_drupal.yml

 finished:
   6:
-    i18nprofile: config_translation
-  7:
-    i18n_variable: config_translation
-    i18n_taxonomy: config_translation
-    i18n_menu: config_translation
-not_finished:
-  6:
-    # language content comment settings.
-    locale: language
-    # @TODO: Move to finished when remaining Drupal 6 i18n issues are resolved.
-    # See https://www.drupal.org/project/drupal/issues/2208401
     i18n: config_translation
-    # field labels and descriptions, synchronized fields.
+    i18nblocks: config_translation
     i18ncck: config_translation
-    # Block, menu, taxonomy, User profiles.
+    i18nprofile: config_translation
     i18nstrings: config_translation
     i18ntaxonomy: config_translation
-  7:
-    # language content comment settings.
     locale: language
-    # @TODO: Move to finished when remaining Drupal 7 i18n issues are resolved.
-    # See https://www.drupal.org/project/drupal/issues/2208401
+  7:
     i18n: config_translation
-    # field labels and descriptions, field options.
+    i18n_block: config_translation
     i18n_field: config_translation
+    i18n_menu: config_translation
     i18n_string: config_translation
+    i18n_taxonomy: config_translation
+    i18n_variable: config_translation
+    locale: language

core/modules/content_translation/migrations/state/content_translation.migrate_drupal.yml

 finished:
   6:
+    i18n: content_translation
     i18nblocks:
       - block
       - block_content
       - content_translation
+    i18ncontent: content_translation
     i18nmenu:
       - content_translation
       - menu_link_content
+    i18npoll: content_translation
+    i18nstrings: content_translation
+    i18nsync: content_translation
+    i18ntaxonomy: content_translation
     locale: content_translation
     menu: content_translation
   # Node revision translations.
@@ -15,6 +21,7 @@ finished:
     taxonomy: content_translation
   7:
     entity_translation: content_translation
+    i18n: content_translation
     i18n_block:
       - block
       - block_content
@@ -23,21 +30,8 @@ finished:
     menu: content_translation
     # menu links.
     i18n_menu: content_translation
+    i18n_string: content_translation
+    i18n_taxonomy: content_translation
     statistics: statistics
     # Node revision translations.
     node: content_translation
-not_finished:
-  # Also D6 and D7 node revision translations.
-  6:
-    # @TODO: Move to finished when remaining Drupal 6 i18n issues are resolved.
-    # See https://www.drupal.org/project/drupal/issues/2208401
-    i18n: content_translation
-    # Taxonomy term references.
-    i18ntaxonomy: content_translation
-  7:
-    # @TODO: Move to finished when remaining Drupal 7 i18n issues are resolved.
-    # See https://www.drupal.org/project/drupal/issues/2208401
-    i18n: content_translation
-    # @TODO: Remove when taxonomy term field translations are migrated.
-    # See https://www.drupal.org/project/drupal/issues/3073050
-    i18n_taxonomy: content_translation

core/modules/migrate_drupal/migrations/state/migrate_drupal.migrate_drupal.yml

@@ -28,11 +28,6 @@ finished:
     fieldgroup: core
     filefield_meta: core
     help: core
-    # i18n modules require content_translation.
-    i18ncontent: content_translation
-    i18npoll: content_translation
-    i18nstrings: content_translation
-    i18nsync: content_translation
     imageapi: core
     imageapi_gd: core
     imageapi_imagemagick: core

core/modules/migrate_drupal_ui/tests/src/Functional/d6/MultilingualReviewPageTest.php

@@ -61,6 +61,7 @@ protected function getAvailablePaths() {
       'Blog',
       'Blog API',
       'Book',
+      'CCK translation',
       'Calendar Signup',
       'Color',
       'Comment',
@@ -96,7 +97,9 @@ protected function getAvailablePaths() {
       'ImageCache',
       'ImageCache UI',
       'ImageField',
+      'Internationalization',
       'Link',
+      'Locale',
       'Menu',
       'Menu translation',
       'Node',
@@ -115,9 +118,11 @@ protected function getAvailablePaths() {
       'Profile translation',
       'Search',
       'Statistics',
+      'String translation',
       'Synchronize translations',
       'Syslog',
       'System',
+      'Taxonomy translation',
       'Taxonomy',
       'Text',
       'Throttle',
@@ -142,14 +147,9 @@ protected function getMissingPaths() {
     return [
       // Block is set not_finished in migrate_state_not_finished_test.
       'Block',
-      'CCK translation',
       'Devel',
       'Devel generate',
       'Devel node access',
-      'Internationalization',
-      'Locale',
-      'String translation',
-      'Taxonomy translation',
       'Views',
       'Views translation',
       'migrate_status_active_test',

core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php

@@ -142,6 +142,7 @@ protected function getAvailablePaths() {
       'Block',
       'Block translation',
       'Book',
+      'CCK translation',
       'Comment',
       'Contact',
       'Content',
@@ -154,6 +155,8 @@ protected function getAvailablePaths() {
       'Forum',
       'ImageCache',
       'ImageField',
+      'Internationalization',
+      'Locale',
       'Menu',
       'Menu translation',
       'Node',
@@ -163,9 +166,11 @@ protected function getAvailablePaths() {
       'Profile translation',
       'Search',
       'Statistics',
+      'String translation',
       'Synchronize translations',
       'System',
       'Taxonomy',
+      'Taxonomy translation',
       'Text',
       'Update status',
       'Upload',
@@ -188,13 +193,7 @@ protected function getAvailablePaths() {
    * {@inheritdoc}
    */
   protected function getMissingPaths() {
-    return [
-      'CCK translation',
-      'Internationalization',
-      'Locale',
-      'String translation',
-      'Taxonomy translation',
-    ];
+    return [];
   }
 
   /**

core/modules/migrate_drupal_ui/tests/src/Functional/d7/MultilingualReviewPageTest.php

@@ -92,6 +92,7 @@ protected function getAvailablePaths() {
       'Forum',
       'Help',
       'Image',
+      'Internationalization',
       'Link',
       'List',
       'Locale',
@@ -113,10 +114,12 @@ protected function getAvailablePaths() {
       'Search embedded form',
       'Shortcut',
       'Statistics',
+      'String translation',
       'Stylizer',
       'Synchronize translations',
       'Syslog',
       'System',
+      'Taxonomy translation',
       'Taxonomy',
       'Term Depth access',
       'Test search node tags',
@@ -152,14 +155,11 @@ protected function getMissingPaths() {
       // Flexslider_picture is a sub module of Picture module. Only the
       // styles from picture are migrated.
       'FlexSlider Picture',
-      'Internationalization',
       'Multilingual content',
       'Multilingual forum',
       'Multilingual select',
       'Path translation',
       'Picture',
-      'String translation',
-      'Taxonomy translation',
       'Translation redirect',
       'Translation sets',
       'User mail translation',

core/modules/migrate_drupal_ui/tests/src/Functional/d7/NoMultilingualReviewPageTest.php

@@ -77,14 +77,17 @@ protected function getAvailablePaths() {
       'Entity Translation',
       'Entity feature module',
       'Entity tokens',
+      'Field translation',
       'Field',
       'Field SQL storage',
       'File',
       'Filter',
       'Forum',
       'Image',
+      'Internationalization',
       'Link',
       'List',
+      'Locale',
       'Menu',
       'Menu translation',
       'Node',
@@ -102,9 +105,11 @@ protected function getAvailablePaths() {
       'Search embedded form',
       'Shortcut',
       'Statistics',
+      'String translation',
       'Stylizer',
       'Synchronize translations',
       'System',
+      'Taxonomy translation',
       'Taxonomy',
       'Term Depth access',
       'Test search node tags',
@@ -147,17 +152,12 @@ protected function getMissingPaths() {
       'Contact translation',
       'Entity Translation Menu',
       'Entity Translation Upgrade',
-      'Field translation',
       'FlexSlider Picture',
-      'Internationalization',
-      'Locale',
       'Multilingual content',
       'Multilingual forum',
       'Multilingual select',
       'Path translation',
       'Picture',
-      'String translation',
-      'Taxonomy translation',
       'Translation redirect',
       'Translation sets',
       'User mail translation',

core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php

@@ -151,11 +151,14 @@ protected function getAvailablePaths() {
       'Entity Reference',
       'Entity Translation',
       'Field SQL storage',
+      'Field translation',
       'Field',
       'File',
       'Filter',
       'Forum',
       'Image',
+      'Internationalization',
+      'Locale',
       'Link',
       'List',
       'Menu',
@@ -169,8 +172,10 @@ protected function getAvailablePaths() {
       'Search',
       'Shortcut',
       'Statistics',
+      'String translation',
       'Synchronize translations',
       'System',
+      'Taxonomy translation',
       'Taxonomy',
       'Text',
       'Title',
@@ -196,11 +201,6 @@ protected function getAvailablePaths() {
    */
   protected function getMissingPaths() {
     return [
-      'Field translation',
-      'Internationalization',
-      'Locale',
-      'String translation',
-      'Taxonomy translation',
       'Translation sets',
       'Variable realm',
       'Variable store',