Skip to content
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

Query Total: Remove nested element #68304

Merged
merged 1 commit into from
Dec 26, 2024
+14 −21
Merged

Query Total: Remove nested element #68304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 11 additions & 13 deletions packages/block-library/src/query-total/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,27 +48,25 @@ export default function QueryTotalEdit( { attributes, setAttributes } ) {

// Controls for the block.
const controls = (
<>
<BlockControls>
<ToolbarGroup>
<ToolbarDropdownMenu
icon={ getButtonPositionIcon() }
label={ __( 'Change display type' ) }
controls={ buttonPositionControls }
/>
</ToolbarGroup>
</BlockControls>
</>
<BlockControls>
<ToolbarGroup>
<ToolbarDropdownMenu
icon={ getButtonPositionIcon() }
label={ __( 'Change display type' ) }
controls={ buttonPositionControls }
/>
</ToolbarGroup>
</BlockControls>
);

// Render output based on the selected display type.
const renderDisplay = () => {
if ( displayType === 'total-results' ) {
return <div>{ __( '12 results found' ) }</div>;
return <>{ __( '12 results found' ) }</>;
}

if ( displayType === 'range-display' ) {
return <div>{ __( 'Displaying 1 – 10 of 12' ) }</div>;
return <>{ __( 'Displaying 1 – 10 of 12' ) }</>;
}

return null;
Expand Down
11 changes: 3 additions & 8 deletions packages/block-library/src/query-total/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ function render_block_core_query_total( $attributes, $content, $block ) {
switch ( $attributes['displayType'] ) {
case 'range-display':
if ( $start === $end ) {
$range_text = sprintf(
$output = sprintf(
/* translators: 1: Start index of posts, 2: Total number of posts */
__( 'Displaying %1$s of %2$s' ),
$start,
$max_rows
);
} else {
$range_text = sprintf(
$output = sprintf(
/* translators: 1: Start index of posts, 2: End index of posts, 3: Total number of posts */
__( 'Displaying %1$s – %2$s of %3$s' ),
$start,
Expand All @@ -56,17 +56,12 @@ function render_block_core_query_total( $attributes, $content, $block ) {
);
}

$output = sprintf( '<p>%s</p>', $range_text );
break;

case 'total-results':
default:
// translators: %d: number of results.
$total_text = sprintf( _n( '%d result found', '%d results found', $max_rows ), $max_rows );
$output = sprintf(
'<p>%s</p>',
$total_text
);
$output = sprintf( _n( '%d result found', '%d results found', $max_rows ), $max_rows );
break;
}

Expand Down
Loading