Changeset 39331

Timestamp:

11/21/2016 04:14:01 PM (8 years ago)

Author:

ocean90

Message:

I18N: In wp_dropdown_languages() rename the new show_site_locale_default argument to show_option_site_default.

This makes it consistent with arguments of other wp_dropdown_*() functions.

Props SergeyBiryukov.
See #38632.
Fixes #38871.

Location:

trunk

Files:

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

trunk/src/wp-admin/user-edit.php

@@ -296 +296 @@
             'languages'                   => $languages,
             'show_available_translations' => false,
-            'show_site_locale_default'    => true
+            'show_option_site_default'    => true
         ) );
         ?>

trunk/src/wp-includes/l10n.php

@@ -1109 +1109 @@
  * @since 4.0.0
  * @since 4.3.0 Introduced the `echo` argument.
- * @since 4.7.0 Introduced the `show_site_locale_default` argument.
+ * @since 4.7.0 Introduced the `show_option_site_default` argument.
  *
  * @see get_available_languages()
@@ -1127 +1127 @@
  *                                                  boolean equivalents. Default 1.
  *     @type bool     $show_available_translations  Whether to show available translations. Default true.
- *     @type bool     $show_site_locale_default     Whether to show an option to fall back to the site's locale. Default false.
+ *     @type bool     $show_option_site_default     Whether to show an option to fall back to the site's locale. Default false.
  * }
  * @return string HTML content
@@ -1141 +1141 @@
         'echo'         => 1,
         'show_available_translations' => true,
-        'show_site_locale_default'    => false,
+        'show_option_site_default'    => false,
     ) );
 
@@ -1192 +1192 @@
     }
 
-    if ( $args['show_site_locale_default'] ) {
+    if ( $args['show_option_site_default'] ) {
         $structure[] = sprintf(
             '<option value="site-default" data-installed="1"%s>%s</option>',

trunk/tests/phpunit/tests/l10n.php

@@ -111 +111 @@
             'selected'                 => 'de_DE',
             'echo'                     => false,
-            'show_site_locale_default' => true,
+            'show_option_site_default' => true,
         );
         $actual = wp_dropdown_languages( $args );