diff --git a/packages/block-library/src/comment-date/edit.js b/packages/block-library/src/comment-date/edit.js index 52e73d8c988782..f0a09e3ea8c39d 100644 --- a/packages/block-library/src/comment-date/edit.js +++ b/packages/block-library/src/comment-date/edit.js @@ -2,7 +2,10 @@ * WordPress dependencies */ import { useEntityProp } from '@wordpress/core-data'; -import { dateI18n } from '@wordpress/date'; +import { + dateI18n, + __experimentalGetSettings as getDateSettings, +} from '@wordpress/date'; import { InspectorControls, useBlockProps, @@ -31,7 +34,11 @@ export default function Edit( { } ) { const blockProps = useBlockProps(); const [ date ] = useEntityProp( 'root', 'comment', 'date', commentId ); - const [ siteFormat ] = useEntityProp( 'root', 'site', 'date_format' ); + const [ siteFormat = getDateSettings().formats.date ] = useEntityProp( + 'root', + 'site', + 'date_format' + ); const inspectorControls = ( diff --git a/packages/block-library/src/post-date/edit.js b/packages/block-library/src/post-date/edit.js index a44a8f556c4317..076e4d181867ff 100644 --- a/packages/block-library/src/post-date/edit.js +++ b/packages/block-library/src/post-date/edit.js @@ -8,7 +8,10 @@ import classnames from 'classnames'; */ import { useEntityProp } from '@wordpress/core-data'; import { useRef } from '@wordpress/element'; -import { dateI18n } from '@wordpress/date'; +import { + dateI18n, + __experimentalGetSettings as getDateSettings, +} from '@wordpress/date'; import { AlignmentControl, BlockControls, @@ -40,8 +43,17 @@ export default function PostDateEdit( { } ); const timeRef = useRef(); const isDescendentOfQueryLoop = Number.isFinite( queryId ); - const [ siteFormat ] = useEntityProp( 'root', 'site', 'date_format' ); - const [ siteTimeFormat ] = useEntityProp( 'root', 'site', 'time_format' ); + const dateSettings = getDateSettings(); + const [ siteFormat = dateSettings.formats.date ] = useEntityProp( + 'root', + 'site', + 'date_format' + ); + const [ siteTimeFormat = dateSettings.formats.time ] = useEntityProp( + 'root', + 'site', + 'time_format' + ); const [ date, setDate ] = useEntityProp( 'postType', postType,