WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't use `<code>` in translation strings in `options-general.php`. 

Props ramiy, SergeyBiryukov.
Fixes #31852.

Built from https://develop.svn.wordpress.org/trunk@34294


git-svn-id: http://core.svn.wordpress.org/trunk@34258 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-09-18 18:24:24 +00:00
parent 318cd61abf
commit defb5bbf43
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wp-admin/options-general.php
View File

@ -102,7 +102,12 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
$new_admin_email = get_option( 'new_admin_email' ); $new_admin_email = get_option( 'new_admin_email' );
if ( $new_admin_email && $new_admin_email != get_option('admin_email') ) : ?> if ( $new_admin_email && $new_admin_email != get_option('admin_email') ) : ?>
<div class="updated inline"> <div class="updated inline">
<p><?php printf( __('There is a pending change of the admin email to <code>%1$s</code>. <a href="%2$s">Cancel</a>'), esc_html( $new_admin_email ), esc_url( admin_url( 'options.php?dismiss=new_admin_email' ) ) ); ?></p> <p><?php
printf( __( 'There is a pending change of the admin email to %1$s. <a href="%2$s">Cancel</a>' ),
'<code>' . esc_html( $new_admin_email ) . '</code>',
esc_url( admin_url( 'options.php?dismiss=new_admin_email' ) )
);
?></p>
</div> </div>
<?php endif; ?> <?php endif; ?>
</td> </td>
@ -137,9 +142,17 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
<?php echo wp_timezone_choice($tzstring); ?> <?php echo wp_timezone_choice($tzstring); ?>
</select> </select>
<span id="utc-time"><?php printf(__('<abbr title="Coordinated Universal Time">UTC</abbr> time is <code>%s</code>'), date_i18n($timezone_format, false, 'gmt')); ?></span> <span id="utc-time"><?php
printf( __( '<abbr title="Coordinated Universal Time">UTC</abbr> time is %s' ),
'<code>' . date_i18n( $timezone_format, false, 'gmt' ) . '</code>'
);
?></span>
<?php if ( get_option('timezone_string') || !empty($current_offset) ) : ?> <?php if ( get_option('timezone_string') || !empty($current_offset) ) : ?>
<span id="local-time"><?php printf(__('Local time is <code>%1$s</code>'), date_i18n($timezone_format)); ?></span> <span id="local-time"><?php
printf( __( 'Local time is %1$s' ),
'<code>' . date_i18n( $timezone_format ) . '</code>'
);
?></span>
<?php endif; ?> <?php endif; ?>
<p class="description" id="timezone-description"><?php _e( 'Choose a city in the same timezone as you.' ); ?></p> <p class="description" id="timezone-description"><?php _e( 'Choose a city in the same timezone as you.' ); ?></p>
<?php if ($check_zone_info && $tzstring) : ?> <?php if ($check_zone_info && $tzstring) : ?>

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-34293'; $wp_version = '4.4-alpha-34294';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.