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.

git-svn-id: https://develop.svn.wordpress.org/trunk@61193 602fd350-edb4-49c9-b593-d223f7449a82

Author: desrosj

src/wp-admin/options-general.php

@@ -480,20 +480,11 @@ class="<?php echo esc_attr( $classes_for_button ); ?>"
 
 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 @@ class="<?php echo esc_attr( $classes_for_button ); ?>"
 
 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"';