Ticket #32263: 32263.diff

src/wp-admin/includes/ms.php

@@ -253 +253 @@
         );
         update_option( 'adminhash', $new_admin_email );
 
+        /* translators: Do not translate the ALL CAPS words between ### - those are placeholders. */
         $email_text = __( 'Howdy ###USERNAME###,
 
 You recently requested to have the administration email address on
@@ -334 +335 @@
                                 );
                 update_option( $current_user->ID . '_new_email', $new_user_email );
 
+                /* translators: Do not translate the ALL CAPS words between ### - those are placeholders. */
                 $email_text = __( 'Howdy ###USERNAME###,
 
 You recently requested to have the email address on your account changed.

src/wp-admin/includes/schema.php

@@ -917 +917 @@
                 $site_admins = get_site_option( 'site_admins' );
         }
 
+    /* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */
         $welcome_email = __( 'Howdy USERNAME,
 
 Your new SITE_NAME site has been successfully set up at:

src/wp-admin/ms-delete-site.php

@@ -42 +42 @@
 
         $url_delete = esc_url( admin_url( 'ms-delete-site.php?h=' . $hash ) );
 
+        /* translators: Do not translate the ALL CAPS words between ### - those are placeholders. */
         $content = __( "Howdy ###USERNAME###,
 
 You recently clicked the 'Delete Site' link on your site and filled in a

src/wp-includes/ms-functions.php

@@ -1433 +1433 @@
                 return false;
 
         $welcome_email = get_site_option( 'welcome_email' );
-        if ( $welcome_email == false )
+        if ( $welcome_email == false ) {
+
+                /* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */
                 $welcome_email = __( 'Howdy USERNAME,
 
 Your new SITE_NAME site has been successfully set up at:
@@ -1448 +1450 @@
 We hope you enjoy your new site. Thanks!
 
 --The Team @ SITE_NAME' );
+        }
 
         $url = get_blogaddress_by_id($blog_id);
         $user = get_userdata( $user_id );
@@ -2080 +2083 @@
 function welcome_user_msg_filter( $text ) {
         if ( !$text ) {
                 remove_filter( 'site_option_welcome_user_email', 'welcome_user_msg_filter' );
+
+                /* translators: Do not translate USERNAME, SITE_NAME, PASSWORD, LOGINLINK: those are placeholders. */
                 $text = __( 'Howdy USERNAME,
 
 Your new account is set up.