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

Post Comments Block: Allow placeholders to reorder items in translations #40849

Merged
merged 2 commits into from
May 6, 2022
Merged

Post Comments Block: Allow placeholders to reorder items in translations #40849

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02652f7
Allow strings to be translatable independent from the order of the wo…
cbravobernal May 5, 2022
ab266c4
Unify strings with already existing translations
cbravobernal May 6, 2022
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
70 changes: 51 additions & 19 deletions packages/block-library/src/post-comments/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { __, sprintf } from '@wordpress/i18n';
import { useSelect } from '@wordpress/data';
import { useEntityProp, store as coreStore } from '@wordpress/core-data';
import { __experimentalUseDisabled as useDisabled } from '@wordpress/compose';
import { createInterpolateElement } from '@wordpress/element';

/**
* Internal dependencies
Expand Down Expand Up @@ -110,7 +111,10 @@ export default function PostCommentsEdit( {
ref={ disabledRef }
>
<h3>
{ __( 'One response to' ) } “{ postTitle }”
{
/* translators: %s: Post title. */
sprintf( __( 'One response to %s' ), postTitle )
Comment on lines +115 to +116
Copy link
Contributor

Choose a reason for hiding this comment

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

String exists in Core: https://github.com/WordPress/wordpress-develop/blob/04e9728701b3dde0260c7cdebfd726edbe62ac97/src/wp-includes/theme-compat/comments.php#L37-L38

}
</h3>

<div className="navigation">
Expand All @@ -135,16 +139,36 @@ export default function PostCommentsEdit( {
width="32"
loading="lazy"
/>
<b className="fn">
<a href="#top" className="url">
{ __(
'A WordPress Commenter'
) }
</a>
</b>{ ' ' }
<span className="says">
{ __( 'says' ) }:
</span>
{ createInterpolateElement(
sprintf(
/* translators: %s: Comment author link. */
__(
'%s <span>says:</span>'
),
sprintf(
'<cite><a>%s</a></cite>',
__(
'A WordPress Commenter'
)
)
),
{
span: (
<span className="says" />
),
a: (
/* eslint-disable jsx-a11y/anchor-has-content */
<a
href="#top"
className="url"
/>
/* eslint-enable jsx-a11y/anchor-has-content */
),
cite: (
<cite className="fn" />
),
}
) }
</div>

<div className="comment-metadata">
Expand Down Expand Up @@ -174,21 +198,29 @@ export default function PostCommentsEdit( {
'To get started with moderating, editing, and deleting comments, please visit the Comments screen in the dashboard.'
) }
<br />
{ __(
'Commenter avatars come from'
) }{ ' ' }
<a href="https://gravatar.com/">
Gravatar
</a>
.
{ createInterpolateElement(
__(
'Commenter avatars come from <a>Gravatar</a>'
),
{
a: (
/* eslint-disable-next-line jsx-a11y/anchor-has-content */
<a href="https://gravatar.com/" />
),
}
) }
</p>
</div>

<div className="reply">
<a
className="comment-reply-link"
href="#top"
aria-label="Reply to A WordPress Commenter"
aria-label={ sprintf(
/* translators: Comment reply button text. %s: Comment author name. */
__( 'Reply to %s' ),
__( 'A WordPress Commenter' )
) }
>
{ __( 'Reply' ) }
</a>
Expand Down