Changeset 34904

Timestamp:

10/07/2015 11:00:59 AM (11 years ago)

Author:

pento

Message:

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

Location:

trunk

Files:

• phpunit.xml.dist (modified) (1 diff)
• src/wp-includes/class-wp-oembed-controller.php (modified) (1 diff)
• src/wp-includes/embed-functions.php (modified) (2 diffs)
• src/wp-includes/embed-template.php (modified) (6 diffs)

trunk/phpunit.xml.dist

@@ -16 +16 @@
             <file phpVersion="5.3.0">tests/phpunit/tests/image/editor_gd.php</file>
             <file phpVersion="5.3.0">tests/phpunit/tests/image/editor_imagick.php</file>
+            <file phpVersion="5.3.0">tests/phpunit/tests/oembed/headers.php</file>
         </testsuite>
     </testsuites>

trunk/src/wp-includes/class-wp-oembed-controller.php

@@ -89 +89 @@
                 if ( false === $data ) {
                         status_header( 404 );
-                        return __( 'Invalid URL.', 'oembed-api' );
+                        return __( 'Invalid URL.' );
                 }
 

trunk/src/wp-includes/embed-functions.php

@@ -485 +485 @@
                 absint( $width ),
                 absint( $height ),
-                esc_attr__( 'Embedded WordPress Post', 'oembed-api' )
+                esc_attr__( 'Embedded WordPress Post' )
         );
 
@@ -749 +749 @@
 
         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' )
                 )
         );

trunk/src/wp-includes/embed-template.php

@@ -162 +162 @@
                                                                                 '%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() )
@@ -173 +172 @@
                                         <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>
@@ -184 +183 @@
                                                 <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>
@@ -194 +193 @@
 
                                                         <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>
@@ -201 +200 @@
 
                                                         <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>
@@ -217 +216 @@
         ?>
         <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>