Skip to content

Commit

Permalink
Navigation: Add the draft status to the navigation title (#51967)
Browse files Browse the repository at this point in the history
* Navigation: Add the draft status to the navigation title

* Move the buildNavigationLabel function to the default export
  • Loading branch information
scruffian authored Jun 28, 2023
1 parent 9b8d5c1 commit c5d477a
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { SidebarNavigationScreenWrapper } from '../sidebar-navigation-screen-nav
import ScreenNavigationMoreMenu from './more-menu';
import SingleNavigationMenu from './single-navigation-menu';
import useNavigationMenuHandlers from './use-navigation-menu-handlers';
import buildNavigationLabel from '../sidebar-navigation-screen-navigation-menus/build-navigation-label';

export const postType = `wp_navigation`;

Expand Down Expand Up @@ -90,7 +91,11 @@ export default function SidebarNavigationScreenNavigationMenu() {
onDuplicate={ _handleDuplicate }
/>
}
title={ decodeEntities( menuTitle ) }
title={ buildNavigationLabel(
navigationMenu?.title,
navigationMenu?.id,
navigationMenu?.status
) }
description={ __( 'This Navigation Menu is empty.' ) }
/>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { decodeEntities } from '@wordpress/html-entities';
import { SidebarNavigationScreenWrapper } from '../sidebar-navigation-screen-navigation-menus';
import ScreenNavigationMoreMenu from './more-menu';
import NavigationMenuEditor from './navigation-menu-editor';
import buildNavigationLabel from '../sidebar-navigation-screen-navigation-menus/build-navigation-label';

export default function SingleNavigationMenu( {
navigationMenu,
Expand All @@ -28,7 +29,11 @@ export default function SingleNavigationMenu( {
onDuplicate={ handleDuplicate }
/>
}
title={ decodeEntities( menuTitle ) }
title={ buildNavigationLabel(
navigationMenu?.title,
navigationMenu?.id,
navigationMenu?.status
) }
description={ __(
'Navigation menus are a curated collection of blocks that allow visitors to get around your site.'
) }
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/**
* WordPress dependencies
*/
import { __, sprintf } from '@wordpress/i18n';
import { decodeEntities } from '@wordpress/html-entities';

// Copied from packages/block-library/src/navigation/edit/navigation-menu-selector.js.
export default function buildNavigationLabel( title, id, status ) {
if ( ! title?.rendered ) {
/* translators: %s is the index of the menu in the list of menus. */
return sprintf( __( '(no title %s)' ), id );
}

if ( status === 'publish' ) {
return decodeEntities( title?.rendered );
}

return sprintf(
// translators: %1s: title of the menu; %2s: status of the menu (draft, pending, etc.).
__( '%1$s (%2$s)' ),
decodeEntities( title?.rendered ),
status
);
}

1 comment on commit c5d477a

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Flaky tests detected in c5d477a.
Some tests passed with failed attempts. The failures may not be related to this commit but are still reported for visibility. See the documentation for more information.

🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/5403428852
📝 Reported issues:

Please sign in to comment.