Changeset 30924 for branches/4.1/src/wp-content/themes/twentyfifteen/inc/customizer.php

Timestamp:

12/16/2014 08:32:03 PM (12 years ago)

Author:

johnbillion

Message:

Twenty Fifteen: Don't escape translated strings.

Replace every unnecessary instance of esc_html__() and esc_html_e() with just __() and _e().

Merges [30896] to the 4.1 branch.

see #30724.

Location:

branches/4.1

Files:

• . (modified) (1 prop)
• src/wp-content/themes/twentyfifteen/inc/customizer.php (modified) (9 diffs)

branches/4.1/src/wp-content/themes/twentyfifteen/inc/customizer.php

@@ -34 +34 @@
 
         $wp_customize->add_control( 'color_scheme', array(
-                'label'    => esc_html__( 'Base Color Scheme', 'twentyfifteen' ),
+                'label'    => __( 'Base Color Scheme', 'twentyfifteen' ),
                 'section'  => 'colors',
                 'type'     => 'select',
@@ -49 +49 @@
 
         $wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'sidebar_textcolor', array(
-                'label'       => esc_html__( 'Header and Sidebar Text Color', 'twentyfifteen' ),
-                'description' => esc_html__( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' ),
+                'label'       => __( 'Header and Sidebar Text Color', 'twentyfifteen' ),
+                'description' => __( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' ),
                 'section'     => 'colors',
         ) ) );
@@ -65 +65 @@
 
         $wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'header_background_color', array(
-                'label'       => esc_html__( 'Header and Sidebar Background Color', 'twentyfifteen' ),
-                'description' => esc_html__( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' ),
+                'label'       => __( 'Header and Sidebar Background Color', 'twentyfifteen' ),
+                'description' => __( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' ),
                 'section'     => 'colors',
         ) ) );
 
         // Add an additional description to the header image section.
-        $wp_customize->get_section( 'header_image' )->description = esc_html__( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' );
+        $wp_customize->get_section( 'header_image' )->description = __( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' );
 }
 add_action( 'customize_register', 'twentyfifteen_customize_register', 11 );
@@ -95 +95 @@
         return apply_filters( 'twentyfifteen_color_schemes', array(
                 'default' => array(
-                        'label'  => esc_html__( 'Default', 'twentyfifteen' ),
+                        'label'  => __( 'Default', 'twentyfifteen' ),
                         'colors' => array(
                                 '#f1f1f1',
@@ -106 +106 @@
                 ),
                 'dark'    => array(
-                        'label'  => esc_html__( 'Dark', 'twentyfifteen' ),
+                        'label'  => __( 'Dark', 'twentyfifteen' ),
                         'colors' => array(
                                 '#111111',
@@ -117 +117 @@
                 ),
                 'yellow'  => array(
-                        'label'  => esc_html__( 'Yellow', 'twentyfifteen' ),
+                        'label'  => __( 'Yellow', 'twentyfifteen' ),
                         'colors' => array(
                                 '#f4ca16',
@@ -128 +128 @@
                 ),
                 'pink'    => array(
-                        'label'  => esc_html__( 'Pink', 'twentyfifteen' ),
+                        'label'  => __( 'Pink', 'twentyfifteen' ),
                         'colors' => array(
                                 '#ffe5d1',
@@ -139 +139 @@
                 ),
                 'purple'  => array(
-                        'label'  => esc_html__( 'Purple', 'twentyfifteen' ),
+                        'label'  => __( 'Purple', 'twentyfifteen' ),
                         'colors' => array(
                                 '#674970',
@@ -150 +150 @@
                 ),
                 'blue'   => array(
-                        'label'  => esc_html__( 'Blue', 'twentyfifteen' ),
+                        'label'  => __( 'Blue', 'twentyfifteen' ),
                         'colors' => array(
                                 '#e9f2f9',