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

Embeds: After [34903], remove an accidentally included text domain, and exclude a test failing in PHP 5.2. 

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


git-svn-id: http://core.svn.wordpress.org/trunk@34869 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast 2015-10-07 11:01:25 +00:00
parent 83c3e3e00e
commit 6a18efb313
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/class-wp-oembed-controller.php
View File

@ -88,7 +88,7 @@ final class WP_oEmbed_Controller {
if ( false === $data ) {
status_header( 404 );
return __( 'Invalid URL.', 'oembed-api' );
return __( 'Invalid URL.' );
}
if ( 'json' === $request['format'] ) {

6
wp-includes/embed-functions.php
View File

@ -484,7 +484,7 @@ JS;
esc_url( $embed_url ),
absint( $width ),
absint( $height ),
esc_attr__( 'Embedded WordPress Post', 'oembed-api' )
esc_attr__( 'Embedded WordPress Post' )
);
/**
@ -748,11 +748,11 @@ function wp_oembed_excerpt_more( $more_string ) {
}
return sprintf(
_x( '… %s', 'read more link', 'oembed-api' ),
_x( '… %s', 'read more link' ),
sprintf(
'<a class="wp-embed-more" href="%s" target="_top">%s</a>',
get_the_permalink(),
__( 'Read more', 'oembed-api' )
__( 'Read more' )
)
);
}

19
wp-includes/embed-template.php
View File

@ -161,8 +161,7 @@ if ( have_posts() ) :
_n(
'%s <span class="screen-reader-text">Comment</span>',
'%s <span class="screen-reader-text">Comments</span>',
get_comments_number(),
'oembed-api'
get_comments_number()
),
absint( get_comments_number() )
);
@ -172,7 +171,7 @@ if ( have_posts() ) :
<?php endif; ?>
<div class="wp-embed-share">
<button type="button" class="wp-embed-share-dialog-open"
aria-label="<?php esc_attr_e( 'Open sharing dialog', 'oembed-api' ); ?>">
aria-label="<?php esc_attr_e( 'Open sharing dialog' ); ?>">
<span class="dashicons dashicons-share"></span>
</button>
</div>
@ -183,29 +182,29 @@ if ( have_posts() ) :
<div class="wp-embed-share-dialog-text">
<ul class="wp-embed-share-tabs" role="tablist">
<li id="wp-embed-share-tab-button-wordpress" class="wp-embed-share-tab-button" role="presentation">
<button role="tab" aria-controls="wp-embed-share-tab-wordpress" aria-selected="true" tabindex="0"><?php esc_html_e( 'WordPress Embed', 'oembed-api' ); ?></button>
<button role="tab" aria-controls="wp-embed-share-tab-wordpress" aria-selected="true" tabindex="0"><?php esc_html_e( 'WordPress Embed' ); ?></button>
</li>
<li id="wp-embed-share-tab-button-embed" class="wp-embed-share-tab-button" role="presentation">
<button role="tab" aria-controls="wp-embed-share-tab-html" aria-selected="false" tabindex="-1"><?php esc_html_e( 'HTML Embed', 'oembed-api' ); ?></button>
<button role="tab" aria-controls="wp-embed-share-tab-html" aria-selected="false" tabindex="-1"><?php esc_html_e( 'HTML Embed' ); ?></button>
</li>
</ul>
<div id="wp-embed-share-tab-wordpress" class="wp-embed-share-tab" role="tabpanel" aria-labelledby="wp-embed-share-tab-button-wordpress" aria-hidden="false">
<input type="text" value="<?php the_permalink(); ?>" class="wp-embed-share-input" tabindex="0" readonly/>
<p class="wp-embed-share-description">
<?php _e( 'Copy and paste this URL into your WordPress site to embed', 'oembed-api' ); ?>
<?php _e( 'Copy and paste this URL into your WordPress site to embed' ); ?>
</p>
</div>
<div id="wp-embed-share-tab-html" class="wp-embed-share-tab" role="tabpanel" aria-labelledby="wp-embed-share-tab-button-html" aria-hidden="true">
<textarea class="wp-embed-share-input" tabindex="0" readonly><?php echo esc_attr( get_post_embed_html( null, 600, 400 ) ); ?></textarea>
<p class="wp-embed-share-description">
<?php _e( 'Copy and paste this code into your site to embed', 'oembed-api' ); ?>
<?php _e( 'Copy and paste this code into your site to embed' ); ?>
</p>
</div>
</div>
<button type="button" class="wp-embed-share-dialog-close" aria-label="<?php esc_attr_e( 'Close sharing dialog', 'oembed-api' ); ?>">
<button type="button" class="wp-embed-share-dialog-close" aria-label="<?php esc_attr_e( 'Close sharing dialog' ); ?>">
<span class="dashicons dashicons-no"></span>
</button>
</div>
@ -216,10 +215,10 @@ if ( have_posts() ) :
else :
?>
<div class="wp-embed">
<p class="wp-embed-heading"><?php _e( 'Page not found', 'oembed-api' ); ?></p>
<p class="wp-embed-heading"><?php _e( 'Page not found' ); ?></p>
<div class="wp-embed-excerpt">
<p><?php _e( 'Error 404! The requested content was not found.', 'oembed-api' ) ?></p>
<p><?php _e( 'Error 404! The requested content was not found.' ) ?></p>
</div>
<div class="wp-embed-footer">

2
wp-includes/version.php
View File

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