diff --git a/core/modules/datetime/config/schema/datetime.schema.yml b/core/modules/datetime/config/schema/datetime.schema.yml index 2dd447f..406a2fd 100644 --- a/core/modules/datetime/config/schema/datetime.schema.yml +++ b/core/modules/datetime/config/schema/datetime.schema.yml @@ -29,10 +29,6 @@ field.formatter.settings.datetime_base: timezone_override: type: string label: 'Time zone override' - append_timezone: - type: boolean - label: 'Append time zone' - field.formatter.settings.datetime_default: type: field.formatter.settings.datetime_base diff --git a/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeCustomFormatter.php b/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeCustomFormatter.php index c1120cd..4b18b16 100644 --- a/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeCustomFormatter.php +++ b/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeCustomFormatter.php @@ -53,7 +53,7 @@ public function viewElements(FieldItemListInterface $items) { $output = $date->format($this->getSetting('date_format')); } $elements[$delta] = [ - '#markup' => $this->appendTimezone($output), + '#markup' => $output, '#cache' => [ 'contexts' => [ 'timezone', @@ -89,7 +89,7 @@ public function settingsSummary() { $date = new DrupalDateTime(); $this->setTimeZone($date); - $summary[] = $this->appendTimezone($date->format($this->getSetting('date_format'))); + $summary[] = $date->format($this->getSetting('date_format')); return $summary; } diff --git a/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeDefaultFormatter.php b/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeDefaultFormatter.php index 50412ab..418c229 100644 --- a/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeDefaultFormatter.php +++ b/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeDefaultFormatter.php @@ -160,8 +160,7 @@ public function viewElements(FieldItemListInterface $items) { protected function formatDate($date) { $format_type = $this->getSetting('format_type'); $timezone = $this->getSetting('timezone_override'); - $output = $this->dateFormatter->format($date->getTimestamp(), $format_type, '', $timezone != '' ? $timezone : null); - return $this->appendTimezone($output); + return $this->dateFormatter->format($date->getTimestamp(), $format_type, '', $timezone != '' ? $timezone : null); } /** @@ -196,7 +195,7 @@ public function settingsSummary() { $summary = parent::settingsSummary(); $date = new DrupalDateTime(); - $summary[] = t('Format: @display', array('@display' => $this->appendTimezone($this->formatDate($date)))); + $summary[] = t('Format: @display', array('@display' => $this->formatDate($date))); return $summary; } diff --git a/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeFormatterBase.php b/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeFormatterBase.php index 5342e6f..57ef996 100644 --- a/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeFormatterBase.php +++ b/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeFormatterBase.php @@ -23,7 +23,6 @@ public static function defaultSettings() { return array( 'timezone_override' => '', - 'append_timezone' => FALSE, ) + parent::defaultSettings(); } @@ -41,13 +40,6 @@ public function settingsForm(array $form, FormStateInterface $form_state) { '#default_value' => $this->getSetting('timezone_override'), ); - $form['append_timezone'] = array( - '#type' => 'checkbox', - '#title' => $this->t('Append time zone'), - '#description' => $this->t('Append the time zone used to render the date'), - '#default_value' => $this->getSetting('append_timezone'), - ); - return $form; } @@ -61,9 +53,8 @@ public function settingsSummary() { if ($override != '') { $replacements = array( '@timezone' => $this->getSetting('timezone_override'), - '@appended' => $this->getSetting('append_timezone') ? $this->t('(Appended)') : '', ); - $summary[] = ($override != '') ? $this->t('Timezone: @timezone @appended', $replacements) : ''; + $summary[] = ($override != '') ? $this->t('Timezone: @timezone', $replacements) : ''; } return $summary; @@ -84,27 +75,4 @@ protected function setTimeZone(DrupalDateTime $date) { } } - /** - * Appends the time zone used to render the DrupalDateTime object. - * - * @param string $rendered_date - * A formatted date/time string. - * - * @return string - * The passed-in string with the time zone appended if the 'append_timezone' - * setting is TRUE. - */ - protected function appendTimezone($rendered_date) { - $timezone = $this->getSetting('timezone_override'); - if ($timezone != '' && $this->getSetting('append_timezone')) { - return SafeMarkup::format('@rendered_date (@timezone)', array( - '@rendered_date' => $rendered_date, - '@timezone' => $timezone, - )); - } - else { - return $rendered_date; - } - } - } diff --git a/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimePlainFormatter.php b/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimePlainFormatter.php index cee83f5..17f4334 100644 --- a/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimePlainFormatter.php +++ b/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimePlainFormatter.php @@ -51,7 +51,7 @@ public function viewElements(FieldItemListInterface $items) { 'timezone', ], ], - '#markup' => $this->appendTimezone($output), + '#markup' => $output, ]; } diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_field_formatter_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_field_formatter_settings.yml index 8dd6495..7b70fe6 100644 --- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_field_formatter_settings.yml +++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_field_formatter_settings.yml @@ -232,23 +232,18 @@ process: default: format_type: fallback timezone_override: '' - append_timezone: false format_interval: format_type: fallback timezone_override: '' - append_timezone: false long: format_type: long timezone_override: '' - append_timezone: false medium: format_type: medium timezone_override: '' - append_timezone: false short: format_type: short timezone_override: '' - append_timezone: false text: trimmed: trim_length: 600 diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldFormatterSettingsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldFormatterSettingsTest.php index efe1743..7780b2c 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldFormatterSettingsTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldFormatterSettingsTest.php @@ -196,7 +196,7 @@ public function testEntityDisplaySettings() { $this->assertIdentical($expected, $component); // Test date field. - $defaults = array('format_type' => 'fallback', 'timezone_override' => '', 'append_timezone' => FALSE,); + $defaults = array('format_type' => 'fallback', 'timezone_override' => '',); $expected['weight'] = 10; $expected['type'] = 'datetime_default'; $expected['settings'] = array('format_type' => 'fallback') + $defaults;