From 7adbca1ca960aa9d88f3f9bb8ecd5df954005ed8 Mon Sep 17 00:00:00 2001
From: desrosj <desrosj@git.wordpress.org>
Date: Mon, 10 Nov 2025 20:42:28 +0000
Subject: [PATCH] Date/Time: Revert [60942].
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The changes in [60942] aimed to add an indicator next to the default date and time formats for the site’s locale in General Settings. However, the changes do not take into account the fact that a user may have a different language than the site’s default selected as their preference.

Props swissspidy, johnbillion, SergeyBiryukov, pbearne, desrosj, wildworks.
See #64102.
Built from https://develop.svn.wordpress.org/trunk@61193


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

diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index c69ab0d251..214899d5a1 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -480,20 +480,11 @@ 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>';
-
-	if ( __( 'F j, Y' ) === $format ) {
-		echo ' ' . __( '(Site language default)' );
-	}
-
-	echo "</label><br />\n";
+	echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span><code>' . esc_html( $format ) . "</code></label><br />\n";
 }
 
 	echo '<label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"';
@@ -534,20 +525,11 @@ 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>';
-
-	if ( __( 'g:i a' ) === $format ) {
-		echo ' ' . __( '(Site language default)' );
-	}
-
-	echo "</label><br />\n";
+	echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span><code>' . esc_html( $format ) . "</code></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 675ea871ab..76384feefe 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.9-beta4-61192';
+$wp_version = '6.9-beta4-61193';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.