From adb9f003ed12eeef37c84e3a4cd46b2d2e1065a9 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 7 Jul 2020 09:20:02 +0000
Subject: [PATCH] Site Health: Correct translator comment for the message
 displayed after clicking "remind me later" on the admin email confirmation.

Adjust the logic for displaying the message for better readability.

Follow-up to [48359].

See #48333.
Built from https://develop.svn.wordpress.org/trunk@48363


git-svn-id: http://core.svn.wordpress.org/trunk@48132 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/index.php      | 12 ++++++++----
 wp-includes/version.php |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/wp-admin/index.php b/wp-admin/index.php
index 251da847a4..5592a509cf 100644
--- a/wp-admin/index.php
+++ b/wp-admin/index.php
@@ -124,17 +124,21 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
 		 * Calculate how many seconds it's been since the reminder was postponed.
 		 * This allows us to not show it if the query arg is set, but visited due to caches, bookmarks or similar.
 		 */
-		$time_passed = $postponed_time - $remind_interval - time();
+		$time_passed = time() - ( $postponed_time - $remind_interval );
 
 		// Only show the dashboard notice if it's been less than a minute since the message was postponed.
-		if ( $time_passed > -60 ) :
+		if ( $time_passed < MINUTE_IN_SECONDS ) :
 			?>
 		<div class="notice notice-success is-dismissible">
 			<p>
 				<?php
 				printf(
-					/* translators: %1$s: The number of comments. %2$s: The post title. */
-					_n( 'The admin email verification page will reappear after %d day.', 'The admin email verification page will reappear after %d days.', 3 ),
+					/* translators: %d: The number of days. */
+					_n(
+						'The admin email verification page will reappear after %d day.',
+						'The admin email verification page will reappear after %d days.',
+						3
+					),
 					number_format_i18n( 3 )
 				);
 				?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 7548f11262..ba4dae01e9 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-alpha-48362';
+$wp_version = '5.5-alpha-48363';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.