X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/53f4633144ed68c8b8fb5861f992b5489894a940..refs/tags/wordpress-4.5:/wp-admin/options-general.php diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php index 7f2a14ea..9091d5e3 100644 --- a/wp-admin/options-general.php +++ b/wp-admin/options-general.php @@ -20,65 +20,6 @@ $parent_file = 'options-general.php'; /* translators: date and time format for exact current time, mainly about timezones, see http://php.net/date */ $timezone_format = _x('Y-m-d H:i:s', 'timezone date format'); -/** - * Display JavaScript on the page. - * - * @since 3.5.0 - */ -function options_general_add_js() { -?> - -' . __('The fields on this screen determine some of the basics of your site setup.') . '
' . @@ -132,10 +73,12 @@ include( ABSPATH . 'wp-admin/admin-header.php' );want your site home page to be different from your WordPress installation directory.' ); ?>
The new address will not become active until confirmed.' ) ?>
+The new address will not become active until confirmed.' ) ?>
%s
'), date_i18n($timezone_format, false, 'gmt')); ?>
-
- %1$s'), date_i18n($timezone_format)); ?>
-
-
-
+ ' . __( 'UTC' ) . '',
+ '' . date_i18n( $timezone_format, false, 'gmt' ) . '
'
+ );
+ ?>
+
+ ' . date_i18n( $timezone_format ) . ''
+ );
+ ?>
+
+
%s.') :
- __('Standard time begins on: %s
.');
+ /* translators: %s: date and time */
+ __( 'Daylight saving time begins on: %s.') :
+ /* translators: %s: date and time */
+ __( 'Standard time begins on: %s.' );
// Add the difference between the current offset and the new offset to ts to get the correct transition time from date_i18n().
- printf( $message, date_i18n(get_option('date_format') . ' ' . get_option('time_format'), $tr['ts'] + ($tz_offset - $tr['offset']) ) );
+ printf( $message,
+ '' . date_i18n(
+ __( 'F j, Y' ) . ' ' . __( 'g:i a' ),
+ $tr['ts'] + ( $tz_offset - $tr['offset'] )
+ ) . '
'
+ );
} else {
- _e('This timezone does not observe daylight saving time.');
+ _e( 'This timezone does not observe daylight saving time.' );
}
}
// Set back to UTC.
date_default_timezone_set('UTC');
?>
+
' . esc_html( $format ) . "
' . esc_html( $format ) . "
" . __('Documentation on date and time formatting.') . "
\n"; + echo "\t" . __('Documentation on date and time formatting.') . "
\n"; ?>