WordPress 4.5

[autoinstalls/wordpress.git] / wp-admin / includes / options.php

diff --git a/wp-admin/includes/options.php b/wp-admin/includes/options.php
index f0fab455ff212b9a6945200ac1c666653821e07b..95d9964e9edfed88cbb9f9a7c16bf342c7f938d8 100644 (file)
--- a/wp-admin/includes/options.php
+++ b/wp-admin/includes/options.php
@@ -51,7 +51,7 @@ function options_general_add_js() {
 
                $("input[name='date_format']").click(function(){
                        if ( "date_format_custom_radio" != $(this).attr("id") )
-                               $( "input[name='date_format_custom']" ).val( $( this ).val() ).siblings( '.example' ).text( $( this ).parent( 'label' ).text() );
+                               $( "input[name='date_format_custom']" ).val( $( this ).val() ).siblings( '.example' ).text( $( this ).parent( 'label' ).children( '.format-i18n' ).text() );
                });
                $("input[name='date_format_custom']").focus(function(){
                        $( '#date_format_custom_radio' ).prop( 'checked', true );
@@ -59,7 +59,7 @@ function options_general_add_js() {
 
                $("input[name='time_format']").click(function(){
                        if ( "time_format_custom_radio" != $(this).attr("id") )
-                               $( "input[name='time_format_custom']" ).val( $( this ).val() ).siblings( '.example' ).text( $( this ).parent( 'label' ).text() );
+                               $( "input[name='time_format_custom']" ).val( $( this ).val() ).siblings( '.example' ).text( $( this ).parent( 'label' ).children( '.format-i18n' ).text() );
                });
                $("input[name='time_format_custom']").focus(function(){
                        $( '#time_format_custom_radio' ).prop( 'checked', true );
@@ -131,11 +131,11 @@ function options_reading_add_js() {
 }
 
 /**
- * Render the blog charset setting.
+ * Render the site charset setting.
  *
  * @since 3.5.0
  */
 function options_reading_blog_charset() {
        echo '<input name="blog_charset" type="text" id="blog_charset" value="' . esc_attr( get_option( 'blog_charset' ) ) . '" class="regular-text" />';
        echo '<p class="description">' . __( 'The <a href="https://codex.wordpress.org/Glossary#Character_set">character encoding</a> of your site (UTF-8 is recommended)' ) . '</p>';
-}
\ No newline at end of file
+}