From 8cf3e59fc46b6597b172b4b6ab63ca4e54162413 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <pento@git.wordpress.org>
Date: Fri, 19 Jul 2019 00:08:38 +0000
Subject: [PATCH] Coding Standards: Improve spacing of `printf()` calls in the
 admin About pages.

Props garrett-eclipse.
Fixes #47734.



git-svn-id: https://develop.svn.wordpress.org/trunk@45660 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/about.php    | 14 ++++++++++----
 src/wp-admin/credits.php  | 14 ++++++++++----
 src/wp-admin/freedoms.php | 35 ++++++++++++++++++++++++++---------
 src/wp-admin/privacy.php  | 28 ++++++++++++++++++++--------
 4 files changed, 66 insertions(+), 25 deletions(-)

diff --git a/src/wp-admin/about.php b/src/wp-admin/about.php
index 60f848934b..9dbed2ee3f 100644
--- a/src/wp-admin/about.php
+++ b/src/wp-admin/about.php
@@ -19,8 +19,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 	<div class="wrap about-wrap full-width-layout">
 		<h1>
 			<?php
-			/* translators: %s: The current WordPress version number */
-			printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version );
+			printf(
+				/* translators: %s: The current WordPress version number */
+				__( 'Welcome to WordPress&nbsp;%s' ),
+				$display_version
+			);
 			?>
 		</h1>
 
@@ -36,8 +39,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 
 		<div class="wp-badge">
 			<?php
-			/* translators: %s: The current WordPress version number */
-			printf( __( 'Version %s' ), $display_version );
+			printf(
+				/* translators: %s: The current WordPress version number */
+				__( 'Version %s' ),
+				$display_version
+			);
 			?>
 		</div>
 
diff --git a/src/wp-admin/credits.php b/src/wp-admin/credits.php
index 8c47501895..4ec9424ce1 100644
--- a/src/wp-admin/credits.php
+++ b/src/wp-admin/credits.php
@@ -20,8 +20,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 
 <h1>
 	<?php
-	/* translators: %s: The current WordPress version number */
-	printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version );
+	printf(
+		/* translators: %s: The current WordPress version number */
+		__( 'Welcome to WordPress&nbsp;%s' ),
+		$display_version
+	);
 	?>
 </h1>
 
@@ -37,8 +40,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 
 <div class="wp-badge">
 	<?php
-	/* translators: %s: The current WordPress version number */
-	printf( __( 'Version %s' ), $display_version );
+	printf(
+		/* translators: %s: The current WordPress version number */
+		__( 'Version %s' ),
+		$display_version
+	);
 	?>
 </div>
 
diff --git a/src/wp-admin/freedoms.php b/src/wp-admin/freedoms.php
index 142b878214..e860ebbe83 100644
--- a/src/wp-admin/freedoms.php
+++ b/src/wp-admin/freedoms.php
@@ -26,8 +26,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 
 <h1>
 	<?php
-	/* translators: %s: The current WordPress version number */
-	printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version );
+	printf(
+		/* translators: %s: The current WordPress version number */
+		__( 'Welcome to WordPress&nbsp;%s' ),
+		$display_version
+	);
 	?>
 </h1>
 
@@ -43,8 +46,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 
 <div class="wp-badge">
 	<?php
-	/* translators: %s: The current WordPress version number */
-	printf( __( 'Version %s' ), $display_version );
+	printf(
+		/* translators: %s: The current WordPress version number */
+		__( 'Version %s' ),
+		$display_version
+	);
 	?>
 </div>
 
@@ -60,8 +66,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 		<h2><?php _e( 'Freedoms' ); ?></h2>
 		<p class="about-description">
 		<?php
+		printf(
 			/* translators: %s: https://wordpress.org/about/license/ */
-			printf( __( 'WordPress is Free and open source software, built by a distributed community of mostly volunteer developers from around the world. WordPress comes with some awesome, worldview-changing rights courtesy of its <a href="%s">license</a>, the GPL.' ), __( 'https://wordpress.org/about/license/' ) );
+			__( 'WordPress is Free and open source software, built by a distributed community of mostly volunteer developers from around the world. WordPress comes with some awesome, worldview-changing rights courtesy of its <a href="%s">license</a>, the GPL.' ),
+			__( 'https://wordpress.org/about/license/' )
+		);
 		?>
 		</p>
 	</div>
@@ -92,17 +101,25 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 	<div class="feature-section has-1-columns">
 		<p>
 		<?php
+		printf(
 			/* translators: %s: https://wordpressfoundation.org/trademark-policy/ */
-			printf( __( 'WordPress grows when people like you tell their friends about it, and the thousands of businesses and services that are built on and around WordPress share that fact with their users. We&#8217;re flattered every time someone spreads the good word, just make sure to <a href="%s">check out our trademark guidelines</a> first.' ), 'https://wordpressfoundation.org/trademark-policy/' );
+			__( 'WordPress grows when people like you tell their friends about it, and the thousands of businesses and services that are built on and around WordPress share that fact with their users. We&#8217;re flattered every time someone spreads the good word, just make sure to <a href="%s">check out our trademark guidelines</a> first.' ),
+			'https://wordpressfoundation.org/trademark-policy/'
+		);
 		?>
 		</p>
 
 		<p>
 		<?php
-			$plugins_url = current_user_can( 'activate_plugins' ) ? admin_url( 'plugins.php' ) : __( 'https://wordpress.org/plugins/' );
-			$themes_url  = current_user_can( 'switch_themes' ) ? admin_url( 'themes.php' ) : __( 'https://wordpress.org/themes/' );
+		$plugins_url = current_user_can( 'activate_plugins' ) ? admin_url( 'plugins.php' ) : __( 'https://wordpress.org/plugins/' );
+		$themes_url  = current_user_can( 'switch_themes' ) ? admin_url( 'themes.php' ) : __( 'https://wordpress.org/themes/' );
+		printf(
 			/* translators: %s: https://wordpress.org/about/license/ */
-			printf( __( 'Every plugin and theme in WordPress.org&#8217;s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding <a href="%1$s">plugins</a> and <a href="%2$s">themes</a> there. If you get a plugin or theme from another source, make sure to <a href="%3$s">ask them if it&#8217;s GPL</a> first. If they don&#8217;t respect the WordPress license, we don&#8217;t recommend them.' ), $plugins_url, $themes_url, __( 'https://wordpress.org/about/license/' ) );
+			__( 'Every plugin and theme in WordPress.org&#8217;s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding <a href="%1$s">plugins</a> and <a href="%2$s">themes</a> there. If you get a plugin or theme from another source, make sure to <a href="%3$s">ask them if it&#8217;s GPL</a> first. If they don&#8217;t respect the WordPress license, we don&#8217;t recommend them.' ),
+			$plugins_url,
+			$themes_url,
+			__( 'https://wordpress.org/about/license/' )
+		);
 		?>
 		</p>
 
diff --git a/src/wp-admin/privacy.php b/src/wp-admin/privacy.php
index b2edbc4414..ca2a9e0cba 100644
--- a/src/wp-admin/privacy.php
+++ b/src/wp-admin/privacy.php
@@ -19,8 +19,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 
 <h1>
 	<?php
-	/* translators: %s: The current WordPress version number */
-	printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version );
+	printf(
+		/* translators: %s: The current WordPress version number */
+		__( 'Welcome to WordPress&nbsp;%s' ),
+		$display_version
+	);
 	?>
 </h1>
 
@@ -36,8 +39,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 
 <div class="wp-badge">
 	<?php
-	/* translators: %s: The current WordPress version number */
-	printf( __( 'Version %s' ), $display_version );
+	printf(
+		/* translators: %s: The current WordPress version number */
+		__( 'Version %s' ),
+		$display_version
+	);
 	?>
 </div>
 
@@ -53,15 +59,21 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 
 	<p>
 		<?php
-		/* translators: %s: https://wordpress.org/about/stats/ */
-		printf( __( 'This data is used to provide general enhancements to WordPress, which includes helping to protect your site by finding and automatically installing new updates. It is also used to calculate statistics, such as those shown on the <a href="%s">WordPress.org stats page</a>.' ), __( 'https://wordpress.org/about/stats/' ) );
+		printf(
+			/* translators: %s: https://wordpress.org/about/stats/ */
+			__( 'This data is used to provide general enhancements to WordPress, which includes helping to protect your site by finding and automatically installing new updates. It is also used to calculate statistics, such as those shown on the <a href="%s">WordPress.org stats page</a>.' ),
+			__( 'https://wordpress.org/about/stats/' )
+		);
 		?>
 	</p>
 
 	<p>
 		<?php
-		/* translators: %s: https://wordpress.org/about/privacy/ */
-		printf( __( 'We take privacy and transparency very seriously. To learn more about what data we collect, and how we use it, please visit <a href="%s">WordPress.org/about/privacy</a>.' ), __( 'https://wordpress.org/about/privacy/' ) );
+		printf(
+			/* translators: %s: https://wordpress.org/about/privacy/ */
+			__( 'We take privacy and transparency very seriously. To learn more about what data we collect, and how we use it, please visit <a href="%s">WordPress.org/about/privacy</a>.' ),
+			__( 'https://wordpress.org/about/privacy/' )
+		);
 		?>
 	</p>
 </div>