Skip to content
Permalink
Browse files

I18N: Capitalize translator comments consistently, add trailing punct…

…uation.

Includes minor code layout fixes.

See #44360.

git-svn-id: https://develop.svn.wordpress.org/trunk@45932 602fd350-edb4-49c9-b593-d223f7449a82
  • Loading branch information...
SergeyBiryukov committed Sep 3, 2019
1 parent aed8c49 commit 00b03f2a6f2c21ebf9975c9c08976358681400ba
Showing 361 changed files with 2,050 additions and 1,861 deletions.
@@ -51,7 +51,7 @@
$die .= '</ul>';
$die .= '<p>' . sprintf(
/* translators: 1: NPM URL, 2: Handbook URL */
/* translators: 1: NPM URL, 2: Handbook URL. */
__( 'This requires <a href="%1$s">NPM</a>. <a href="%2$s">Learn more about setting up your local development environment</a>.' ),
'https://www.npmjs.com/get-npm',
__( 'https://make.wordpress.org/core/handbook/tutorials/installing-wordpress-locally/' )
@@ -144,7 +144,7 @@ function wpmu_activate_stylesheet() {
echo '<p class="lead-in">';
if ( $signup->domain . $signup->path == '' ) {
printf(
/* translators: 1: login URL, 2: username, 3: user email, 4: lost password URL */
/* translators: 1: Login URL, 2: Username, 3: User email address, 4: Lost password URL. */
__( 'Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
network_site_url( 'wp-login.php', 'login' ),
$signup->user_login,
@@ -153,7 +153,7 @@ function wpmu_activate_stylesheet() {
);
} else {
printf(
/* translators: 1: site URL, 2: username, 3: user email, 4: lost password URL */
/* translators: 1: Site URL, 2: Username, 3: User email address, 4: Lost password URL. */
__( 'Your site at %1$s is active. You may now log in to your site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
sprintf( '<a href="http://%1$s">%1$s</a>', $signup->domain ),
$signup->user_login,
@@ -188,14 +188,14 @@ function wpmu_activate_stylesheet() {
?>
<p class="view">
<?php
/* translators: 1: site URL, 2: login URL */
/* translators: 1: Site URL, 2: Login URL. */
printf( __( 'Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Log in</a>' ), $url, esc_url( $login_url ) );
?>
</p>
<?php else : ?>
<p class="view">
<?php
/* translators: 1: login URL, 2: network home URL */
/* translators: 1: Login URL, 2: Network home URL. */
printf( __( 'Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.' ), network_site_url( 'wp-login.php', 'login' ), network_home_url() );
?>
</p>
@@ -83,7 +83,7 @@
}
$help .= '<p>' . sprintf(
/* translators: %s: WordPress Planet URL */
/* translators: %s: WordPress Planet URL. */
__( '<strong>WordPress Events and News</strong> &mdash; Upcoming events near you as well as the latest news from the official WordPress project and the <a href="%s">WordPress Planet</a>.' ),
__( 'https://planet.wordpress.org/' )
) . '</p>';
@@ -20,7 +20,7 @@
<h1>
<?php
printf(
/* translators: %s: The current WordPress version number */
/* translators: %s: The current WordPress version number. */
__( 'Welcome to WordPress&nbsp;%s' ),
$display_version
);
@@ -30,7 +30,7 @@
<p class="about-text">
<?php
printf(
/* translators: %s: The current WordPress version number */
/* translators: %s: The current WordPress version number. */
__( 'Congratulations on updating to WordPress %s! This update makes it easier than ever to fix your site if something goes wrong.' ),
$display_version
);
@@ -40,7 +40,7 @@
<div class="wp-badge">
<?php
printf(
/* translators: %s: The current WordPress version number */
/* translators: %s: The current WordPress version number. */
__( 'Version %s' ),
$display_version
);
@@ -70,14 +70,14 @@
<p>
<?php
printf(
/* translators: 1: link to the WordPress 5.1 release post */
/* translators: 1: Link to the WordPress 5.1 release post. */
__( 'Building on <a href="%1$s">the Site Health features introduced in 5.1</a>, this release adds two new pages to help debug common configuration issues. It also adds space where developers can include debugging information for site maintainers.' ),
__( 'https://wordpress.org/news/2019/02/betty/' )
);
if ( current_user_can( 'install_plugins' ) ) {
printf(
/* translators: 1: link to /wp-admin/site-health.php, 2: link to /wp-admin/site-health.php?tab=debug */
/* translators: 1: URL to Site Health Status screen, 2: URL to Site Health Info screen. */
__( ' <a href="%1$s">Check your site status</a>, and <a href="%2$s">learn how to debug issues</a>.' ),
admin_url( 'site-health.php' ),
admin_url( 'site-health.php?tab=debug' )
@@ -183,28 +183,28 @@
__( 'Maintenance and Security Release' );
__( 'Maintenance and Security Releases' );
/* translators: %s: WordPress version number */
/* translators: %s: WordPress version number. */
__( '<strong>Version %s</strong> addressed one security issue.' );
/* translators: %s: WordPress version number */
/* translators: %s: WordPress version number. */
__( '<strong>Version %s</strong> addressed some security issues.' );
/* translators: 1: WordPress version number, 2: plural number of bugs. */
/* translators: 1: WordPress version number, 2: Plural number of bugs. */
_n_noop(
'<strong>Version %1$s</strong> addressed %2$s bug.',
'<strong>Version %1$s</strong> addressed %2$s bugs.'
);
/* translators: 1: WordPress version number, 2: plural number of bugs. Singular security issue. */
/* translators: 1: WordPress version number, 2: Plural number of bugs. Singular security issue. */
_n_noop(
'<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bug.',
'<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.'
);
/* translators: 1: WordPress version number, 2: plural number of bugs. More than one security issue. */
/* translators: 1: WordPress version number, 2: Plural number of bugs. More than one security issue. */
_n_noop(
'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.'
);
/* translators: %s: Documentation URL */
/* translators: %s: Documentation URL. */
__( 'For more information, see <a href="%s">the release notes</a>.' );
@@ -35,20 +35,20 @@
$title = esc_html( strip_tags( $title ) );
if ( is_network_admin() ) {
/* translators: Network admin screen title. %s: Network name */
/* translators: Network admin screen title. %s: Network title. */
$admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_network()->site_name ) );
} elseif ( is_user_admin() ) {
/* translators: User dashboard screen title. %s: Network name */
/* translators: User dashboard screen title. %s: Network title. */
$admin_title = sprintf( __( 'User Dashboard: %s' ), esc_html( get_network()->site_name ) );
} else {
$admin_title = get_bloginfo( 'name' );
}
if ( $admin_title == $title ) {
/* translators: Admin screen title. %s: Admin screen name */
/* translators: Admin screen title. %s: Admin screen name. */
$admin_title = sprintf( __( '%s &#8212; WordPress' ), $title );
} else {
/* translators: Admin screen title. 1: Admin screen name, 2: Network or site name */
/* translators: Admin screen title. 1: Admin screen name, 2: Network or site name. */
$admin_title = sprintf( __( '%1$s &lsaquo; %2$s &#8212; WordPress' ), $title, $admin_title );
}
@@ -175,7 +175,7 @@
</tr>
<?php } ?>
<tr>
<th scope="row"><?php /* translators: column name or table row header */ _e( 'In Response To' ); ?></th>
<th scope="row"><?php /* translators: Column name or table row header. */ _e( 'In Response To' ); ?></th>
<td>
<?php
$post_id = $comment->comment_post_ID;
@@ -192,7 +192,7 @@
$parent_link = esc_url( get_comment_link( $parent ) );
$name = get_comment_author( $parent );
printf(
/* translators: %s: comment link */
/* translators: %s: Comment link. */
' | ' . __( 'In reply to %s.' ),
'<a href="' . $parent_link . '">' . $name . '</a>'
);
@@ -205,9 +205,9 @@
<td>
<?php
$submitted = sprintf(
/* translators: 1: comment date, 2: comment time */
/* translators: 1: Comment date, 2: Comment time. */
__( '%1$s at %2$s' ),
/* translators: comment date format. See https://secure.php.net/date */
/* translators: Comment date format. See https://secure.php.net/date */
get_comment_date( __( 'Y/m/d' ), $comment ),
get_comment_date( __( 'g:i a' ), $comment )
);
@@ -220,7 +220,7 @@
</td>
</tr>
<tr>
<th scope="row"><?php /* translators: field name in comment form */ _ex( 'Comment', 'noun' ); ?></th>
<th scope="row"><?php /* translators: Field name in comment form. */ _ex( 'Comment', 'noun' ); ?></th>
<td class="comment-content">
<?php comment_text( $comment ); ?>
<p class="edit-comment"><a href="<?php echo admin_url( "comment.php?action=editcomment&amp;c={$comment->comment_ID}" ); ?>"><?php esc_html_e( 'Edit' ); ?></a></p>
@@ -21,7 +21,7 @@
<h1>
<?php
printf(
/* translators: %s: The current WordPress version number */
/* translators: %s: The current WordPress version number. */
__( 'Welcome to WordPress&nbsp;%s' ),
$display_version
);
@@ -31,7 +31,7 @@
<p class="about-text">
<?php
printf(
/* translators: %s: The current WordPress version number */
/* translators: %s: The current WordPress version number. */
__( 'Congratulations on updating to WordPress %s! This update makes it easier than ever to fix your site if something goes wrong.' ),
$display_version
);
@@ -41,7 +41,7 @@
<div class="wp-badge">
<?php
printf(
/* translators: %s: The current WordPress version number */
/* translators: %s: The current WordPress version number. */
__( 'Version %s' ),
$display_version
);
@@ -147,7 +147,7 @@
// These are strings returned by the API that we want to be translatable
__( 'Project Leaders' );
/* translators: %s: The current WordPress version number */
/* translators: %s: The current WordPress version number. */
__( 'Core Contributors to WordPress %s' );
__( 'Noteworthy Contributors' );
__( 'Cofounder, Project Lead' );
@@ -207,7 +207,7 @@
<div class="accordion-section-title">
<span class="preview-notice">
<?php
/* translators: %s: Site title */
/* translators: %s: The site/panel title in the Customizer. */
echo sprintf( __( 'You are customizing %s' ), '<strong class="panel-title site-title">' . get_bloginfo( 'name', 'display' ) . '</strong>' );
?>
</span>
@@ -153,14 +153,14 @@
$draft_or_post_title = wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '&hellip;' );
if ( $comments_count->moderated > 0 ) {
$title = sprintf(
/* translators: 1: comments count, 2: post title */
/* translators: 1: Comments count, 2: Post title. */
__( 'Comments (%1$s) on &#8220;%2$s&#8221;' ),
number_format_i18n( $comments_count->moderated ),
$draft_or_post_title
);
} else {
$title = sprintf(
/* translators: %s: post title */
/* translators: %s: Post title. */
__( 'Comments on &#8220;%s&#8221;' ),
$draft_or_post_title
);
@@ -169,7 +169,7 @@
$comments_count = wp_count_comments();
if ( $comments_count->moderated > 0 ) {
$title = sprintf(
/* translators: %s: comments count */
/* translators: %s: Comments count. */
__( 'Comments (%s)' ),
number_format_i18n( $comments_count->moderated )
);
@@ -226,7 +226,7 @@
<?php
if ( $post_id ) {
printf(
/* translators: %s: link to post */
/* translators: %s: Link to post. */
__( 'Comments on &#8220;%s&#8221;' ),
sprintf(
'<a href="%1$s">%2$s</a>',
@@ -244,7 +244,7 @@
if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
echo '<span class="subtitle">';
printf(
/* translators: %s: search keywords */
/* translators: %s: Search query. */
__( 'Search results for &#8220;%s&#8221;' ),
wp_html_excerpt( esc_html( wp_unslash( $_REQUEST['s'] ) ), 50, '&hellip;' )
);
@@ -282,34 +282,34 @@
if ( $approved > 0 || $deleted > 0 || $trashed > 0 || $untrashed > 0 || $spammed > 0 || $unspammed > 0 || $same > 0 ) {
if ( $approved > 0 ) {
/* translators: %s: number of comments */
/* translators: %s: Number of comments. */
$messages[] = sprintf( _n( '%s comment approved', '%s comments approved', $approved ), $approved );
}
if ( $spammed > 0 ) {
$ids = isset( $_REQUEST['ids'] ) ? $_REQUEST['ids'] : 0;
/* translators: %s: number of comments */
/* translators: %s: Number of comments. */
$messages[] = sprintf( _n( '%s comment marked as spam.', '%s comments marked as spam.', $spammed ), $spammed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=unspam&ids=$ids", 'bulk-comments' ) ) . '">' . __( 'Undo' ) . '</a><br />';
}
if ( $unspammed > 0 ) {
/* translators: %s: number of comments */
/* translators: %s: Number of comments. */
$messages[] = sprintf( _n( '%s comment restored from the spam', '%s comments restored from the spam', $unspammed ), $unspammed );
}
if ( $trashed > 0 ) {
$ids = isset( $_REQUEST['ids'] ) ? $_REQUEST['ids'] : 0;
/* translators: %s: number of comments */
/* translators: %s: Number of comments. */
$messages[] = sprintf( _n( '%s comment moved to the Trash.', '%s comments moved to the Trash.', $trashed ), $trashed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=untrash&ids=$ids", 'bulk-comments' ) ) . '">' . __( 'Undo' ) . '</a><br />';
}
if ( $untrashed > 0 ) {
/* translators: %s: number of comments */
/* translators: %s: Number of comments. */
$messages[] = sprintf( _n( '%s comment restored from the Trash', '%s comments restored from the Trash', $untrashed ), $untrashed );
}
if ( $deleted > 0 ) {
/* translators: %s: number of comments */
/* translators: %s: Number of comments. */
$messages[] = sprintf( _n( '%s comment permanently deleted', '%s comments permanently deleted', $deleted ), $deleted );
}

0 comments on commit 00b03f2

Please sign in to comment.
You can’t perform that action at this time.