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

Jump to bottom

Added conditions and new translation strings for BlockMover #19757

Merged
merged 2 commits into from
Jan 21, 2020
Merged

Added conditions and new translation strings for BlockMover #19757

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
468a535
Added conditions and new translation strings for BlockMover
momotofu Jan 18, 2020
0723589
Moved translator comments into sprintf function
momotofu Jan 20, 2020
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
137 changes: 109 additions & 28 deletions packages/block-editor/src/components/block-mover/mover-description.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,47 +49,128 @@ export function getBlockMoverDescription( selectedCount, type, firstIndex, isFir

if ( dir > 0 && ! isLast ) {
// moving down
return sprintf(
// translators: 1: Type of block (i.e. Text, Image etc), 2: Position of selected block, 3: Direction of movement ( up, down, left, right ), 4: New position
__( 'Move %1$s block from position %2$d %3$s to position %4$d' ),
type,
position,
getMovementDirection( 'down' ),
( position + 1 ),
);
const movementDirection = getMovementDirection( 'down' );

if ( movementDirection === 'down' ) {
return sprintf(
// translators: 1: Type of block (i.e. Text, Image etc), 2: Position of selected block, 3: New position
__( 'Move %1$s block from position %2$d down to position %3$d' ),
type,
position,
( position + 1 ),
);
}

if ( movementDirection === 'left' ) {
return sprintf(
// translators: 1: Type of block (i.e. Text, Image etc), 2: Position of selected block, 3: New position
__( 'Move %1$s block from position %2$d left to position %3$d' ),
type,
position,
( position + 1 ),
);
}

if ( movementDirection === 'right' ) {
return sprintf(
// translators: 1: Type of block (i.e. Text, Image etc), 2: Position of selected block, 3: New position
__( 'Move %1$s block from position %2$d right to position %3$d' ),
type,
position,
( position + 1 ),
);
}
}

if ( dir > 0 && isLast ) {
// moving down, and is the last item
// translators: 1: Type of block (i.e. Text, Image etc), 2: Direction of movement ( up, down, left, right )
return sprintf(
__( 'Block %1$s is at the end of the content and can’t be moved %2$s' ),
type,
getMovementDirection( 'down' ),
// translators: 1: Type of block (i.e. Text, Image etc)
Copy link
Contributor

Choose a reason for hiding this comment

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

This translators note should probably be in each of the sprintfs , just like it is in the other if blocks.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch!

const movementDirection = getMovementDirection( 'down' );

);
if ( movementDirection === 'down' ) {
return sprintf(
__( 'Block %1$s is at the end of the content and can’t be moved down' ),
type,
);
}

if ( movementDirection === 'left' ) {
return sprintf(
__( 'Block %1$s is at the end of the content and can’t be moved left' ),
type,
);
}

if ( movementDirection === 'right' ) {
return sprintf(
__( 'Block %1$s is at the end of the content and can’t be moved right' ),
type,
);
}
}

if ( dir < 0 && ! isFirst ) {
// moving up
return sprintf(
// translators: 1: Type of block (i.e. Text, Image etc), 2: Position of selected block, 3: Direction of movement ( up, down, left, right ), 4: New position
__( 'Move %1$s block from position %2$d %3$s to position %4$d' ),
type,
position,
getMovementDirection( 'up' ),
( position - 1 ),
);
const movementDirection = getMovementDirection( 'up' );

if ( movementDirection === 'up' ) {
return sprintf(
// translators: 1: Type of block (i.e. Text, Image etc), 2: Position of selected block, 3: New position
__( 'Move %1$s block from position %2$d up to position %3$d' ),
type,
position,
( position - 1 ),
);
}

if ( movementDirection === 'left' ) {
return sprintf(
// translators: 1: Type of block (i.e. Text, Image etc), 2: Position of selected block, 3: New position
__( 'Move %1$s block from position %2$d left to position %3$d' ),
type,
position,
( position - 1 ),
);
}

if ( movementDirection === 'right' ) {
return sprintf(
// translators: 1: Type of block (i.e. Text, Image etc), 2: Position of selected block, 3: New position
__( 'Move %1$s block from position %2$d right to position %3$d' ),
type,
position,
( position - 1 ),
);
}
}

if ( dir < 0 && isFirst ) {
// moving up, and is the first item
// translators: 1: Type of block (i.e. Text, Image etc), 2: Direction of movement ( up, down, left, right )
return sprintf(
__( 'Block %1$s is at the beginning of the content and can’t be moved %2$s' ),
type,
getMovementDirection( 'up' ),
);
const movementDirection = getMovementDirection( 'up' );

if ( movementDirection === 'up' ) {
// translators: 1: Type of block (i.e. Text, Image etc)
return sprintf(
__( 'Block %1$s is at the beginning of the content and can’t be moved up' ),
type,
);
}

if ( movementDirection === 'left' ) {
// translators: 1: Type of block (i.e. Text, Image etc)
return sprintf(
__( 'Block %1$s is at the beginning of the content and can’t be moved left' ),
type,
);
}

if ( movementDirection === 'right' ) {
// translators: 1: Type of block (i.e. Text, Image etc)
return sprintf(
__( 'Block %1$s is at the beginning of the content and can’t be moved right' ),
type,
);
}
}
}

Expand Down