From 2328e7b17a7627d16275a145ad6d1a484529e583 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Mon, 21 Nov 2016 16:14:30 +0000
Subject: [PATCH] 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.
Built from https://develop.svn.wordpress.org/trunk@39331


git-svn-id: http://core.svn.wordpress.org/trunk@39271 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/user-edit.php  | 2 +-
 wp-includes/l10n.php    | 8 ++++----
 wp-includes/version.php | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index f1dc417e68..2222ae2617 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -295,7 +295,7 @@ if ( $languages ) : ?>
 			'selected'                    => $user_locale,
 			'languages'                   => $languages,
 			'show_available_translations' => false,
-			'show_site_locale_default'    => true
+			'show_option_site_default'    => true
 		) );
 		?>
 	</td>
diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php
index 524beb49d9..20a18f96a2 100644
--- a/wp-includes/l10n.php
+++ b/wp-includes/l10n.php
@@ -1108,7 +1108,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_site_locale_default` argument.
+ * @since 4.7.0 Introduced the `show_option_site_default` argument.
  *
  * @see get_available_languages()
  * @see wp_get_available_translations()
@@ -1126,7 +1126,7 @@ function wp_get_pomo_file_data( $po_file ) {
  *     @type bool|int $echo                         Whether to echo the generated markup. Accepts 0, 1, or their
  *                                                  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
  */
@@ -1140,7 +1140,7 @@ function wp_dropdown_languages( $args = array() ) {
 		'selected'     => '',
 		'echo'         => 1,
 		'show_available_translations' => true,
-		'show_site_locale_default'    => false,
+		'show_option_site_default'    => false,
 	) );
 
 	// English (United States) uses an empty string for the value attribute.
@@ -1191,7 +1191,7 @@ function wp_dropdown_languages( $args = array() ) {
 		$structure[] = '<optgroup label="' . esc_attr_x( 'Installed', 'translations' ) . '">';
 	}
 
-	if ( $args['show_site_locale_default'] ) {
+	if ( $args['show_option_site_default'] ) {
 		$structure[] = sprintf(
 			'<option value="site-default" data-installed="1"%s>%s</option>',
 			selected( 'site-default', $args['selected'], false ),
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 287168434e..ea8ab77e4f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-beta4-39330';
+$wp_version = '4.7-beta4-39331';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.