From eaaa8c7dc6b9424af5d9f45c4e70d1f2e23c7188 Mon Sep 17 00:00:00 2001
From: lonelyvegan <lonelyvegan@git.wordpress.org>
Date: Thu, 22 Nov 2018 15:24:45 +0000
Subject: [PATCH] Help/About: Add copy for new block editor.

Adds information about the new block editor (Gutenberg) and the Classic Editor
to the about page.

Props @pixelverbieger, @ocean90, @melchoyce, @boemedia, @sami.keijonen, @TimothyBlynJacobs, @xkon, @afercia, @Otto42, @pento.
Fixes #45178.


Built from https://develop.svn.wordpress.org/branches/5.0@43937


git-svn-id: http://core.svn.wordpress.org/branches/5.0@43769 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/about.php      | 41 ++++++++++++++++++++++++++++-------------
 wp-admin/credits.php    |  2 +-
 wp-admin/freedoms.php   |  2 +-
 wp-includes/version.php |  2 +-
 4 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/wp-admin/about.php b/wp-admin/about.php
index 20df61f8e6..9d55c56b46 100644
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -35,7 +35,15 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 			file_exists( WP_PLUGIN_DIR . '/gutenberg/gutenberg.php' )
 		) : ?>
 			<div class="about-text" style="font-style:italic;">
-				<?php printf( __( 'The Gutenberg plugin has been deactivated, as the features are now included in WordPress %1$s by default. If you&#8217;d like to continue to test the upcoming changes in the WordPress editing experience, please %2$sreactivate the Gutenberg plugin%3$s.' ), $display_version, '<a href="' . esc_url( self_admin_url( 'plugins.php?s=gutenberg&plugin_status=all' ) ) . '">', '</a>' ); ?>
+				<?php
+				printf(
+					/* translators: 1: WordPress version, 2: HTML start tag of link, 3: HTML end tag of link */
+					__( 'The Gutenberg plugin has been deactivated, as the features are now included in WordPress %1$s by default. If you&#8217;d like to continue to test the upcoming changes in the WordPress editing experience, please %2$sreactivate the Gutenberg plugin%3$s.' ),
+					$display_version,
+					'<a href="' . esc_url( self_admin_url( 'plugins.php?s=gutenberg&plugin_status=all' ) ) . '">',
+					'</a>'
+				);
+				?>
 			</div>
 		<?php else : ?>
 			<p class="about-text">
@@ -219,11 +227,14 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 			</div>
 		</div>
 
-		<div class="feature-section one-col cta">
-			<div class="col">
-				<a class="button button-primary button-hero" href="<?php echo esc_url( admin_url( 'post-new.php' ) ); ?>"><?php _e( 'Build your first post' ); ?></a>
+		<?php if ( current_user_can( 'edit_posts' ) ) { ?>
+			<div class="feature-section one-col cta">
+				<div class="col">
+					<a class="button button-primary button-hero" href="<?php echo esc_url( admin_url( 'post-new.php' ) ); ?>"><?php _e( 'Build your first post' ); ?></a>
+				</div>
 			</div>
-		</div>
+		<?php } ?>
+
 
 		<hr />
 
@@ -264,11 +275,13 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 			</div>
 		</div>
 
-		<div class="feature-section one-col cta">
-			<div class="col">
-				<a class="button button-primary button-hero load-customize hide-if-no-customize" href="<?php echo esc_url( admin_url( 'customize.php?theme=twentynineteen' ) ); ?>"><?php _e( 'Give Twenty Nineteen a try' ); ?></a>
+		<?php if ( current_user_can( 'customize' ) ) { ?>
+			<div class="feature-section one-col cta">
+				<div class="col">
+					<a class="button button-primary button-hero load-customize hide-if-no-customize" href="<?php echo esc_url( admin_url( 'customize.php?theme=twentynineteen' ) ); ?>"><?php _e( 'Give Twenty Nineteen a try' ); ?></a>
+				</div>
 			</div>
-		</div>
+		<?php } ?>
 
 		<hr />
 
@@ -315,10 +328,12 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 			<div class="col">
 				<p><?php _e( 'Prefer to stick with the familiar Classic Editor? No problem! Support for the Classic Editor plugin will remain in WordPress until 2021.' ); ?></p>
 				<p><?php _e( 'The Classic Editor plugin restores the previous WordPress editor and the Edit Post screen. It lets you keep using plugins that extend it, add old-style meta boxes, or otherwise depend on the previous editor. To install, visit your plugins page and click the “Install Now” button next to “Classic Editor.” After the plugin finishes installing, click “Activate.” That’s it! ' ); ?></p>
-				<p><?php _e( 'Note to users of assistive technology: if you experience usability issues with Gutenberg, we recommend you continue to use the Classic Editor.' ); ?></p>
-				<div class="col cta">
-					<a class="button button-primary button-hero" href="<?php echo esc_url( self_admin_url( 'plugin-install.php?tab=featured' ) ); ?>"><?php _e( 'Install the Classic Editor' ); ?></a>
-				</div>
+				<p><?php _e( 'Note to users of assistive technology: if you experience usability issues with the block editor, we recommend you continue to use the Classic Editor.' ); ?></p>
+				<?php if ( current_user_can( 'install_plugins' ) ) { ?>
+					<div class="col cta">
+						<a class="button button-primary button-hero" href="<?php echo esc_url( self_admin_url( 'plugin-install.php?tab=featured' ) ); ?>"><?php _e( 'Install the Classic Editor' ); ?></a>
+					</div>
+				<?php } ?>
 			</div>
 		</div>
 
diff --git a/wp-admin/credits.php b/wp-admin/credits.php
index 1ec2d6702f..a234b20ed4 100644
--- a/wp-admin/credits.php
+++ b/wp-admin/credits.php
@@ -20,7 +20,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 
 <h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
 
-<p class="about-text"><?php printf( __( 'Thank you for updating to the latest version! WordPress %s will smooth your design workflow and keep you safe from coding errors.' ), $display_version ); ?></p>
+<p class="about-text"><?php printf( __( 'Thank you for updating to the latest version! WordPress %s introduces a robust new content creation experience.' ), $display_version ); ?></p>
 
 <div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
 
diff --git a/wp-admin/freedoms.php b/wp-admin/freedoms.php
index 229137a600..163c2402ac 100644
--- a/wp-admin/freedoms.php
+++ b/wp-admin/freedoms.php
@@ -22,7 +22,7 @@ $is_privacy_notice = isset( $_GET['privacy-notice'] );
 
 <h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
 
-<p class="about-text"><?php printf( __( 'Thank you for updating to the latest version! WordPress %s will smooth your design workflow and keep you safe from coding errors.' ), $display_version ); ?></p>
+<p class="about-text"><?php printf( __( 'Thank you for updating to the latest version! WordPress %s introduces a robust new content creation experience.' ), $display_version ); ?></p>
 
 <div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6df0fc5e3b..76611ad80b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-beta5-43936';
+$wp_version = '5.0-beta5-43937';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.