WordPress-C/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-16 19:46:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Date/Time: Replace abbreviations for minutes in human_time_diff().

Browse Source 
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
This commit is contained in:
Sergey Biryukov 2024-06-29 09:31:22 +00:00
parent 2548045917
commit 5f22738264
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/formatting.php
View File

@ -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 ) {

2
wp-includes/version.php
View File

@ -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.