From 5f22738264d0ded52c4ed2de88c72accff76ef6a Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sat, 29 Jun 2024 09:31:22 +0000
Subject: [PATCH] Date/Time: Replace abbreviations for minutes in
 `human_time_diff()`.

This ensures that relative times are formatted the same way in both JS and PHP.

Follow-up to [1976], [2124], [4658], [41018], [56496].

Props wildworks.
Fixes #61535.
Built from https://develop.svn.wordpress.org/trunk@58600


git-svn-id: http://core.svn.wordpress.org/trunk@58043 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/formatting.php | 4 ++--
 wp-includes/version.php    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 85ca245212..8e2aa3cfa9 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -3856,7 +3856,7 @@ function sanitize_email( $email ) {
  * Determines the difference between two timestamps.
  *
  * The difference is returned in a human-readable format such as "1 hour",
- * "5 mins", "2 days".
+ * "5 minutes", "2 days".
  *
  * @since 1.5.0
  * @since 5.3.0 Added support for showing a difference in seconds.
@@ -3885,7 +3885,7 @@ function human_time_diff( $from, $to = 0 ) {
 			$mins = 1;
 		}
 		/* translators: Time difference between two dates, in minutes (min=minute). %s: Number of minutes. */
-		$since = sprintf( _n( '%s min', '%s mins', $mins ), $mins );
+		$since = sprintf( _n( '%s minutes', '%s minutes', $mins ), $mins );
 	} elseif ( $diff < DAY_IN_SECONDS && $diff >= HOUR_IN_SECONDS ) {
 		$hours = round( $diff / HOUR_IN_SECONDS );
 		if ( $hours <= 1 ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 26189c1607..33fd70d94f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.7-alpha-58596';
+$wp_version = '6.7-alpha-58600';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.