Changeset 61193 for trunk/src/wp-admin/options-general.php

Timestamp:

11/10/2025 08:40:33 PM (11 months ago)

Author:

desrosj

Message:

Date/Time: Revert [60942].

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.

File:

• trunk/src/wp-admin/options-general.php (modified) (2 diffs)

trunk/src/wp-admin/options-general.php

@@ -481 +481 @@
 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";
 }
 
@@ -535 +526 @@
 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";
 }