Rename variable and clean up.

WordPress · Dec 29, 2023 · d816dbb · d816dbb
1 parent c0859f2
commit d816dbb
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/lib/compat/wordpress-6.5/script-loader.php b/lib/compat/wordpress-6.5/script-loader.php
@@ -87,9 +87,9 @@ function gutenberg_update_wp_date_timezone_settings( $scripts ) {
 						),
 						'timezone' => array(
 							'offset'          => (float) $gmt_offset,
+							'offsetFormatted' => str_replace( array( '.25', '.5', '.75' ), array( ':15', ':30', ':45' ), (string) $gmt_offset ),
 							'string'          => $timezone_string,
 							'abbr'            => $timezone_abbr,
-							'formattedOffset' => str_replace( array( '.25', '.5', '.75' ), array( ':15', ':30', ':45' ), (string) $gmt_offset ),
 						),
 					)
 				)

diff --git a/packages/components/src/date-time/time/timezone.tsx b/packages/components/src/date-time/time/timezone.tsx
@@ -30,7 +30,7 @@ const TimeZone = () => {
 	const zoneAbbr =
 		'' !== timezone.abbr && isNaN( Number( timezone.abbr ) )
 			? timezone.abbr
-			: `UTC${ offsetSymbol }${ timezone.formattedOffset }`;
+			: `UTC${ offsetSymbol }${ timezone.offsetFormatted }`;
 
 	// Replace underscore with space in strings like `America/Costa_Rica`.
 	const prettyTimezoneString = timezone.string.replace( '_', ' ' );

diff --git a/packages/date/src/index.js b/packages/date/src/index.js
@@ -32,9 +32,9 @@ import deprecated from '@wordpress/deprecated';
 /**
  * @typedef TimezoneConfig
  * @property {string} offset          Offset setting.
+ * @property {string} offsetFormatted Offset setting with decimals formatted to minutes.
  * @property {string} string          The timezone as a string (e.g., `'America/Los_Angeles'`).
  * @property {string} abbr            Abbreviation for the timezone.
- * @property {string} formattedOffset Offset setting with decimals formatted to minutes.
  */
 
 /* eslint-disable jsdoc/valid-types */
@@ -133,7 +133,7 @@ let settings = {
 		datetime: 'F j, Y g: i a',
 		datetimeAbbreviated: 'M j, Y g: i a',
 	},
-	timezone: { offset: '0', string: '', abbr: '', formattedOffset: '0' },
+	timezone: { offset: '0', offsetFormatted: '0', string: '', abbr: '' },
 };
 
 /**

diff --git a/packages/editor/src/components/post-schedule/label.js b/packages/editor/src/components/post-schedule/label.js
@@ -102,7 +102,7 @@ function getTimezoneAbbreviation() {
 	}
 
 	const symbol = timezone.offset < 0 ? '' : '+';
-	return `UTC${ symbol }${ timezone.formattedOffset }`;
+	return `UTC${ symbol }${ timezone.offsetFormatted }`;
 }
 
 function isTimezoneSameAsSiteTimezone( date ) {

diff --git a/packages/editor/src/components/post-schedule/test/label.js b/packages/editor/src/components/post-schedule/test/label.js
@@ -35,7 +35,7 @@ describe( 'getFullPostScheduleLabel', () => {
 
 		setSettings( {
 			...settings,
-			timezone: { formattedOffset: 10 },
+			timezone: { offsetFormatted: 10 },
 		} );
 
 		const label = getFullPostScheduleLabel( '2022-04-28T15:30:00' );