diff --git a/core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php b/core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php index 3d3dfc7..797f63d 100644 --- a/core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php +++ b/core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php @@ -71,7 +71,21 @@ public function getConfirmText() { * {@inheritdoc} */ public function getCancelPath() { - return 'admin/config/regional/date-time'; + return 'admin/config/regional/settings/date-time/formats'; + } + + /** + * {@inheritdoc} + * + * @param string $format_id + * The date format ID. + */ + public function buildForm(array $form, array &$form_state, $format_id = NULL) { + // We don't get the format ID in the returned format array. + $this->formatID = $format_id; + $this->format = $this->configFactory->get('system.date')->get("formats.$format_id"); + + return parent::buildForm($form, $form_state); } /** @@ -81,7 +95,7 @@ public function submit(array $form, array &$form_state) { $this->entity->delete(); drupal_set_message(t('Removed date format %format.', array('%format' => $this->entity->label()))); - $form_state['redirect'] = 'admin/config/regional/date-time'; + $form_state['redirect'] = 'admin/config/regional/settings/date-time/formats'; } } diff --git a/core/modules/system/lib/Drupal/system/Form/DateFormatFormBase.php b/core/modules/system/lib/Drupal/system/Form/DateFormatFormBase.php index d6aac67..a311453 100644 --- a/core/modules/system/lib/Drupal/system/Form/DateFormatFormBase.php +++ b/core/modules/system/lib/Drupal/system/Form/DateFormatFormBase.php @@ -179,7 +179,7 @@ public function form(array $form, array &$form_state) { ); } - return parent::form($form, $form_state); + return parent::form($form, $form_state); } /** @@ -208,7 +208,7 @@ public function validate(array $form, array &$form_state) { * {@inheritdoc} */ public function submit(array $form, array &$form_state) { - $form_state['redirect'] = 'admin/config/regional/date-time'; + $form_state['redirect'] = 'admin/config/regional/settings/date-time/formats'; $form_state['values']['pattern'][$this->patternType] = trim($form_state['values']['date_format_pattern']); parent::submit($form, $form_state); diff --git a/core/modules/system/lib/Drupal/system/Form/DateFormatLocalizeResetForm.php b/core/modules/system/lib/Drupal/system/Form/DateFormatLocalizeResetForm.php index d3de481..75e5092 100644 --- a/core/modules/system/lib/Drupal/system/Form/DateFormatLocalizeResetForm.php +++ b/core/modules/system/lib/Drupal/system/Form/DateFormatLocalizeResetForm.php @@ -74,8 +74,8 @@ public function getConfirmText() { /** * {@inheritdoc} */ - public function getCancelPath() { - return 'admin/config/regional/date-time/locale'; + protected function getCancelPath() { + return 'admin/config/regional/settings/date-time/locale'; } /** @@ -106,7 +106,7 @@ public function submitForm(array &$form, array &$form_state) { $this->configFactory->get($config_id)->delete(); } - $form_state['redirect'] = 'admin/config/regional/date-time/locale'; + $form_state['redirect'] = 'admin/config/regional/settings/date-time/locale'; } } diff --git a/core/modules/system/lib/Drupal/system/Form/RegionalForm.php b/core/modules/system/lib/Drupal/system/Form/RegionalForm.php index 5bb5b2b..4469eaa 100644 --- a/core/modules/system/lib/Drupal/system/Form/RegionalForm.php +++ b/core/modules/system/lib/Drupal/system/Form/RegionalForm.php @@ -70,7 +70,7 @@ public function buildForm(array $form, array &$form_state) { $form['locale'] = array( '#type' => 'details', - '#title' => t('Locale'), + '#title' => t('Default Country & Language'), ); $form['locale']['site_default_country'] = array( diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php index 2bd36c2..e1de153 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php @@ -73,7 +73,7 @@ function testAdminDefinedFormatDate() { 'label' => 'Example Style', 'date_format_pattern' => 'j M y', ); - $this->drupalPost('admin/config/regional/date-time/formats/add', $edit, t('Add format')); + $this->drupalPost('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( @@ -81,8 +81,8 @@ function testAdminDefinedFormatDate() { 'label' => 'Example Style Uppercase', 'date_format_pattern' => 'j M Y', ); - $this->drupalPost('admin/config/regional/date-time/formats/add', $edit, t('Add format')); - $this->assertText(t('Custom date format added.')); + $this->drupalPost('admin/config/regional/settings/date-time/formats/add', $edit, t('Add format')); + $this->assertText(t('Custom date format updated.')); $timestamp = strtotime('2007-03-10T00:00:00+00:00'); $this->assertIdentical(format_date($timestamp, 'example_style', '', 'America/Los_Angeles'), '9 Mar 07', 'Test format_date() using an admin-defined date type.'); diff --git a/core/modules/system/lib/Drupal/system/Tests/System/AdminTest.php b/core/modules/system/lib/Drupal/system/Tests/System/AdminTest.php index 1c42936..e62b9ad 100644 --- a/core/modules/system/lib/Drupal/system/Tests/System/AdminTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/System/AdminTest.php @@ -80,7 +80,7 @@ function testAdminPages() { $this->drupalGet($page); $this->assertLinkByHref('admin/config'); $this->assertLinkByHref('admin/config/regional/settings'); - $this->assertLinkByHref('admin/config/regional/date-time'); + $this->assertNoLinkByHref('admin/config/regional/settings/date-time'); $this->assertLinkByHref('admin/config/regional/language'); $this->assertNoLinkByHref('admin/config/regional/language/detection/session'); $this->assertNoLinkByHref('admin/config/regional/language/detection/url'); @@ -97,7 +97,7 @@ 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/settings/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/lib/Drupal/system/Tests/System/DateFormatsLanguageTest.php b/core/modules/system/lib/Drupal/system/Tests/System/DateFormatsLanguageTest.php index e17c709..c64aa95 100644 --- a/core/modules/system/lib/Drupal/system/Tests/System/DateFormatsLanguageTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/System/DateFormatsLanguageTest.php @@ -65,7 +65,7 @@ function testLocalizeDateFormats() { 'date_format_pattern' => 'd.m.Y - H:i', 'locales[]' => array('fr'), ); - $this->drupalPost('admin/config/regional/date-time/formats/add', $edit, t('Add format')); + $this->drupalPost('admin/config/regional/settings/date-time/formats/add', $edit, t('Add format')); // Add new date format for English. $edit = array( @@ -74,17 +74,17 @@ function testLocalizeDateFormats() { 'date_format_pattern' => 'j M Y - g:ia', 'locales[]' => array('en'), ); - $this->drupalPost('admin/config/regional/date-time/formats/add', $edit, t('Add format')); + $this->drupalPost('admin/config/regional/settings/date-time/formats/add', $edit, t('Add format')); // Configure date formats. - $this->drupalGet('admin/config/regional/date-time/locale'); + $this->drupalGet('admin/config/regional/settings/date-time/locale'); $this->assertText('French', 'Configured languages appear.'); $edit = array( 'date_format_long' => 'example_style_fr', 'date_format_medium' => 'example_style_fr', 'date_format_short' => 'example_style_fr', ); - $this->drupalPost('admin/config/regional/date-time/locale/fr/edit', $edit, t('Save configuration')); + $this->drupalPost('admin/config/regional/settings/date-time/locale/fr/edit', $edit, t('Save configuration')); $this->assertText(t('Configuration saved.'), 'French date formats updated.'); $edit = array( @@ -92,7 +92,7 @@ function testLocalizeDateFormats() { 'date_format_medium' => 'example_style_en', 'date_format_short' => 'example_style_en', ); - $this->drupalPost('admin/config/regional/date-time/locale/en/edit', $edit, t('Save configuration')); + $this->drupalPost('admin/config/regional/settings/date-time/locale/en/edit', $edit, t('Save configuration')); $this->assertText(t('Configuration saved.'), 'English date formats updated.'); // Create node content. @@ -107,8 +107,8 @@ function testLocalizeDateFormats() { $this->assertText($french_date, 'French date format appears'); // Make sure we can reset dates back to default. - $this->drupalPost('admin/config/regional/date-time/locale/en/reset', array(), t('Reset')); - $this->drupalGet('node/' . $node->id()); + $this->drupalPost('admin/config/regional/settings/date-time/locale/en/reset', array(), t('Reset')); + $this->drupalGet('node/' . $node->nid); $this->assertNoText($english_date, 'English date format does not appear'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php b/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php index c644f3a..f6f7ae8 100644 --- a/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php +++ b/core/modules/system/lib/Drupal/system/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/formats'); // Add custom date format. $this->clickLink(t('Add format')); @@ -90,26 +90,26 @@ function testDateFormatConfiguration() { 'label' => $name, 'date_format_pattern' => $date_format, ); - $this->drupalPost('admin/config/regional/date-time/formats/add', $edit, t('Add format')); - $this->assertEqual($this->getUrl(), url('admin/config/regional/date-time', array('absolute' => TRUE)), 'Correct page redirection.'); - $this->assertText(t('Custom date format added.'), 'Date format added confirmation message appears.'); + $this->drupalPost('admin/config/regional/settings/date-time/formats/add', $edit, t('Add format')); + $this->assertEqual($this->getUrl(), url('admin/config/regional/settings/date-time/formats', array('absolute' => TRUE)), 'Correct page redirection.'); + $this->assertText(t('Custom date format updated.'), 'Date format added confirmation message appears.'); $this->assertText($date_format_id, 'Custom date format appears in the date format list.'); $this->assertText(t('Delete'), 'Delete link for custom date format appears.'); // Edit custom date format. - $this->drupalGet('admin/config/regional/date-time'); + $this->drupalGet('admin/config/regional/settings/date-time/formats'); $this->clickLink(t('Edit')); $edit = array( 'date_format_pattern' => 'Y m', ); $this->drupalPost($this->getUrl(), $edit, t('Save format')); - $this->assertEqual($this->getUrl(), url('admin/config/regional/date-time', array('absolute' => TRUE)), 'Correct page redirection.'); + $this->assertEqual($this->getUrl(), url('admin/config/regional/settings/date-time/formats', array('absolute' => TRUE)), 'Correct page redirection.'); $this->assertText(t('Custom date format updated.'), 'Custom date format successfully updated.'); // Delete custom date format. $this->clickLink(t('Delete')); - $this->drupalPost('admin/config/regional/date-time/formats/manage/' . $date_format_id . '/delete', array(), t('Remove')); - $this->assertEqual($this->getUrl(), url('admin/config/regional/date-time', array('absolute' => TRUE)), 'Correct page redirection.'); + $this->drupalPost('admin/config/regional/settings/date-time/formats/' . $date_format_id . '/delete', array(), t('Remove')); + $this->assertEqual($this->getUrl(), url('admin/config/regional/settings/date-time/formats', array('absolute' => TRUE)), 'Correct page redirection.'); $this->assertText(t('Removed date format ' . $name), 'Custom date format removed.'); // Make sure the date does not exist in config. @@ -150,7 +150,7 @@ function testDateFormatXSS() { )); $date_format->save(); - $this->drupalGet('admin/config/regional/date-time'); + $this->drupalGet('admin/config/regional/settings/date-time'); $this->assertNoRaw("", 'The date format was properly sanitized'); } } diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc index 050cdd7..6452711 100644 --- a/core/modules/system/system.admin.inc +++ b/core/modules/system/system.admin.inc @@ -824,6 +824,69 @@ function theme_system_themes_page($variables) { } /** + * Displays the date format strings overview page. + */ +function system_date_time_formats() { + $header = array( + array('data' => t('Machine name'), 'field' => 'machine_name'), + array('data' => t('Name'), 'field' => 'name'), + array('data' => t('Pattern'), 'field' => 'pattern'), + array('data' => t('Operations')) + ); + $rows = array(); + + $formats = system_get_date_formats(); + + if (!empty($formats)) { + foreach ($formats as $date_format_id => $format_info) { + // Do not display date formats that are locked. + if (empty($format_info['locked'])) { + $row = array(); + $row[] = array('data' => $date_format_id); + $row[] = array('data' => $format_info['name']); + $row[] = array('data' => format_date(REQUEST_TIME, $date_format_id)); + + // Prepare Operational links. + $links = array(); + $links['edit'] = array( + 'title' => t('Edit'), + 'href' => 'admin/config/regional/settings/date-time/formats/' . $date_format_id . '/edit', + ); + $links['delete'] = array( + 'title' => t('Delete'), + 'href' => 'admin/config/regional/settings/date-time/formats/' . $date_format_id . '/delete', + ); + $row['operations'] = array('data' => array( + '#type' => 'operations', + '#links' => $links, + )); + + $rows[] = $row; + } + } + } + + $build['date_formats_table'] = array( + '#theme' => 'table', + '#header' => $header, + '#rows' => $rows, + '#empty' => t('No custom date formats available. Add date format.', array('@link' => url('admin/config/regional/settings/date-time/formats/add'))), + ); + + return $build; +} + +/** + * Checks if the chosen machine_name exists or not. + */ +function system_date_format_exists($candidate_machine_name) { + if ($formats = system_get_date_formats()) { + return array_key_exists($candidate_machine_name, $formats); + } + return FALSE; +} + +/** * Page callback: Displays edit date format links for each language. * * @see locale_menu() @@ -838,11 +901,11 @@ function system_date_format_language_overview_page() { $links = array(); $links['edit'] = array( 'title' => t('Edit'), - 'href' => "admin/config/regional/date-time/locale/$langcode/edit", + 'href' => "admin/config/regional/settings/date-time/locale/$langcode/edit", ); $links['reset'] = array( 'title' => t('Reset'), - 'href' => "admin/config/regional/date-time/locale/$langcode/reset", + 'href' => "admin/config/regional/settings/date-time/locale/$langcode/reset", ); $row[] = array( 'data' => array( @@ -934,7 +997,7 @@ function system_date_format_localize_form_submit($form, &$form_state) { } } drupal_set_message(t('Configuration saved.')); - $form_state['redirect'] = 'admin/config/regional/date-time/locale'; + $form_state['redirect'] = 'admin/config/regional/settings/date-time/locale'; } /** diff --git a/core/modules/system/system.module b/core/modules/system/system.module index bd58f93..ff84f64 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -88,7 +88,7 @@ function system_help($path, $arg) { $output .= '
' . t('Performing system maintenance') . '
'; $output .= '
' . t('In order for the site and its modules to continue to operate well, a set of routine administrative operations must run on a regular basis. The System module manages this task by making use of a system cron job. You can verify the status of cron tasks by visiting the Status report page. For more information, see the online handbook entry for configuring cron jobs. You can set up cron job by visiting Cron configuration page', array('@status' => url('admin/reports/status'), '@handbook' => 'http://drupal.org/cron', '@cron' => url('admin/config/system/cron'))) . '
'; $output .= '
' . t('Configuring basic site settings') . '
'; - $output .= '
' . t('The System module also handles basic configuration options for your site, including Date and time settings, File system settings, Site name and other information, and a Maintenance mode for taking your site temporarily offline.', array('@date-time-settings' => url('admin/config/regional/date-time'), '@file-system' => url('admin/config/media/file-system'), '@site-info' => url('admin/config/system/site-information'), '@maintenance-mode' => url('admin/config/development/maintenance'))) . '
'; + $output .= '
' . t('The System module also handles basic configuration options for your site, including Date and time settings, File system settings, Site name and other information, and a Maintenance mode for taking your site temporarily offline.', array('@date-time-settings' => url('admin/config/regional/settings/date-time'), '@file-system' => url('admin/config/media/file-system'), '@site-info' => url('admin/config/system/site-information'), '@maintenance-mode' => url('admin/config/development/maintenance'))) . '
'; $output .= ''; return $output; case 'admin/index': @@ -811,34 +811,45 @@ function system_menu() { 'file' => 'system.admin.inc', ); $items['admin/config/regional/settings'] = array( - 'title' => 'Regional settings', - 'description' => "Settings for the site's default time zone and country.", + 'title' => 'Regional and locale settings', + 'description' => "Settings for the site's default time zone, date/time formatting and locale.", 'route_name' => 'system_regional_settings', 'weight' => -20, ); - $items['admin/config/regional/date-time'] = array( + $items['admin/config/regional/settings/list'] = array( + 'title' => 'Settings', + 'type' => MENU_DEFAULT_LOCAL_TASK, + ); + $items['admin/config/regional/settings/date-time'] = array( 'title' => 'Date and time formats', 'description' => 'Configure display format strings for date and time.', 'route_name' => 'date_format_list', - 'weight' => -9, + 'type' => MENU_LOCAL_TASK, ); - $items['admin/config/regional/date-time/formats/add'] = array( + $items['admin/config/regional/settings/date-time/formats/add'] = array( 'title' => 'Add format', 'description' => 'Allow users to add additional date formats.', 'type' => MENU_LOCAL_ACTION, 'route_name' => 'date_format_add', 'weight' => -10, ); - $items['admin/config/regional/date-time/formats/manage/%'] = array( + $items['admin/config/regional/settings/date-time/formats/%/edit'] = array( 'title' => 'Edit date format', 'description' => 'Allow users to edit a configured date format.', 'route_name' => 'date_format_edit', ); - $items['admin/config/regional/date-time/formats/manage/%/delete'] = array( + $items['admin/config/regional/settings/date-time/formats/%/delete'] = array( 'title' => 'Delete date format', 'description' => 'Allow users to delete a configured date format.', 'route_name' => 'date_format_delete', ); + $items['admin/config/regional/settings/date-time/formats/lookup'] = array( + 'title' => 'Date and time lookup', + 'page callback' => 'system_date_time_lookup', + 'access arguments' => array('administer site configuration'), + 'type' => MENU_CALLBACK, + 'file' => 'system.admin.inc', + ); // Search settings. $items['admin/config/search'] = array( @@ -929,7 +940,7 @@ function system_menu() { // Localize date formats. if (module_exists('language')) { - $items['admin/config/regional/date-time/locale'] = array( + $items['admin/config/regional/settings/date-time/locale'] = array( 'title' => 'Localize', 'description' => 'Configure date formats for each locale', 'page callback' => 'system_date_format_language_overview_page', @@ -938,15 +949,15 @@ function system_menu() { 'weight' => -8, 'file' => 'system.admin.inc', ); - $items['admin/config/regional/date-time/locale/%/edit'] = array( + $items['admin/config/regional/settings/date-time/locale/%/edit'] = array( 'title' => 'Localize date formats', 'description' => 'Configure date formats for each locale', 'page callback' => 'drupal_get_form', - 'page arguments' => array('system_date_format_localize_form', 5), + 'page arguments' => array('system_date_format_localize_form', 6), 'access arguments' => array('administer site configuration'), 'file' => 'system.admin.inc', ); - $items['admin/config/regional/date-time/locale/%/reset'] = array( + $items['admin/config/regional/settings/date-time/locale/%/reset'] = array( 'title' => 'Reset date formats', 'description' => 'Reset localized date formats to global defaults', 'route_name' => 'date_format_localize_reset', diff --git a/core/modules/system/system.routing.yml b/core/modules/system/system.routing.yml index 254bf01..b6540cd 100644 --- a/core/modules/system/system.routing.yml +++ b/core/modules/system/system.routing.yml @@ -104,28 +104,28 @@ date_format_list: _permission: 'administer site configuration' date_format_add: - pattern: '/admin/config/regional/date-time/formats/add' + pattern: '/admin/config/regional/settings/date-time/formats/add' defaults: _entity_form: 'date_format.add' requirements: _permission: 'administer site configuration' date_format_edit: - pattern: '/admin/config/regional/date-time/formats/manage/{date_format}' + pattern: '/admin/config/regional/settings/date-time/formats/{date_format_id}/edit' defaults: _entity_form: 'date_format.edit' requirements: _entity_access: 'date_format.update' date_format_delete: - pattern: 'admin/config/regional/date-time/formats/manage/{date_format}/delete' + pattern: 'admin/config/regional/settings/date-time/formats/{format_id}/delete' defaults: _entity_form: 'date_format.delete' requirements: _entity_access: 'date_format.delete' date_format_localize_reset: - pattern: 'admin/config/regional/date-time/locale/{langcode}/reset' + pattern: 'admin/config/regional/settings/date-time/locale/{langcode}/reset' defaults: _form: '\Drupal\system\Form\DateFormatLocalizeResetForm' requirements: