Changeset 43595

Timestamp:

08/30/2018 12:13:53 PM (6 years ago)

Author:

jrf

Message:

I18n: Improve translators comments [1].

• Add missing translators comments.
• Fix placement of some translators comments. Translators comments should be on the line directly above the line containing the translation function call for optimal compatibility with various .pot file generation tools. The CS auto-fixing, which changed some inconsistent function calls to multi-line function calls, is part of the reason why this was no longer the case for a select group of translators comments.

Patch 44360-src.2.diff of the series.

Props garyj, alvarogois, michielatyoast
See #44360

Location:

trunk/src

Files:

• wp-login.php (modified) (2 diffs)
• wp-signup.php (modified) (3 diffs)

trunk/src/wp-login.php

@@ -942 +942 @@
         if ( empty( $_COOKIE[ LOGGED_IN_COOKIE ] ) ) {
             if ( headers_sent() ) {
-                /* translators: 1: Browser cookie documentation URL, 2: Support forums URL */
                 $user = new WP_Error(
                     'test_cookie',
                     sprintf(
+                        /* translators: 1: Browser cookie documentation URL, 2: Support forums URL */
                         __( '<strong>ERROR</strong>: Cookies are blocked due to unexpected output. For help, please see <a href="%1$s">this documentation</a> or try the <a href="%2$s">support forums</a>.' ),
                         __( 'https://codex.wordpress.org/Cookies' ),
@@ -953 +953 @@
             } elseif ( isset( $_POST['testcookie'] ) && empty( $_COOKIE[ TEST_COOKIE ] ) ) {
                 // If cookies are disabled we can't log in even with a valid user+pass
-                /* translators: %s: Browser cookie documentation URL */
                 $user = new WP_Error(
                     'test_cookie',
                     sprintf(
+                        /* translators: %s: Browser cookie documentation URL */
                         __( '<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href="%s">enable cookies</a> to use WordPress.' ),
                         __( 'https://codex.wordpress.org/Cookies' )

trunk/src/wp-signup.php

@@ -324 +324 @@
     $errors     = $filtered_results['errors'];
 
+    /* translators: %s: Network's site name. */
     echo '<h2>' . sprintf( __( 'Get <em>another</em> %s site in seconds' ), get_network()->site_name ) . '</h2>';
 
@@ -330 +331 @@
     }
     ?>
-    <p><?php printf( __( 'Welcome back, %s. By filling out the form below, you can <strong>add another site to your account</strong>. There is no limit to the number of sites you can have, so create to your heart&#8217;s content, but write responsibly!' ), $current_user->display_name ); ?></p>
+    <p>
+        <?php
+        /* translators: %s: Current user's display name. */
+        printf( __( 'Welcome back, %s. By filling out the form below, you can <strong>add another site to your account</strong>. There is no limit to the number of sites you can have, so create to your heart&#8217;s content, but write responsibly!' ), $current_user->display_name );
+        ?>
+    </p>
 
     <?php
@@ -956 +962 @@
 
                 if ( $active_signup == 'blog' || $active_signup == 'all' ) {
-                    /* translators: %s: site address */
                     printf(
+                        /* translators: %s: site address */
                         '<p><em>' . __( 'The site you were looking for, %s, does not exist, but you can create it now!' ) . '</em></p>',
                         '<strong>' . $newblog . '</strong>'
                     );
-                } else {                  /* translators: %s: site address */
+                } else {
                     printf(
+                        /* translators: %s: site address */
                         '<p><em>' . __( 'The site you were looking for, %s, does not exist.' ) . '</em></p>',
                         '<strong>' . $newblog . '</strong>'