diff --git a/packages/edit-navigation/src/components/header/index.js b/packages/edit-navigation/src/components/header/index.js index 49cf4cb972f536..10a08fddd6ac00 100644 --- a/packages/edit-navigation/src/components/header/index.js +++ b/packages/edit-navigation/src/components/header/index.js @@ -4,6 +4,7 @@ import { DropdownMenu } from '@wordpress/components'; import { PinnedItems } from '@wordpress/interface'; import { __, sprintf } from '@wordpress/i18n'; +import { decodeEntities } from '@wordpress/html-entities'; /** * Internal dependencies @@ -42,7 +43,7 @@ export default function Header( { { __( 'Navigation' ) }

- { isMenuSelected && actionHeaderText } + { isMenuSelected && decodeEntities( actionHeaderText ) }

{ isMenuSelected && (
diff --git a/packages/edit-navigation/src/components/menu-switcher/index.js b/packages/edit-navigation/src/components/menu-switcher/index.js index 68162e433a7d63..b6a18436437234 100644 --- a/packages/edit-navigation/src/components/menu-switcher/index.js +++ b/packages/edit-navigation/src/components/menu-switcher/index.js @@ -14,6 +14,7 @@ import { } from '@wordpress/components'; import { useState } from '@wordpress/element'; import { __, sprintf } from '@wordpress/i18n'; +import { decodeEntities } from '@wordpress/html-entities'; /** * Internal dependencies @@ -37,7 +38,7 @@ export default function MenuSwitcher( { onSelect={ onSelectMenu } choices={ menus.map( ( { id, name } ) => ( { value: id, - label: name, + label: decodeEntities( name ), 'aria-label': sprintf( /* translators: %s: The name of a menu. */ __( "Switch to '%s'" ), diff --git a/packages/edit-navigation/src/components/name-display/index.js b/packages/edit-navigation/src/components/name-display/index.js index 794e686df4b040..6aa124dc0e6baa 100644 --- a/packages/edit-navigation/src/components/name-display/index.js +++ b/packages/edit-navigation/src/components/name-display/index.js @@ -7,6 +7,7 @@ import { BlockControls } from '@wordpress/block-editor'; import { useDispatch } from '@wordpress/data'; import { store as interfaceStore } from '@wordpress/interface'; import { sprintf, __ } from '@wordpress/i18n'; +import { decodeEntities } from '@wordpress/html-entities'; /** * Internal dependencies @@ -27,7 +28,7 @@ export default function NameDisplay() { IsMenuNameControlFocusedContext ); - const menuName = name ?? untitledMenu; + const menuName = decodeEntities( name ?? untitledMenu ); return ( diff --git a/packages/edit-navigation/src/components/name-editor/index.js b/packages/edit-navigation/src/components/name-editor/index.js index 728dcb04b77c4d..a1c46345f23758 100644 --- a/packages/edit-navigation/src/components/name-editor/index.js +++ b/packages/edit-navigation/src/components/name-editor/index.js @@ -4,6 +4,7 @@ import { __ } from '@wordpress/i18n'; import { TextControl } from '@wordpress/components'; import { useEffect, useRef, useContext } from '@wordpress/element'; +import { decodeEntities } from '@wordpress/html-entities'; /** * Internal dependencies @@ -36,7 +37,7 @@ export function NameEditor() { label={ __( 'Name' ) } onBlur={ () => setIsMenuNameEditFocused( false ) } className="edit-navigation-name-editor__text-control" - value={ name || '' } + value={ decodeEntities( name || '' ) } onChange={ setName } /> ); diff --git a/packages/edit-navigation/src/components/sidebar/manage-locations.js b/packages/edit-navigation/src/components/sidebar/manage-locations.js index b77b0a39ff62b4..97b3b3da322cfe 100644 --- a/packages/edit-navigation/src/components/sidebar/manage-locations.js +++ b/packages/edit-navigation/src/components/sidebar/manage-locations.js @@ -11,6 +11,7 @@ import { Spinner, SelectControl, } from '@wordpress/components'; +import { decodeEntities } from '@wordpress/html-entities'; /** * Internal dependencies @@ -82,7 +83,7 @@ export default function ManageLocations( { sprintf( // translators: menu name. __( 'Currently using %s' ), - menuOnLocation.name + decodeEntities( menuOnLocation.name ) ) } /> @@ -101,13 +102,13 @@ export default function ManageLocations( { className="edit-navigation-manage-locations__select-menu" label={ menuLocation.description } labelPosition="top" - value={ menuLocation.menu } + value={ decodeEntities( menuLocation.menu ) } options={ [ { value: 0, label: __( 'Select a Menu' ), key: 0 }, ...menus.map( ( { id, name } ) => ( { key: id, value: id, - label: name, + label: decodeEntities( name ), } ) ), ] } onChange={ ( menuId ) => {