Changeset 44514

Timestamp:

01/09/2019 11:45:02 AM (8 years ago)

Author:

swissspidy

Message:

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

Props danieltj for initial patch.
Fixes #44494.

Location:

trunk

Files:

• src/wp-includes/l10n.php (modified) (4 diffs)
• tests/phpunit/tests/l10n.php (modified) (1 diff)

trunk/src/wp-includes/l10n.php

@@ -1365 +1365 @@
  * @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()
@@ -1383 +1384 @@
  *     @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
@@ -1399 +1401 @@
                         'show_available_translations' => true,
                         'show_option_site_default'    => false,
+                        'show_option_en_us'           => true,
                 )
         );
@@ -1462 +1465 @@
         }
 
-        // 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.

trunk/tests/phpunit/tests/l10n.php

@@ -123 +123 @@
                 $this->assertContains( '<option value="it_IT" lang="it">Italiano</option>', $actual );
                 $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 );
         }