Changeset 41550

Timestamp:

09/20/2017 09:23:51 PM (9 years ago)

Author:

westonruter

Message:

Customize: Let media control button labels better automatically reflect the specified MIME type.

Props Christian1012, celloexpressions, westonruter.
Fixes #38796.

Location:

trunk/src/wp-includes

Files:

• class-wp-customize-manager.php (modified) (1 diff)
• customize/class-wp-customize-image-control.php (modified) (1 diff)
• customize/class-wp-customize-media-control.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -4005 +4005 @@
                         'section'        => 'header_image',
                         'mime_type'      => 'video',
-                        // @todo These button_labels can be removed once WP_Customize_Media_Control provides mime_type-specific labels automatically. See <https://core.trac.wordpress.org/ticket/38796>.
-                        'button_labels'  => array(
-                                'select'       => __( 'Select Video' ),
-                                'change'       => __( 'Change Video' ),
-                                'placeholder'  => __( 'No video selected' ),
-                                'frame_title'  => __( 'Select Video' ),
-                                'frame_button' => __( 'Choose Video' ),
-                        ),
                         'active_callback' => 'is_header_video_active',
                 ) ) );

trunk/src/wp-includes/customize/class-wp-customize-image-control.php

@@ -18 +18 @@
         public $type = 'image';
         public $mime_type = 'image';
-
-        /**
-         * Constructor.
-         *
-         * @since 3.4.0
-         * @uses WP_Customize_Upload_Control::__construct()
-         *
-         * @param WP_Customize_Manager $manager Customizer bootstrap instance.
-         * @param string               $id      Control ID.
-         * @param array                $args    Optional. Arguments to override class property defaults.
-         */
-        public function __construct( $manager, $id, $args = array() ) {
-                parent::__construct( $manager, $id, $args );
-
-                $this->button_labels = wp_parse_args( $this->button_labels, array(
-                        'select'       => __( 'Select Image' ),
-                        'change'       => __( 'Change Image' ),
-                        'remove'       => __( 'Remove' ),
-                        'default'      => __( 'Default' ),
-                        'placeholder'  => __( 'No image selected' ),
-                        'frame_title'  => __( 'Select Image' ),
-                        'frame_button' => __( 'Choose Image' ),
-                ) );
-        }
 
         /**

trunk/src/wp-includes/customize/class-wp-customize-media-control.php

@@ -53 +53 @@
                 parent::__construct( $manager, $id, $args );
 
-                if ( ! ( $this instanceof WP_Customize_Image_Control ) ) {
-                        $this->button_labels = wp_parse_args( $this->button_labels, array(
-                                'select'       => __( 'Select File' ),
-                                'change'       => __( 'Change File' ),
-                                'default'      => __( 'Default' ),
-                                'remove'       => __( 'Remove' ),
-                                'placeholder'  => __( 'No file selected' ),
-                                'frame_title'  => __( 'Select File' ),
-                                'frame_button' => __( 'Choose File' ),
-                        ) );
-                }
+                $this->button_labels = wp_parse_args( $this->button_labels, $this->get_default_button_labels() );
         }
 
@@ -210 +200 @@
                 <?php
         }
+
+        /**
+         * Get default button labels.
+         *
+         * Provides an array of the default button labels based on the mime type of the current control.
+         *
+         * @since 4.9.0
+         *
+         * @return array An associative array of default button labels.
+         */
+        public function get_default_button_labels() {
+                // Get just the mime type and strip the mime subtype if present.
+                $mime_type = ! empty( $this->mime_type ) ? strtok( ltrim( $this->mime_type, '/' ), '/' ) : 'default';
+
+                switch ( $mime_type ) {
+                        case 'video':
+                                return array(
+                                        'select'       => __( 'Select video' ),
+                                        'change'       => __( 'Change video' ),
+                                        'default'      => __( 'Default' ),
+                                        'remove'       => __( 'Remove' ),
+                                        'placeholder'  => __( 'No video selected' ),
+                                        'frame_title'  => __( 'Select video' ),
+                                        'frame_button' => __( 'Choose video' ),
+                                );
+                        case 'audio':
+                                return array(
+                                        'select'       => __( 'Select audio' ),
+                                        'change'       => __( 'Change audio' ),
+                                        'default'      => __( 'Default' ),
+                                        'remove'       => __( 'Remove' ),
+                                        'placeholder'  => __( 'No audio selected' ),
+                                        'frame_title'  => __( 'Select audio' ),
+                                        'frame_button' => __( 'Choose audio' ),
+                                );
+                        case 'image':
+                                return array(
+                                        'select'       => __( 'Select image' ),
+                                        'change'       => __( 'Change image' ),
+                                        'default'      => __( 'Default' ),
+                                        'remove'       => __( 'Remove' ),
+                                        'placeholder'  => __( 'No image selected' ),
+                                        'frame_title'  => __( 'Select image' ),
+                                        'frame_button' => __( 'Choose image' ),
+                                );
+                        default:
+                                return array(
+                                        'select'       => __( 'Select file' ),
+                                        'change'       => __( 'Change file' ),
+                                        'default'      => __( 'Default' ),
+                                        'remove'       => __( 'Remove' ),
+                                        'placeholder'  => __( 'No file selected' ),
+                                        'frame_title'  => __( 'Select file' ),
+                                        'frame_button' => __( 'Choose file' ),
+                                );
+                } // End switch().
+        }
 }