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

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

Add translator commments.

Props ramiy.
Fixes #34497.
Built from https://develop.svn.wordpress.org/trunk@35438


git-svn-id: http://core.svn.wordpress.org/trunk@35402 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-10-30 00:52:26 +00:00
parent 368e5f9fc3
commit e51f9061c5
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,12 +201,19 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
if ( $found ) {
echo ' ';
$message = $tr['isdst'] ?
__('Daylight saving time begins on: <code>%s</code>.') :
__('Standard time begins on: <code>%s</code>.');
/* 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,
'<code>' . date_i18n(
get_option( 'date_format' ) . ' ' . get_option( 'time_format' ),
$tr['ts'] + ( $tz_offset - $tr['offset'] )
) . '</code>'
);
} else {
_e('This timezone does not observe daylight saving time.');
_e( 'This timezone does not observe daylight saving time.' );
}
}
// Set back to UTC.

2
wp-includes/version.php
View File

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