From 4a2676ab8b890820137ed99d6a21a7e071097dbb Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 24 Feb 2016 02:04:28 +0000
Subject: [PATCH] I18N: Add translator comments and context to "New Site
 Created" email notification strings.

Props ramiy.
Fixes #35716.
Built from https://develop.svn.wordpress.org/trunk@36669


git-svn-id: http://core.svn.wordpress.org/trunk@36636 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/network/site-new.php | 26 +++++++++++++++++++-------
 wp-includes/version.php       |  2 +-
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/wp-admin/network/site-new.php b/wp-admin/network/site-new.php
index d3f6fb62cf..184afb1ec4 100644
--- a/wp-admin/network/site-new.php
+++ b/wp-admin/network/site-new.php
@@ -127,17 +127,29 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
 			update_user_option( $user_id, 'primary_blog', $id, true );
 		}
 
-		$content_mail = sprintf(
-			/* translators: 1: user login, 2: site url, 3: site name/title */
-			__( 'New site created by %1$s
+		wp_mail(
+			get_site_option( 'admin_email' ),
+			sprintf(
+				/* translators: %s: network name */
+				__( '[%s] New Site Created' ),
+				$current_site->site_name
+			),
+			sprintf(
+				/* translators: 1: user login, 2: site url, 3: site name/title */
+				__( 'New site created by %1$s
 
 Address: %2$s
 Name: %3$s' ),
-			$current_user->user_login,
-			get_site_url( $id ),
-			wp_unslash( $title )
+				$current_user->user_login,
+				get_site_url( $id ),
+				wp_unslash( $title )
+			),
+			sprintf(
+				'From: "%1$s" <%2$s>',
+				_x( 'Site Admin', 'email "From" field' ),
+				get_site_option( 'admin_email' )
+			)
 		);
-		wp_mail( get_site_option('admin_email'), sprintf( __( '[%s] New Site Created' ), $current_site->site_name ), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' );
 		wpmu_welcome_notification( $id, $user_id, $password, $title, array( 'public' => 1 ) );
 		wp_redirect( add_query_arg( array( 'update' => 'added', 'id' => $id ), 'site-new.php' ) );
 		exit;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index a0e0a3f14c..296d5b8005 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36668';
+$wp_version = '4.5-alpha-36669';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.