I18N: Reduce use of context functions and improve translator comments (…

…#733)

* Improve context and comment for copyright date format
* Remove context for jump to top labels, improve comment
* Remove context for search results string, improve comment, use number_format_i18n()
* Remove context from byline string to merge two strings
* Remove unnecessary context from search form labels
* Move translator comment above function call
* PHPCS: Change rule to ignore warning

404.php

@@ -21,7 +21,7 @@
 		<?php
 		get_search_form(
 			array(
-				'label' => _x( '404 not found', 'Label', 'twentytwenty' ),
+				'label' => __( '404 not found', 'twentytwenty' ),
 			)
 		);
 		?>

footer.php

@@ -11,7 +11,7 @@
  * @since 1.0.0
  */
 
-?>		
+?>
 			<footer id="site-footer" role="contentinfo" class="header-footer-group">
 
 				<div class="section-inner">
@@ -22,8 +22,8 @@
 							<?php
 							echo esc_html(
 								date_i18n(
-									/* Translators: Y = Format parameter for date() https://php.net/manual/en/function.date.php */
-									_x( 'Y', 'Translators: Y = Current year', 'twentytwenty' )
+									/* translators: Copyright date format, see https://secure.php.net/date */
+									_x( 'Y', 'copyright date format', 'twentytwenty' )
 								)
 							);
 							?>
@@ -43,14 +43,14 @@
 					<a class="to-the-top" href="#site-header">
 						<span class="to-the-top-long">
 							<?php
-							// Translators: %s = HTML character for an arrow.
-							printf( esc_html( _x( 'To the top %s', '%s = HTML character for an arrow', 'twentytwenty' ) ), '<span class="arrow">&uarr;</span>' );
+							/* translators: %s: HTML character for up arrow */
+							printf( esc_html( __( 'To the top %s', 'twentytwenty' ) ), '<span class="arrow">&uarr;</span>' );
 							?>
 						</span><!-- .to-the-top-long -->
 						<span class="to-the-top-short">
 							<?php
-							// Translators: %s = HTML character for an arrow.
-							printf( esc_html( _x( 'Up %s', '%s = HTML character for an arrow', 'twentytwenty' ) ), '<span class="arrow">&uarr;</span>' );
+							/* translators: %s: HTML character for up arrow */
+							printf( esc_html( __( 'Up %s', 'twentytwenty' ) ), '<span class="arrow">&uarr;</span>' );
 							?>
 						</span><!-- .to-the-top-short -->
 					</a><!-- .to-the-top -->

inc/template-tags.php

@@ -297,8 +297,8 @@ function twentytwenty_get_post_meta( $post_id = null, $location = 'single-top' )
 						<span class="meta-text">
 							<?php
 							printf(
-								// Translators: %s = the author name.
-								_x( 'By %s', '%s = author name', 'twentytwenty' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- core trusts translations
+								/* translators: %s: Author name */
+								__( 'By %s', 'twentytwenty' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- core trusts translations
 								'<a href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '">' . esc_html( get_the_author_meta( 'display_name' ) ) . '</a>'
 							);
 							?>

index.php

@@ -34,8 +34,16 @@
 		);
 
 		if ( $wp_query->found_posts ) {
-			/* Translators: %s = Number of results */
-			$archive_subtitle = sprintf( _nx( 'We found %s result for your search.', 'We found %s results for your search.', $wp_query->found_posts, '%s = Number of results', 'twentytwenty' ), $wp_query->found_posts );
+			$archive_subtitle = sprintf(
+				/* translators: %s: Number of search results */
+				_n(
+					'We found %s result for your search.',
+					'We found %s results for your search.',
+					$wp_query->found_posts,
+					'twentytwenty'
+				),
+				number_format_i18n( $wp_query->found_posts )
+			);
 		} else {
 			$archive_subtitle = __( 'We could not find any results for your search. You can give it another try through the search form below.', 'twentytwenty' );
 		}
@@ -88,7 +96,7 @@
 			<?php
 			get_search_form(
 				array(
-					'label' => _x( 'search again', 'Label', 'twentytwenty' ),
+					'label' => __( 'search again', 'twentytwenty' ),
 				)
 			);
 			?>

searchform.php

@@ -20,7 +20,7 @@
 ?>
 <form role="search" <?php echo $aria_label; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Escaped above. ?> method="get" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>">
 	<label for="<?php echo esc_attr( $unique_id ); ?>">
-		<span class="screen-reader-text"><?php echo _x( 'Search for:', 'label', 'twentytwenty' ); // phpcs:ignore: WordPress.Security.EscapeOutput.OutputNotEscaped -- core trusts translations ?></span>
+		<span class="screen-reader-text"><?php _e( 'Search for:', 'twentytwenty' ); // phpcs:ignore: WordPress.Security.EscapeOutput.UnsafePrintingFunction -- core trusts translations ?></span>
 		<input type="search" id="<?php echo esc_attr( $unique_id ); ?>" class="search-field" placeholder="<?php echo esc_attr_x( 'Search &hellip;', 'placeholder', 'twentytwenty' ); ?>" value="<?php echo get_search_query(); ?>" name="s" />
 	</label>
 	<input type="submit" class="search-submit" value="<?php echo esc_attr_x( 'Search', 'submit button', 'twentytwenty' ); ?>" />

template-parts/entry-author-bio.php

@@ -16,9 +16,9 @@
 			<span class="author-name">
 				<?php
 				printf(
-					/* Translators: %s: post author */
+					/* translators: %s: Author name */
 					__( 'By %s', 'twentytwenty' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- core trusts translations
-					esc_html( get_the_author() ) 
+					esc_html( get_the_author() )
 				);
 				?>
 			</span>

template-parts/modal-search.php

@@ -17,7 +17,7 @@
 			<?php
 			get_search_form(
 				array(
-					'label' => _x( 'Search for:', 'Label', 'twentytwenty' ),
+					'label' => __( 'Search for:', 'twentytwenty' ),
 				)
 			);
 			?>