From 8eddfadd6f69151ddad7d776da96727002c35da2 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 16 Oct 2025 00:06:32 +0000
Subject: [PATCH] Date/Time: Add indication of site language default date/time
 format in General Settings.

This aims to make it easier to determine which format is the default for the current locale.

Props pbearne, SergeyBiryukov.
Fixes #64102.
Built from https://develop.svn.wordpress.org/trunk@60942


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

diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 1e45d65353..5c3408304b 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -479,11 +479,20 @@ if ( empty( $tzstring ) ) { // Create a UTC+- zone if no timezone string exists.
 
 foreach ( $date_formats as $format ) {
 	echo "\t<label><input type='radio' name='date_format' value='" . esc_attr( $format ) . "'";
+
 	if ( get_option( 'date_format' ) === $format ) { // checked() uses "==" rather than "===".
 		echo " checked='checked'";
 		$custom = false;
 	}
-	echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span><code>' . esc_html( $format ) . "</code></label><br />\n";
+
+	echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span>' .
+		'<code>' . esc_html( $format ) . '</code>';
+
+	if ( __( 'F j, Y' ) === $format ) {
+		echo ' ' . __( '(Site language default)' );
+	}
+
+	echo "</label><br />\n";
 }
 
 	echo '<label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"';
@@ -524,11 +533,20 @@ foreach ( $date_formats as $format ) {
 
 foreach ( $time_formats as $format ) {
 	echo "\t<label><input type='radio' name='time_format' value='" . esc_attr( $format ) . "'";
+
 	if ( get_option( 'time_format' ) === $format ) { // checked() uses "==" rather than "===".
 		echo " checked='checked'";
 		$custom = false;
 	}
-	echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span><code>' . esc_html( $format ) . "</code></label><br />\n";
+
+	echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span>' .
+		'<code>' . esc_html( $format ) . '</code>';
+
+	if ( __( 'g:i a' ) === $format ) {
+		echo ' ' . __( '(Site language default)' );
+	}
+
+	echo "</label><br />\n";
 }
 
 	echo '<label><input type="radio" name="time_format" id="time_format_custom_radio" value="\c\u\s\t\o\m"';
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ca05cbc676..b3dff86153 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.9-alpha-60941';
+$wp_version = '6.9-alpha-60942';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.