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

I18N: Correct various instances of incorrect usage of `esc_attr_e()`. 

Fixes #37457
Props henry.wright, afercia

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


git-svn-id: http://core.svn.wordpress.org/trunk@38365 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2016-08-28 18:06:30 +00:00
parent a7c3974cdc
commit dbdc1c28b1
7 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/comment.php
View File

@ -213,7 +213,7 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved
<th scope="row"><?php /* translators: field name in comment form */ _ex('Comment', 'noun'); ?></th>
<td class="comment-content">
<?php comment_text( $comment ); ?>
<p class="edit-comment"><a href="<?php echo admin_url( "comment.php?action=editcomment&amp;c={$comment->comment_ID}" ); ?>"><?php esc_attr_e( 'Edit' ); ?></a></p>
<p class="edit-comment"><a href="<?php echo admin_url( "comment.php?action=editcomment&amp;c={$comment->comment_ID}" ); ?>"><?php esc_html_e( 'Edit' ); ?></a></p>
</td>
</tr>
</table>
@ -222,7 +222,7 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved
<p>
<?php submit_button( $button, 'primary', 'submit', false ); ?>
<a href="<?php echo admin_url('edit-comments.php'); ?>" class="button-cancel"><?php esc_attr_e( 'Cancel' ); ?></a>
<a href="<?php echo admin_url('edit-comments.php'); ?>" class="button-cancel"><?php esc_html_e( 'Cancel' ); ?></a>
</p>
<?php wp_nonce_field( $nonce_action ); ?>

4
wp-admin/includes/revision.php
View File

@ -340,7 +340,7 @@ function wp_print_revision_templates() {
}
#>
/>
<?php esc_attr_e( 'Compare any two revisions' ); ?>
<?php esc_html_e( 'Compare any two revisions' ); ?>
</label>
</div>
</script>
@ -400,4 +400,4 @@ function wp_print_revision_templates() {
<# }); #>
</div>
</script><?php
}
}

2
wp-admin/setup-config.php
View File

@ -101,7 +101,7 @@ function setup_config_display_header( $body_classes = array() ) {
<?php wp_admin_css( 'install', true ); ?>
</head>
<body class="<?php echo implode( ' ', $body_classes ); ?>">
<p id="logo"><a href="<?php esc_attr_e( 'https://wordpress.org/' ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></p>
<p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></p>
<?php
} // end function setup_config_display_header();

2
wp-admin/theme-editor.php
View File

@ -263,7 +263,7 @@ else : ?>
<div id="documentation" class="hide-if-no-js">
<label for="docs-list"><?php _e('Documentation:') ?></label>
<?php echo $docs_select; ?>
<input type="button" class="button" value=" <?php esc_attr_e( 'Look Up' ); ?> " onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode( get_locale() ) ?>&amp;version=<?php echo urlencode( $wp_version ) ?>&amp;redirect=true'); }" />
<input type="button" class="button" value="<?php esc_attr_e( 'Look Up' ); ?>" onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode( get_locale() ) ?>&amp;version=<?php echo urlencode( $wp_version ) ?>&amp;redirect=true'); }" />
</div>
<?php endif; ?>

60
wp-includes/media-template.php
View File

@ -610,16 +610,16 @@ function wp_print_media_templates() {
<# } #>>
<option value="left">
<?php esc_attr_e('Left'); ?>
<?php esc_html_e( 'Left' ); ?>
</option>
<option value="center">
<?php esc_attr_e('Center'); ?>
<?php esc_html_e( 'Center' ); ?>
</option>
<option value="right">
<?php esc_attr_e('Right'); ?>
<?php esc_html_e( 'Right' ); ?>
</option>
<option value="none" selected>
<?php esc_attr_e('None'); ?>
<?php esc_html_e( 'None' ); ?>
</option>
</select>
</label>
@ -641,31 +641,31 @@ function wp_print_media_templates() {
<# if ( data.model.canEmbed ) { #>
<option value="embed" selected>
<?php esc_attr_e('Embed Media Player'); ?>
<?php esc_html_e( 'Embed Media Player' ); ?>
</option>
<option value="file">
<# } else { #>
<option value="none" selected>
<?php esc_attr_e('None'); ?>
<?php esc_html_e( 'None' ); ?>
</option>
<option value="file">
<# } #>
<# if ( data.model.canEmbed ) { #>
<?php esc_attr_e('Link to Media File'); ?>
<?php esc_html_e( 'Link to Media File' ); ?>
<# } else { #>
<?php esc_attr_e('Media File'); ?>
<?php esc_html_e( 'Media File' ); ?>
<# } #>
</option>
<option value="post">
<# if ( data.model.canEmbed ) { #>
<?php esc_attr_e('Link to Attachment Page'); ?>
<?php esc_html_e( 'Link to Attachment Page' ); ?>
<# } else { #>
<?php esc_attr_e('Attachment Page'); ?>
<?php esc_html_e( 'Attachment Page' ); ?>
<# } #>
</option>
<# if ( 'image' === data.type ) { #>
<option value="custom">
<?php esc_attr_e('Custom URL'); ?>
<?php esc_html_e( 'Custom URL' ); ?>
</option>
<# } #>
</select>
@ -718,13 +718,13 @@ function wp_print_media_templates() {
<option value="post" <# if ( ! wp.media.galleryDefaults.link || 'post' == wp.media.galleryDefaults.link ) {
#>selected="selected"<# }
#>>
<?php esc_attr_e('Attachment Page'); ?>
<?php esc_html_e( 'Attachment Page' ); ?>
</option>
<option value="file" <# if ( 'file' == wp.media.galleryDefaults.link ) { #>selected="selected"<# } #>>
<?php esc_attr_e('Media File'); ?>
<?php esc_html_e( 'Media File' ); ?>
</option>
<option value="none" <# if ( 'none' == wp.media.galleryDefaults.link ) { #>selected="selected"<# } #>>
<?php esc_attr_e('None'); ?>
<?php esc_html_e( 'None' ); ?>
</option>
</select>
</label>
@ -841,16 +841,16 @@ function wp_print_media_templates() {
<span><?php _e('Align'); ?></span>
<div class="button-group button-large" data-setting="align">
<button class="button" value="left">
<?php esc_attr_e('Left'); ?>
<?php esc_html_e( 'Left' ); ?>
</button>
<button class="button" value="center">
<?php esc_attr_e('Center'); ?>
<?php esc_html_e( 'Center' ); ?>
</button>
<button class="button" value="right">
<?php esc_attr_e('Right'); ?>
<?php esc_html_e( 'Right' ); ?>
</button>
<button class="button active" value="none">
<?php esc_attr_e('None'); ?>
<?php esc_html_e( 'None' ); ?>
</button>
</div>
</div>
@ -859,13 +859,13 @@ function wp_print_media_templates() {
<span><?php _e('Link To'); ?></span>
<div class="button-group button-large" data-setting="link">
<button class="button" value="file">
<?php esc_attr_e('Image URL'); ?>
<?php esc_html_e( 'Image URL' ); ?>
</button>
<button class="button" value="custom">
<?php esc_attr_e('Custom URL'); ?>
<?php esc_html_e( 'Custom URL' ); ?>
</button>
<button class="button active" value="none">
<?php esc_attr_e('None'); ?>
<?php esc_html_e( 'None' ); ?>
</button>
</div>
<input type="text" class="link-to-custom" data-setting="linkUrl" />
@ -907,16 +907,16 @@ function wp_print_media_templates() {
<span><?php _e('Align'); ?></span>
<div class="button-group button-large" data-setting="align">
<button class="button" value="left">
<?php esc_attr_e('Left'); ?>
<?php esc_html_e( 'Left' ); ?>
</button>
<button class="button" value="center">
<?php esc_attr_e('Center'); ?>
<?php esc_html_e( 'Center' ); ?>
</button>
<button class="button" value="right">
<?php esc_attr_e('Right'); ?>
<?php esc_html_e( 'Right' ); ?>
</button>
<button class="button active" value="none">
<?php esc_attr_e('None'); ?>
<?php esc_html_e( 'None' ); ?>
</button>
</div>
</div>
@ -964,21 +964,21 @@ function wp_print_media_templates() {
<select data-setting="link">
<# if ( data.attachment ) { #>
<option value="file">
<?php esc_attr_e('Media File'); ?>
<?php esc_html_e( 'Media File' ); ?>
</option>
<option value="post">
<?php esc_attr_e('Attachment Page'); ?>
<?php esc_html_e( 'Attachment Page' ); ?>
</option>
<# } else { #>
<option value="file">
<?php esc_attr_e('Image URL'); ?>
<?php esc_html_e( 'Image URL' ); ?>
</option>
<# } #>
<option value="custom">
<?php esc_attr_e('Custom URL'); ?>
<?php esc_html_e( 'Custom URL' ); ?>
</option>
<option value="none">
<?php esc_attr_e('None'); ?>
<?php esc_html_e( 'None' ); ?>
</option>
</select>
<input type="text" class="link-to-custom" data-setting="linkUrl" />

2
wp-includes/version.php
View File

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

2
wp-login.php
View File

@ -912,7 +912,7 @@ default:
*/
do_action( 'login_form' );
?>
<p class="forgetmenot"><label for="rememberme"><input name="rememberme" type="checkbox" id="rememberme" value="forever" <?php checked( $rememberme ); ?> /> <?php esc_attr_e('Remember Me'); ?></label></p>
<p class="forgetmenot"><label for="rememberme"><input name="rememberme" type="checkbox" id="rememberme" value="forever" <?php checked( $rememberme ); ?> /> <?php esc_html_e( 'Remember Me' ); ?></label></p>
<p class="submit">
<input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e('Log In'); ?>" />
<?php if ( $interim_login ) { ?>