Skip to content

Remove 4 instances of 'gutenberg' text domain from WordPress core #37229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aristath merged 7 commits into from
Dec 13, 2021
Merged

Remove 4 instances of 'gutenberg' text domain from WordPress core #37229

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a551ef4
Remove text domain, set string once.
kebbet Dec 8, 2021
0b6c36c
Remove text domain, set string once.
kebbet Dec 8, 2021
06adbf8
Merge branch 'WordPress:trunk' into remove-gutenberg-textdomain-again
kebbet Dec 9, 2021
ff1baea
Merge branch 'WordPress:trunk' into remove-gutenberg-textdomain-again
kebbet Dec 11, 2021
001fbad
Update variable name and translator text.
kebbet Dec 11, 2021
4869f62
Update variable name and translator comment.
kebbet Dec 11, 2021
5202cdd
Merge branch 'WordPress:trunk' into remove-gutenberg-textdomain-again
kebbet Dec 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove text domain, set string once. 
Use sprintf() to combine the string with the $label.
  • Loading branch information
@kebbet
kebbet authored Dec 8, 2021
commit 0b6c36cec106c29db219d845d702c70f203fe870
11 changes: 8 additions & 3 deletions packages/block-library/src/page-list/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,20 +173,25 @@ function block_core_page_list_render_nested_page_list( $open_submenus_on_click,
}
}

$title = wp_kses( $page['title'], wp_kses_allowed_html( 'post' ) );
$title = wp_kses( $page['title'], wp_kses_allowed_html( 'post' ) );
$arialabel = sprintf(
/* translators: button label name */
__( '%s submenu' ),
$title
);

$markup .= '<li class="wp-block-pages-list__item' . $css_class . '"' . $style_attribute . '>';

if ( isset( $page['children'] ) && $is_navigation_child && $open_submenus_on_click ) {
$markup .= '<button aria-label="' . $title . ' ' . __( 'submenu', 'gutenberg' ) . '" class="' . $navigation_child_content_class . ' wp-block-navigation-submenu__toggle" aria-expanded="false">' . $title . '<span class="wp-block-page-list__submenu-icon wp-block-navigation__submenu-icon"><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="none" role="img" aria-hidden="true" focusable="false"><path d="M1.50002 4L6.00002 8L10.5 4" stroke-width="1.5"></path></svg></span>' .
$markup .= '<button aria-label="' . $arialabel . '" class="' . $navigation_child_content_class . ' wp-block-navigation-submenu__toggle" aria-expanded="false">' . $title . '<span class="wp-block-page-list__submenu-icon wp-block-navigation__submenu-icon"><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="none" role="img" aria-hidden="true" focusable="false"><path d="M1.50002 4L6.00002 8L10.5 4" stroke-width="1.5"></path></svg></span>' .
'</button>';
} else {
$markup .= '<a class="wp-block-pages-list__item__link' . $navigation_child_content_class . '" href="' . esc_url( $page['link'] ) . '"' . $aria_current . '>' . $title . '</a>';
}

if ( isset( $page['children'] ) ) {
if ( $is_navigation_child && $show_submenu_icons && ! $open_submenus_on_click ) {
$markup .= '<button aria-label="' . $title . ' ' . __( 'submenu', 'gutenberg' ) . '" class="wp-block-navigation__submenu-icon wp-block-navigation-submenu__toggle" aria-expanded="false">';
$markup .= '<button aria-label="' . $arialabel . '" class="wp-block-navigation__submenu-icon wp-block-navigation-submenu__toggle" aria-expanded="false">';
$markup .= '<span class="wp-block-page-list__submenu-icon wp-block-navigation__submenu-icon"><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="none" role="img" aria-hidden="true" focusable="false"><path d="M1.50002 4L6.00002 8L10.5 4" stroke-width="1.5"></path></svg></span>';
$markup .= '</button>';
}
Expand Down