Changeset 48861 for trunk

Timestamp:

08/26/2020 01:33:45 AM (6 years ago)

Author:

SergeyBiryukov

Message:

Twenty Twenty: Add context to adjectives and homonyms.

This allows for better localization in languages where adjectives are translated differently depending on which noun they modify, or when a different translation is required for a noun vs. a verb.

Props dimadin, justinahinon.
Fixes #49797.

Location:

trunk/src/wp-content/themes/twentytwenty

Files:

• classes/class-twentytwenty-customize.php (modified) (1 diff)
• functions.php (modified) (1 diff)
• header.php (modified) (3 diffs)
• template-parts/modal-menu.php (modified) (2 diffs)

trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-customize.php

@@ -123 +123 @@
                                         'label'   => __( 'Primary Color', 'twentytwenty' ),
                                         'choices' => array(
-                                                'default' => __( 'Default', 'twentytwenty' ),
-                                                'custom'  => __( 'Custom', 'twentytwenty' ),
+                                                'default' => _x( 'Default', 'color', 'twentytwenty' ),
+                                                'custom'  => _x( 'Custom', 'color', 'twentytwenty' ),
                                         ),
                                 )

trunk/src/wp-content/themes/twentytwenty/functions.php

@@ -487 +487 @@
                 ),
                 array(
-                        'name'  => __( 'Primary', 'twentytwenty' ),
+                        'name'  => _x( 'Primary', 'color', 'twentytwenty' ),
                         'slug'  => 'primary',
                         'color' => twentytwenty_get_color_for_area( 'content', 'text' ),
                 ),
                 array(
-                        'name'  => __( 'Secondary', 'twentytwenty' ),
+                        'name'  => _x( 'Secondary', 'color', 'twentytwenty' ),
                         'slug'  => 'secondary',
                         'color' => twentytwenty_get_color_for_area( 'content', 'secondary' ),

trunk/src/wp-content/themes/twentytwenty/header.php

@@ -51 +51 @@
                                                                         <?php twentytwenty_the_theme_svg( 'search' ); ?>
                                                                 </span>
-                                                                <span class="toggle-text"><?php _e( 'Search', 'twentytwenty' ); ?></span>
+                                                                <span class="toggle-text"><?php _ex( 'Search', 'toggle text', 'twentytwenty' ); ?></span>
                                                         </span>
                                                 </button><!-- .search-toggle -->
@@ -86 +86 @@
                                                 ?>
 
-                                                        <nav class="primary-menu-wrapper" aria-label="<?php esc_attr_e( 'Horizontal', 'twentytwenty' ); ?>" role="navigation">
+                                                        <nav class="primary-menu-wrapper" aria-label="<?php echo esc_attr_x( 'Horizontal', 'menu', 'twentytwenty' ); ?>" role="navigation">
 
                                                                 <ul class="primary-menu reset-list-style">
@@ -155 +155 @@
                                                                         <span class="toggle-inner">
                                                                                 <?php twentytwenty_the_theme_svg( 'search' ); ?>
-                                                                                <span class="toggle-text"><?php _e( 'Search', 'twentytwenty' ); ?></span>
+                                                                                <span class="toggle-text"><?php _ex( 'Search', 'toggle text', 'twentytwenty' ); ?></span>
                                                                         </span>
                                                                 </button><!-- .search-toggle -->

trunk/src/wp-content/themes/twentytwenty/template-parts/modal-menu.php

@@ -46 +46 @@
                                         ?>
 
-                                        <nav class="expanded-menu<?php echo esc_attr( $expanded_nav_classes ); ?>" aria-label="<?php esc_attr_e( 'Expanded', 'twentytwenty' ); ?>" role="navigation">
+                                        <nav class="expanded-menu<?php echo esc_attr( $expanded_nav_classes ); ?>" aria-label="<?php echo esc_attr_x( 'Expanded', 'menu', 'twentytwenty' ); ?>" role="navigation">
 
                                                 <ul class="modal-menu reset-list-style">
@@ -71 +71 @@
                                         ?>
 
-                                        <nav class="mobile-menu" aria-label="<?php esc_attr_e( 'Mobile', 'twentytwenty' ); ?>" role="navigation">
+                                        <nav class="mobile-menu" aria-label="<?php echo esc_attr_x( 'Mobile', 'menu', 'twentytwenty' ); ?>" role="navigation">
 
                                                 <ul class="modal-menu reset-list-style">