diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationDateFormatUiTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationDateFormatUiTest.php index ceb69d0..4690e47 100644 --- a/core/modules/config_translation/src/Tests/ConfigTranslationDateFormatUiTest.php +++ b/core/modules/config_translation/src/Tests/ConfigTranslationDateFormatUiTest.php @@ -38,20 +38,20 @@ protected function setUp() { * Tests date format translation behaviour. */ public function testDateFormatUI() { - $this->drupalGet('admin/config/regional/date-time'); + $this->drupalGet('admin/config/regional/settings/date-time'); // Assert translation link unlocked date format. - $this->assertLinkByHref('admin/config/regional/date-time/formats/manage/medium/translate'); + $this->assertLinkByHref('admin/config/regional/settings/date-time/formats/manage/medium/translate'); // Assert translation link locked date format. - $this->assertLinkByHref('admin/config/regional/date-time/formats/manage/html_datetime/translate'); + $this->assertLinkByHref('admin/config/regional/settings/date-time/formats/manage/html_datetime/translate'); // Date pattern is visible on unlocked date formats. - $this->drupalGet('admin/config/regional/date-time/formats/manage/medium/translate/de/add'); + $this->drupalGet('admin/config/regional/settings/date-time/formats/manage/medium/translate/de/add'); $this->assertField('translation[config_names][core.date_format.medium][pattern]'); // Date pattern is not visible on locked date formats. - $this->drupalGet('admin/config/regional/date-time/formats/manage/html_datetime/translate/es/add'); + $this->drupalGet('admin/config/regional/settings/date-time/formats/manage/html_datetime/translate/es/add'); $this->assertNoField('translation[config_names][core.date_format.html_datetime][pattern]'); } diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php index 8bd3d71..c656105 100644 --- a/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php +++ b/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php @@ -439,9 +439,9 @@ public function doFieldListTest() { */ public function doDateFormatListTest() { // Get the date format listing. - $this->drupalGet('admin/config/regional/date-time'); + $this->drupalGet('admin/config/regional/settings/date-time'); - $translate_link = 'admin/config/regional/date-time/formats/manage/long/translate'; + $translate_link = 'admin/config/regional/settings/date-time/formats/manage/long/translate'; // Test if the link to translate the format is on the page. $this->assertLinkByHref($translate_link); diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationOverviewTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationOverviewTest.php index e7c58fd..04e1e2d 100644 --- a/core/modules/config_translation/src/Tests/ConfigTranslationOverviewTest.php +++ b/core/modules/config_translation/src/Tests/ConfigTranslationOverviewTest.php @@ -139,9 +139,9 @@ public function testHiddenEntities() { // configuration translation listings. Test a couple of them. $this->drupalGet('admin/config/regional/config-translation/date_format'); $this->assertText('HTML Date'); - $this->assertLinkByHref('admin/config/regional/date-time/formats/manage/html_date/translate'); + $this->assertLinkByHref('admin/config/regional/settings/date-time/formats/manage/html_date/translate'); $this->assertText('HTML Year'); - $this->assertLinkByHref('admin/config/regional/date-time/formats/manage/html_year/translate'); + $this->assertLinkByHref('admin/config/regional/settings/date-time/formats/manage/html_year/translate'); } /** diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php index b69357e..60d1076 100644 --- a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php +++ b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php @@ -439,10 +439,10 @@ public function testContactConfigEntityTranslation() { public function testDateFormatTranslation() { $this->drupalLogin($this->adminUser); - $this->drupalGet('admin/config/regional/date-time'); + $this->drupalGet('admin/config/regional/settings/date-time'); // Check for medium format. - $this->assertLinkByHref('admin/config/regional/date-time/formats/manage/medium'); + $this->assertLinkByHref('admin/config/regional/settings/date-time/formats/manage/medium'); // Save default language configuration for a new format. $edit = array( @@ -450,7 +450,7 @@ public function testDateFormatTranslation() { 'id' => 'custom_medium', 'date_format_pattern' => 'Y. m. d. H:i', ); - $this->drupalPostForm('admin/config/regional/date-time/formats/add', $edit, t('Add format')); + $this->drupalPostForm('admin/config/regional/settings/date-time/formats/add', $edit, t('Add format')); // Test translating a default shipped format and our custom format. $formats = array( @@ -458,7 +458,7 @@ public function testDateFormatTranslation() { 'custom_medium' => 'Custom medium date', ); foreach ($formats as $id => $label) { - $translation_base_url = 'admin/config/regional/date-time/formats/manage/' . $id . '/translate'; + $translation_base_url = 'admin/config/regional/settings/date-time/formats/manage/' . $id . '/translate'; $this->drupalGet($translation_base_url); diff --git a/core/modules/system/src/Tests/Common/FormatDateTest.php b/core/modules/system/src/Tests/Common/FormatDateTest.php index 36589ef..a0fd3bf 100644 --- a/core/modules/system/src/Tests/Common/FormatDateTest.php +++ b/core/modules/system/src/Tests/Common/FormatDateTest.php @@ -60,7 +60,7 @@ function testAdminDefinedFormatDate() { 'label' => 'Example Style', 'date_format_pattern' => 'j M y', ); - $this->drupalPostForm('admin/config/regional/date-time/formats/add', $edit, t('Add format')); + $this->drupalPostForm('admin/config/regional/settings/date-time/formats/add', $edit, t('Add format')); // Add a second date format with a different case than the first. $edit = array( @@ -68,7 +68,7 @@ function testAdminDefinedFormatDate() { 'label' => 'Example Style Uppercase', 'date_format_pattern' => 'j M Y', ); - $this->drupalPostForm('admin/config/regional/date-time/formats/add', $edit, t('Add format')); + $this->drupalPostForm('admin/config/regional/settings/date-time/formats/add', $edit, t('Add format')); $this->assertText(t('Custom date format added.')); $timestamp = strtotime('2007-03-10T00:00:00+00:00'); diff --git a/core/modules/system/src/Tests/System/AdminTest.php b/core/modules/system/src/Tests/System/AdminTest.php index 8921ad0..2dd52b3 100644 --- a/core/modules/system/src/Tests/System/AdminTest.php +++ b/core/modules/system/src/Tests/System/AdminTest.php @@ -83,7 +83,6 @@ function testAdminPages() { $this->drupalGet($page); $this->assertLinkByHref('admin/config'); $this->assertLinkByHref('admin/config/regional/settings'); - $this->assertLinkByHref('admin/config/regional/date-time'); $this->assertLinkByHref('admin/config/regional/language'); $this->assertNoLinkByHref('admin/config/regional/language/detection/session'); $this->assertNoLinkByHref('admin/config/regional/language/detection/url'); @@ -100,7 +99,6 @@ function testAdminPages() { $this->drupalGet($page); $this->assertLinkByHref('admin/config'); $this->assertNoLinkByHref('admin/config/regional/settings'); - $this->assertNoLinkByHref('admin/config/regional/date-time'); $this->assertNoLinkByHref('admin/config/regional/language'); $this->assertNoLinkByHref('admin/config/regional/language/detection/session'); $this->assertNoLinkByHref('admin/config/regional/language/detection/url'); diff --git a/core/modules/system/src/Tests/System/DateFormatsLockedTest.php b/core/modules/system/src/Tests/System/DateFormatsLockedTest.php index c8a0a67..0be565d 100644 --- a/core/modules/system/src/Tests/System/DateFormatsLockedTest.php +++ b/core/modules/system/src/Tests/System/DateFormatsLockedTest.php @@ -20,22 +20,22 @@ public function testDateLocking() { // Locked date formats are not linked on the listing page, locked date // formats are clearly marked as such; unlocked formats are not marked as // "locked". - $this->drupalGet('admin/config/regional/date-time'); - $this->assertLinkByHref('admin/config/regional/date-time/formats/manage/short'); - $this->assertNoLinkByHref('admin/config/regional/date-time/formats/manage/html_date'); + $this->drupalGet('admin/config/regional/settings/date-time'); + $this->assertLinkByHref('admin/config/regional/settings/date-time/formats/manage/short'); + $this->assertNoLinkByHref('admin/config/regional/settings/date-time/formats/manage/html_date'); $this->assertText('Fallback date format'); $this->assertNoText('short (locked)'); // Locked date formats are not editable. - $this->drupalGet('admin/config/regional/date-time/formats/manage/short'); + $this->drupalGet('admin/config/regional/settings/date-time/formats/manage/short'); $this->assertResponse(200); - $this->drupalGet('admin/config/regional/date-time/formats/manage/html_date'); + $this->drupalGet('admin/config/regional/settings/date-time/formats/manage/html_date'); $this->assertResponse(403); // Locked date formats are not deletable. - $this->drupalGet('admin/config/regional/date-time/formats/manage/short/delete'); + $this->drupalGet('admin/config/regional/settings/date-time/formats/manage/short/delete'); $this->assertResponse(200); - $this->drupalGet('admin/config/regional/date-time/formats/manage/html_date/delete'); + $this->drupalGet('admin/config/regional/settings/date-time/formats/manage/html_date/delete'); $this->assertResponse(403); } diff --git a/core/modules/system/src/Tests/System/DateFormatsMachineNameTest.php b/core/modules/system/src/Tests/System/DateFormatsMachineNameTest.php index a7c304a..6b8b479 100644 --- a/core/modules/system/src/Tests/System/DateFormatsMachineNameTest.php +++ b/core/modules/system/src/Tests/System/DateFormatsMachineNameTest.php @@ -33,7 +33,7 @@ public function testDateFormatsMachineNameAllowedValues() { 'id' => 'something.bad', 'date_format_pattern' => 'Y-m-d', ); - $this->drupalPostForm('admin/config/regional/date-time/formats/add', $edit, t('Add format')); + $this->drupalPostForm('admin/config/regional/settings/date-time/formats/add', $edit, t('Add format')); $this->assertText(t('The machine-readable name must be unique, and can only contain lowercase letters, numbers, and underscores. Additionally, it can not be the reserved word "custom".'), 'It is not possible to create a date format with the machine name that has any character other than lowercase letters, digits or underscore.'); // Try to create a date format with the reserved machine name "custom". @@ -42,7 +42,7 @@ public function testDateFormatsMachineNameAllowedValues() { 'id' => 'custom', 'date_format_pattern' => 'Y-m-d', ); - $this->drupalPostForm('admin/config/regional/date-time/formats/add', $edit, t('Add format')); + $this->drupalPostForm('admin/config/regional/settings/date-time/formats/add', $edit, t('Add format')); $this->assertText(t('The machine-readable name must be unique, and can only contain lowercase letters, numbers, and underscores. Additionally, it can not be the reserved word "custom".'), 'It is not possible to create a date format with the machine name "custom".'); // Try to create a date format with a machine name, "fallback", that @@ -52,7 +52,7 @@ public function testDateFormatsMachineNameAllowedValues() { 'id' => 'fallback', 'date_format_pattern' => 'j/m/Y', ); - $this->drupalPostForm('admin/config/regional/date-time/formats/add', $edit, t('Add format')); + $this->drupalPostForm('admin/config/regional/settings/date-time/formats/add', $edit, t('Add format')); $this->assertText(t('The machine-readable name is already in use. It must be unique.'), 'It is not possible to create a date format with the machine name "fallback". It is a built-in format that already exists.'); // Create a date format with a machine name distinct from the previous two. @@ -62,7 +62,7 @@ public function testDateFormatsMachineNameAllowedValues() { 'id' => $id, 'date_format_pattern' => 'd/m/Y', ); - $this->drupalPostForm('admin/config/regional/date-time/formats/add', $edit, t('Add format')); + $this->drupalPostForm('admin/config/regional/settings/date-time/formats/add', $edit, t('Add format')); $this->assertText(t('Custom date format added.'), 'It is possible to create a date format with a new machine name.'); // Try to create a date format with same machine name as the previous one. @@ -71,7 +71,7 @@ public function testDateFormatsMachineNameAllowedValues() { 'id' => $id, 'date_format_pattern' => 'd-m-Y', ); - $this->drupalPostForm('admin/config/regional/date-time/formats/add', $edit, t('Add format')); + $this->drupalPostForm('admin/config/regional/settings/date-time/formats/add', $edit, t('Add format')); $this->assertText(t('The machine-readable name is already in use. It must be unique.'), 'It is not possible to create a new date format with an existing machine name.'); } diff --git a/core/modules/system/src/Tests/System/DateTimeTest.php b/core/modules/system/src/Tests/System/DateTimeTest.php index 9ca050f..e4eea46 100644 --- a/core/modules/system/src/Tests/System/DateTimeTest.php +++ b/core/modules/system/src/Tests/System/DateTimeTest.php @@ -78,7 +78,7 @@ function testTimeZoneHandling() { */ function testDateFormatConfiguration() { // Confirm 'no custom date formats available' message appears. - $this->drupalGet('admin/config/regional/date-time'); + $this->drupalGet('admin/config/regional/settings/date-time'); // Add custom date format. $this->clickLink(t('Add format')); @@ -90,21 +90,21 @@ function testDateFormatConfiguration() { 'label' => $name, 'date_format_pattern' => $date_format, ); - $this->drupalPostForm('admin/config/regional/date-time/formats/add', $edit, t('Add format')); + $this->drupalPostForm('admin/config/regional/settings/date-time/formats/add', $edit, t('Add format')); $this->assertUrl(\Drupal::url('entity.date_format.collection', [], ['absolute' => TRUE]), [], 'Correct page redirection.'); $this->assertText(t('Custom date format added.'), 'Date format added confirmation message appears.'); $this->assertText($name, 'Custom date format appears in the date format list.'); $this->assertText(t('Delete'), 'Delete link for custom date format appears.'); // Edit the custom date format and re-save without editing the format. - $this->drupalGet('admin/config/regional/date-time'); + $this->drupalGet('admin/config/regional/settings/date-time'); $this->clickLink(t('Edit')); $this->drupalPostForm(NULL, NULL, t('Save format')); - $this->assertUrl('admin/config/regional/date-time', array('absolute' => TRUE), 'Correct page redirection.'); + $this->assertUrl('admin/config/regional/settings/date-time', array('absolute' => TRUE), 'Correct page redirection.'); $this->assertText(t('Custom date format updated.'), 'Custom date format successfully updated.'); // Edit custom date format. - $this->drupalGet('admin/config/regional/date-time'); + $this->drupalGet('admin/config/regional/settings/date-time'); $this->clickLink(t('Edit')); $edit = array( 'date_format_pattern' => 'Y m', @@ -115,7 +115,7 @@ function testDateFormatConfiguration() { // Delete custom date format. $this->clickLink(t('Delete')); - $this->drupalPostForm('admin/config/regional/date-time/formats/manage/' . $date_format_id . '/delete', array(), t('Delete')); + $this->drupalPostForm('admin/config/regional/settings/date-time/formats/manage/' . $date_format_id . '/delete', array(), t('Delete')); $this->assertUrl(\Drupal::url('entity.date_format.collection', [], ['absolute' => TRUE]), [], 'Correct page redirection.'); $this->assertRaw(t('The date format %format has been deleted.', array('%format' => $name)), 'Custom date format removed.'); @@ -132,7 +132,7 @@ function testDateFormatConfiguration() { 'label' => $name, 'date_format_pattern' => $date_format, ); - $this->drupalPostForm('admin/config/regional/date-time/formats/add', $edit, t('Add format')); + $this->drupalPostForm('admin/config/regional/settings/date-time/formats/add', $edit, t('Add format')); $this->assertUrl(\Drupal::url('entity.date_format.collection', [], ['absolute' => TRUE]), [], 'Correct page redirection.'); $this->assertText(t('Custom date format added.'), 'Date format added confirmation message appears.'); $this->assertText($name, 'Custom date format appears in the date format list.'); @@ -157,7 +157,7 @@ function testDateFormatConfiguration() { 'label' => $name, 'date_format_pattern' => $date_format, ); - $this->drupalPostForm('admin/config/regional/date-time/formats/add', $edit, t('Add format')); + $this->drupalPostForm('admin/config/regional/settings/date-time/formats/add', $edit, t('Add format')); $this->assertUrl(\Drupal::url('entity.date_format.collection', [], ['absolute' => TRUE]), [], 'Correct page redirection.'); $this->assertText(t('Custom date format added.'), 'Date format added confirmation message appears.'); $this->assertText($name, 'Custom date format appears in the date format list.'); diff --git a/core/modules/system/src/Tests/Update/UpdatePathRC1TestBaseFilledTest.php b/core/modules/system/src/Tests/Update/UpdatePathRC1TestBaseFilledTest.php index eb95fce..f0ba8de 100644 --- a/core/modules/system/src/Tests/Update/UpdatePathRC1TestBaseFilledTest.php +++ b/core/modules/system/src/Tests/Update/UpdatePathRC1TestBaseFilledTest.php @@ -262,9 +262,9 @@ public function testUpdatedSite() { $this->assertText('Spanish'); // Make sure our custom date format exists. - $this->drupalGet('admin/config/regional/date-time'); + $this->drupalGet('admin/config/regional/settings/date-time'); $this->assertText('Test date format'); - $this->drupalGet('admin/config/regional/date-time/formats/manage/test_date_format'); + $this->drupalGet('admin/config/regional/settings/date-time/formats/manage/test_date_format'); $this->assertOptionSelected('edit-langcode', 'es'); // Make sure our custom image style exists. diff --git a/core/modules/system/src/Tests/Update/UpdatePathTestBaseFilledTest.php b/core/modules/system/src/Tests/Update/UpdatePathTestBaseFilledTest.php index 6edbfe3..27619a3 100644 --- a/core/modules/system/src/Tests/Update/UpdatePathTestBaseFilledTest.php +++ b/core/modules/system/src/Tests/Update/UpdatePathTestBaseFilledTest.php @@ -262,9 +262,9 @@ public function testUpdatedSite() { $this->assertText('Spanish'); // Make sure our custom date format exists. - $this->drupalGet('admin/config/regional/date-time'); + $this->drupalGet('admin/config/regional/settings/date-time'); $this->assertText('Test date format'); - $this->drupalGet('admin/config/regional/date-time/formats/manage/test_date_format'); + $this->drupalGet('admin/config/regional/settings/date-time/formats/manage/test_date_format'); $this->assertOptionSelected('edit-langcode', 'es'); // Make sure our custom image style exists. diff --git a/core/modules/system/system.links.menu.yml b/core/modules/system/system.links.menu.yml index b5f9d87..bd30ba7 100644 --- a/core/modules/system/system.links.menu.yml +++ b/core/modules/system/system.links.menu.yml @@ -89,17 +89,11 @@ system.admin_config_regional: description: 'Configure regional settings, localization, and translation.' weight: -5 system.regional_settings: - title: 'Regional settings' + title: 'Regional and locale settings' parent: system.admin_config_regional - description: 'Configure the locale and timezone settings.' + description: 'Configure the locale and timezone settings, and how dates and times are displayed.' route_name: system.regional_settings weight: -20 -entity.date_format.collection: - title: 'Date and time formats' - parent: system.admin_config_regional - description: 'Configure how dates and times are displayed.' - route_name: entity.date_format.collection - weight: -9 system.admin_config_search: title: 'Search and metadata' route_name: system.admin_config_search diff --git a/core/modules/system/system.links.task.yml b/core/modules/system/system.links.task.yml index a151835..409f622 100644 --- a/core/modules/system/system.links.task.yml +++ b/core/modules/system/system.links.task.yml @@ -55,10 +55,16 @@ system.admin_index: title: 'Index' weight: -18 -entity.date_format.collection: +system.regional.settings: + route_name: system.regional_settings + base_route: system.regional_settings + title: 'Regional settings' + +system.regional.date_format: route_name: entity.date_format.collection - base_route: entity.date_format.collection - title: 'List' + base_route: system.regional_settings + title: 'Date and time formats' + entity.date_format.edit_form: title: 'Edit' route_name: entity.date_format.edit_form diff --git a/core/modules/system/system.routing.yml b/core/modules/system/system.routing.yml index 547b083..d4fccd3 100644 --- a/core/modules/system/system.routing.yml +++ b/core/modules/system/system.routing.yml @@ -194,7 +194,7 @@ system.regional_settings: path: '/admin/config/regional/settings' defaults: _form: 'Drupal\system\Form\RegionalForm' - _title: 'Regional settings' + _title: 'Regional and locale settings' requirements: _permission: 'administer site configuration' @@ -225,7 +225,7 @@ system.run_cron: _csrf_token: 'TRUE' entity.date_format.collection: - path: '/admin/config/regional/date-time' + path: '/admin/config/regional/settings/date-time' defaults: _entity_list: 'date_format' _title: 'Date and time formats' @@ -233,7 +233,7 @@ entity.date_format.collection: _permission: 'administer site configuration' system.date_format_add: - path: '/admin/config/regional/date-time/formats/add' + path: '/admin/config/regional/settings/date-time/formats/add' defaults: _entity_form: 'date_format.add' _title: 'Add date format' @@ -241,7 +241,7 @@ system.date_format_add: _permission: 'administer site configuration' entity.date_format.edit_form: - path: '/admin/config/regional/date-time/formats/manage/{date_format}' + path: '/admin/config/regional/settings/date-time/formats/manage/{date_format}' defaults: _entity_form: 'date_format.edit' _title: 'Edit date format' @@ -249,7 +249,7 @@ entity.date_format.edit_form: _entity_access: 'date_format.update' entity.date_format.delete_form: - path: '/admin/config/regional/date-time/formats/manage/{date_format}/delete' + path: '/admin/config/regional/settings/date-time/formats/manage/{date_format}/delete' defaults: _entity_form: 'date_format.delete' _title: 'Delete date format'