Merge branch 'ari/convert-blog-description-to-interactive' into ari/plugin-installer

Author: aristath

classes/suggested-tasks/providers/class-disable-comments.php

@@ -117,14 +117,14 @@ public function print_popover_instructions() {
 
 		echo '<p>';
 		if ( 0 === $comments_count ) {
-			\esc_html_e( 'Your site currently has no approved comments. Therefore, it seems your site might not need comments. If that is true for most posts or pages on your site, you can use WordPress\'s default setting to disable comments. If your site really doesn\'t need any comments, we recommend installing the "Comment-Free Zone" plugin.', 'progress-planner' );
+			\esc_html_e( 'Your site currently has no approved comments. Therefore, it seems your site might not need comments. If that is true for most posts or pages on your site, you can use WordPress\'s default setting to disable comments.', 'progress-planner' );
 		} else {
 			printf(
 				\esc_html(
 					// translators: %d is the number of approved comments.
 					\_n(
-						'Your site currently has %d approved comment. Therefore, it seems your site might not need comments. If that is true for most posts or pages on your site, you can use WordPress\'s default setting to disable comments. If your site really doesn\'t need any comments, we recommend installing the "Comment-Free Zone" plugin.',
-						'Your site currently has %d approved comments. Therefore, it seems your site might not need comments. If that is true for most posts or pages on your site, you can use WordPress\'s default setting to disable comments. If your site really doesn\'t need any comments, we recommend installing the "Comment-Free Zone" plugin.',
+						'Your site currently has %d approved comment. Therefore, it seems your site might not need comments. If that is true for most posts or pages on your site, you can use WordPress\'s default setting to disable comments.',
+						'Your site currently has %d approved comments. Therefore, it seems your site might not need comments. If that is true for most posts or pages on your site, you can use WordPress\'s default setting to disable comments.',
 						$comments_count,
 						'progress-planner'
 					)
@@ -133,6 +133,15 @@ public function print_popover_instructions() {
 			);
 		}
 		echo '</p>';
+		if ( ! \is_multisite() && \current_user_can( 'install_plugins' ) ) {
+			echo '<p>';
+			\printf(
+				/* translators: %s is the <a href="https://w.org/plugins/comment-free-zone/" target="_blank">Comment-Free Zone</a> link */
+				\esc_html__( 'If your site really doesn\'t need any comments, we recommend installing the "%s" plugin.', 'progress-planner' ),
+				'<a href="https://w.org/plugins/comment-free-zone/" target="_blank">' . \esc_html__( 'Comment-Free Zone', 'progress-planner' ) . '</a>'
+			);
+			echo '</p>';
+		}
 	}
 
 	/**

classes/suggested-tasks/providers/class-hello-world.php

@@ -89,11 +89,23 @@ protected function get_title() {
 	 * @return string
 	 */
 	protected function get_description() {
-		return \sprintf(
-			/* translators: %s:<a href="https://prpl.fyi/delete-hello-world-post" target="_blank">Hello World!</a> link */
-			\esc_html__( 'On install, WordPress creates a %s post. This post is not needed and should be deleted.', 'progress-planner' ),
-			'<a href="https://prpl.fyi/delete-hello-world-post" target="_blank">' . \esc_html__( '"Hello World!"', 'progress-planner' ) . '</a>'
-		);
+		$hello_world_post_id = $this->get_data_collector()->collect();
+
+		if ( 0 === $hello_world_post_id ) {
+			return \esc_html__( 'On install, WordPress creates a "Hello World!" post. This post is not needed and should be deleted.', 'progress-planner' );
+		}
+
+		$hello_world_post_url = (string) \get_permalink( $hello_world_post_id );
+
+		return '<p>' . \sprintf(
+			/* translators: %s: Link to the post. */
+			\esc_html__( 'On install, WordPress creates a "Hello World!" post. You can find yours at %s.', 'progress-planner' ),
+			'<a href="' . \esc_attr( $hello_world_post_url ) . '" target="_blank">' . \esc_html( $hello_world_post_url ) . '</a>',
+		) . '</p><p>' . \sprintf(
+			/* translators: %s: URL to https://prpl.fyi/delete-sample-page */
+			\__( 'This post does not add value to your website and solely exists to show what a post can look like. Therefore, <a href="%s" target="_blank">"Hello World!" is not needed and should be deleted</a>.', 'progress-planner' ),
+			'https://prpl.fyi/delete-hello-world-post'
+		) . '</p>';
 	}
 
 	/**

classes/suggested-tasks/providers/class-sample-page.php

@@ -88,11 +88,23 @@ protected function get_title() {
 	 * @return string
 	 */
 	protected function get_description() {
-		return \sprintf(
-			/* translators: %s:<a href="https://prpl.fyi/delete-sample-page" target="_blank">Sample Page</a> link */
-			\esc_html__( 'On install, WordPress creates a %s page. This page is not needed and should be deleted.', 'progress-planner' ),
-			'<a href="https://prpl.fyi/delete-sample-page" target="_blank">' . \esc_html__( '"Sample Page"', 'progress-planner' ) . '</a>'
-		);
+		$sample_page_id = $this->get_data_collector()->collect();
+
+		if ( 0 === $sample_page_id ) {
+			return \esc_html__( 'On install, WordPress creates a "Sample Page" page. This page does not add value to your website and solely exists to show what a page can look like. Therefore, "Sample Page" is not needed and should be deleted.', 'progress-planner' );
+		}
+
+		$sample_page_url = (string) \get_permalink( $sample_page_id );
+
+		return '<p>' . \sprintf(
+			/* translators: %s: Link to the post. */
+			\esc_html__( 'On install, WordPress creates a "Sample Page" page. You can find yours at %s.', 'progress-planner' ),
+			'<a href="' . \esc_attr( $sample_page_url ) . '" target="_blank">' . \esc_html( $sample_page_url ) . '</a>',
+		) . '</p><p>' . \sprintf(
+			/* translators: %s: URL to https://prpl.fyi/delete-sample-page */
+			\__( 'This page does not add value to your website and solely exists to show what a page can look like. Therefore, <a href="%s" target="_blank">"Sample Page" is not needed and should be deleted</a>.', 'progress-planner' ),
+			'https://prpl.fyi/delete-sample-page'
+		) . '</p>';
 	}
 
 	/**