sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

I18N: Add option to hide en_US locale in wp_dropdown_languages().

Browse Source 
Props danieltj for initial patch.
Fixes #44494.


git-svn-id: https://develop.svn.wordpress.org/trunk@44514 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Pascal Birchler 2019-01-09 11:45:02 +00:00
parent e4e9010207
commit a8cb5d247e
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/wp-includes/l10n.php
View File

@ -1364,6 +1364,7 @@ function wp_get_pomo_file_data( $po_file ) {
* @since 4.0.0
* @since 4.3.0 Introduced the `echo` argument.
* @since 4.7.0 Introduced the `show_option_site_default` argument.
* @since 5.1.0 Introduced the `show_option_en_us` argument.
*
* @see get_available_languages()
* @see wp_get_available_translations()
@ -1382,6 +1383,7 @@ function wp_get_pomo_file_data( $po_file ) {
* boolean equivalents. Default 1.
* @type bool $show_available_translations Whether to show available translations. Default true.
* @type bool $show_option_site_default Whether to show an option to fall back to the site's locale. Default false.
* @type bool $show_option_en_us Whether to show an option for English (United States). Default true.
* }
* @return string HTML content
*/
@ -1398,6 +1400,7 @@ function wp_dropdown_languages( $args = array() ) {
'echo' => 1,
'show_available_translations' => true,
'show_option_site_default' => false,
'show_option_en_us' => true,
)
);
@ -1461,11 +1464,12 @@ function wp_dropdown_languages( $args = array() ) {
);
}
// Always show English.
$structure[] = sprintf(
'<option value="" lang="en" data-installed="1"%s>English (United States)</option>',
selected( '', $parsed_args['selected'], false )
);
if ( $parsed_args['show_option_en_us'] ) {
$structure[] = sprintf(
'<option value="" lang="en" data-installed="1"%s>English (United States)</option>',
selected( '', $parsed_args['selected'], false )
);
}
// List installed languages.
foreach ( $languages as $language ) {

18
tests/phpunit/tests/l10n.php
View File

@ -124,6 +124,24 @@ class Tests_L10n extends WP_UnitTestCase {
$this->assertContains( '<option value="ja_JP" lang="ja">日本語</option>', $actual );
}
/**
* @ticket 44494
*/
function test_wp_dropdown_languages_exclude_en_us() {
$args = array(
'id' => 'foo',
'name' => 'bar',
'languages' => array( 'de_DE' ),
'translations' => $this->wp_dropdown_languages_filter(),
'selected' => 'de_DE',
'echo' => false,
'show_option_en_us' => false,
);
$actual = wp_dropdown_languages( $args );
$this->assertNotContains( '<option value="" lang="en" data-installed="1">English (United States)</option>', $actual );
}
/**
* @ticket 38632
*/