Skip to content

Editor: Replace translation functions with context-aware equivalents for 'Clear' button #11890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shreyasikhar wants to merge 1 commit into
base: trunk
Choose a base branch
from
+6 −5
Open

Editor: Replace translation functions with context-aware equivalents for 'Clear' button #11890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/js/_enqueues/lib/color-picker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
_button = '<input type="button" class="button button-small" />',
_wrappingLabel = '<label></label>',
_wrappingLabelText = '<span class="screen-reader-text"></span>',
__ = wp.i18n.__;
__ = wp.i18n.__,
_x = wp.i18n._x;

/**
* Creates a jQuery UI color picker that is used in the theme customizer.
Expand Down Expand Up @@ -151,7 +152,7 @@
} else {
self.button
.addClass( 'wp-picker-clear' )
.val( __( 'Clear' ) )
.val( _x( 'Clear', 'reset color' ) )
.attr( 'aria-label', __( 'Clear color' ) );
}

Expand Down
4 changes: 2 additions & 2 deletions src/wp-admin/theme-install.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@
<div class="filter-drawer">
<div class="buttons">
<button type="button" class="apply-filters button"><?php _e( 'Apply Filters' ); ?><span></span></button>
<button type="button" class="clear-filters button" aria-label="<?php esc_attr_e( 'Clear current filters' ); ?>"><?php _e( 'Clear' ); ?></button>
<button type="button" class="clear-filters button" aria-label="<?php esc_attr_e( 'Clear current filters' ); ?>"><?php echo esc_html_x( 'Clear', 'clear filters' ); ?></button>
</div>
<?php
// Use the core list, rather than the .org API, due to inconsistencies
Expand All @@ -263,7 +263,7 @@
?>
<div class="buttons">
<button type="button" class="apply-filters button"><?php _e( 'Apply Filters' ); ?><span></span></button>
<button type="button" class="clear-filters button" aria-label="<?php esc_attr_e( 'Clear current filters' ); ?>"><?php _e( 'Clear' ); ?></button>
<button type="button" class="clear-filters button" aria-label="<?php esc_attr_e( 'Clear current filters' ); ?>"><?php echo esc_html_x( 'Clear', 'clear filters' ); ?></button>
</div>
<div class="filtered-by">
<span><?php _e( 'Filtering by:' ); ?></span>
Expand Down
2 changes: 1 addition & 1 deletion src/wp-includes/media-template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@ function wp_print_media_templates() {
<button type="button" class="button-link edit-selection"><?php _e( 'Edit Selection' ); ?></button>
<# } #>
<# if ( data.clearable ) { #>
<button type="button" class="button-link clear-selection"><?php _e( 'Clear' ); ?></button>
<button type="button" class="button-link clear-selection"><?php echo esc_html_x( 'Clear', 'reset selection' ); ?></button>
<# } #>
</div>
<div class="selection-view"></div>
Expand Down
Loading