reverted: --- b/core/modules/locale/migration_templates/d7_locale_settings.yml +++ /dev/null @@ -1,15 +0,0 @@ -id: d7_locale_settings -label: Drupal 7 locale configuration -migration_tags: - - Drupal 7 -source: - plugin: variable - variables: - - locale_cache_strings - - locale_js_directory -process: - cache_strings: locale_cache_strings - 'javascript/directory': locale_js_directory -destination: - plugin: config - config_name: locale.settings reverted: --- b/core/modules/locale/src/Tests/Migrate/d7/MigrateLocaleSettingsTest.php +++ /dev/null @@ -1,42 +0,0 @@ -installConfig(static::$modules); - $this->loadDumps(['Variable.php']); - $this->executeMigration('d7_locale_settings'); - } - - /** - * Tests migration of Locale's settings to configuration. - */ - public function testMigration() { - $config = \Drupal::config('locale.settings')->get(); - $this->assertTrue($config['cache_strings']); - $this->assertIdentical('translations', $config['javascript']['directory']); - } - -} reverted: --- b/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php +++ a/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php @@ -197,12 +197,6 @@ 'name' => 'language_types', 'value' => 'a:3:{s:8:"language";b:1;s:16:"language_content";b:0;s:12:"language_url";b:0;}', ))->values(array( - 'name' => 'locale_cache_strings', - 'value' => 'b:1;', - ))->values(array( - 'name' => 'locale_js_directory', - 'value' => 's:12:"translations";', - ))->values(array( 'name' => 'maintenance_mode', 'value' => 'i:0;', ))->values(array( @@ -485,4 +479,4 @@ } } +#9023663998fea3fa823d287d8a53ab9f -#161e3e9bde1f566a8aacd6766886bbfb only in patch2: unchanged: --- a/core/modules/locale/migration_templates/d6_locale_settings.yml +++ b/core/modules/locale/migration_templates/locale_settings.yml @@ -1,7 +1,8 @@ -id: d6_locale_settings -label: Drupal 6 locale configuration +id: locale_settings +label: Locale configuration migration_tags: - Drupal 6 + - Drupal 7 source: plugin: variable variables: only in patch2: unchanged: --- a/core/modules/locale/src/Tests/Migrate/d6/MigrateLocaleConfigsTest.php +++ b/core/modules/locale/src/Tests/Migrate/MigrateLocaleConfigsTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\locale\Tests\Migrate\d6\MigrateLocaleConfigsTest. + * Contains \Drupal\locale\Tests\Migrate\MigrateLocaleConfigsTest. */ -namespace Drupal\locale\Tests\Migrate\d6; +namespace Drupal\locale\Tests\Migrate; use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; @@ -32,7 +32,7 @@ class MigrateLocaleConfigsTest extends MigrateDrupal6TestBase { protected function setUp() { parent::setUp(); $this->loadDumps(['Variable.php']); - $this->executeMigration('d6_locale_settings'); + $this->executeMigration('locale_settings'); } /**