Changeset 45926 for trunk/src/wp-includes/ms-functions.php

Timestamp:

09/01/2019 05:12:43 PM (5 years ago)

Author:

SergeyBiryukov

Message:

I18N: Improve translator comments.

• Add missing translator comments.
• Fix placement of some translator comments. Translator 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 translator comments.

Includes minor code layout fixes.

Polyglots, rejoice! All WordPress core files now have translator comments for all strings with placeholders!

Props jrf, subrataemfluence, GaryJ, webdados, Dency, swissspidy, alvarogois, marcomartins, mihaiiceyro, vladwtz, niq1982, flipkeijzer, michielatyoast, chandrapatel, thrijith, joshuanoyce, FesoVik, tessak22, bhaktirajdev, cleancoded, dhavalkasvala, garrett-eclipse, bibliofille, socalchristina, priyankkpatel, 5hel2l2y, adamsilverstein, JeffPaul, pierlo, SergeyBiryukov.
Fixes #44360.

File:

• trunk/src/wp-includes/ms-functions.php (modified) (14 diffs)

trunk/src/wp-includes/ms-functions.php

@@ -945 +945 @@
         apply_filters(
             'wpmu_signup_blog_notification_email',
+            /* translators: New site notification email. 1: Activation URL, 2: New site URL */
             __( "To activate your blog, please click the following link:\n\n%1\$s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your site here:\n\n%2\$s" ),
             $domain,
@@ -958 +959 @@
         $key
     );
+
     // TODO: Don't hard code activation link.
     $subject = sprintf(
@@ -989 +991 @@
         esc_url( 'http://' . $domain . $path )
     );
+
     wp_mail( $user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
 
@@ -1061 +1064 @@
         apply_filters(
             'wpmu_signup_user_notification_email',
+            /* translators: New user notification email. %s: Activation URL */
             __( "To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login." ),
             $user_login,
@@ -1069 +1073 @@
         site_url( "wp-activate.php?key=$key" )
     );
+
     // TODO: Don't hard code activation link.
     $subject = sprintf(
@@ -1094 +1099 @@
         $user_login
     );
+
     wp_mail( $user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
 
@@ -1379 +1385 @@
     restore_current_blog();
 
-    /* translators: New site notification email. 1: Site URL, 2: User IP address, 3: Settings screen URL */
     $msg = sprintf(
+        /* translators: New site notification email. 1: Site URL, 2: User IP address, 3: Settings screen URL */
         __(
             'New Site: %1$s
@@ -1403 +1409 @@
     $msg = apply_filters( 'newblog_notify_siteadmin', $msg );
 
+    /* translators: New site notification email subject. %s: New site URL */
     wp_mail( $email, sprintf( __( 'New Site Registration: %s' ), $siteurl ), $msg );
+
     return true;
 }
@@ -1432 +1440 @@
 
     $options_site_url = esc_url( network_admin_url( 'settings.php' ) );
-    /* translators: New user notification email. 1: User login, 2: User IP address, 3: Settings screen URL */
+
     $msg = sprintf(
+        /* translators: New user notification email. 1: User login, 2: User IP address, 3: Settings screen URL */
         __(
             'New User: %1$s
@@ -1455 +1464 @@
      */
     $msg = apply_filters( 'newuser_notify_siteadmin', $msg, $user );
+
+    /* translators: New user notification email subject. %s: User login */
     wp_mail( $email, sprintf( __( 'New User Registration: %s' ), $user->user_login ), $msg );
+
     return true;
 }
@@ -1614 +1626 @@
      */
     $subject = apply_filters( 'update_welcome_subject', sprintf( $subject, $current_network->site_name, wp_unslash( $title ) ) );
+
     wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
 
@@ -1705 +1718 @@
      */
     $subject = apply_filters( 'update_welcome_user_subject', sprintf( $subject, $current_network->site_name, $user->user_login ) );
+
     wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
 
@@ -2076 +2090 @@
 
     if ( empty( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) ) {
-        wp_die( sprintf( __( 'An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.' ), home_url() ) );
-    }
-
-    wp_die( sprintf( __( 'You have been added to this site. Please visit the <a href="%1$s">homepage</a> or <a href="%2$s">log in</a> using your username and password.' ), home_url(), admin_url() ), __( 'WordPress &rsaquo; Success' ), array( 'response' => 200 ) );
+        wp_die(
+            sprintf(
+                /* translators: %s: Home URL */
+                __( 'An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.' ),
+                home_url()
+            )
+        );
+    }
+
+    wp_die(
+        sprintf(
+            /* translators: 1: Home URL, 2: Admin URL */
+            __( 'You have been added to this site. Please visit the <a href="%1$s">homepage</a> or <a href="%2$s">log in</a> using your username and password.' ),
+            home_url(),
+            admin_url()
+        ),
+        __( 'WordPress &rsaquo; Success' ),
+        array( 'response' => 200 )
+    );
 }
 
@@ -2652 +2681 @@
     $content      = str_replace( '###SITEURL###', network_home_url(), $content );
 
-    /* translators: Email change notification email subject. %s: Network title */
-    wp_mail( $value, sprintf( __( '[%s] Network Admin Email Change Request' ), wp_specialchars_decode( get_site_option( 'site_name' ), ENT_QUOTES ) ), $content );
+    wp_mail(
+        $value,
+        sprintf(
+            /* translators: Email change notification email subject. %s: Network title */
+            __( '[%s] Network Admin Email Change Request' ),
+            wp_specialchars_decode( get_site_option( 'site_name' ), ENT_QUOTES )
+        ),
+        $content
+    );
 
     if ( $switched_locale ) {