Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-27 15:24:59 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Dominik Schilling 2016-11-21 16:14:30 +00:00
parent f5b6731777
commit 2328e7b17a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/user-edit.php
View File

@ -295,7 +295,7 @@ if ( $languages ) : ?>
'selected' => $user_locale, 'selected' => $user_locale,
'languages' => $languages, 'languages' => $languages,
'show_available_translations' => false, 'show_available_translations' => false,
'show_site_locale_default' => true 'show_option_site_default' => true
) ); ) );
?> ?>
</td> </td>

8
wp-includes/l10n.php
View File

@ -1108,7 +1108,7 @@ function wp_get_pomo_file_data( $po_file ) {
* *
* @since 4.0.0 * @since 4.0.0
* @since 4.3.0 Introduced the `echo` argument. * @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 get_available_languages()
* @see wp_get_available_translations() * @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 * @type bool|int $echo Whether to echo the generated markup. Accepts 0, 1, or their
* boolean equivalents. Default 1. * boolean equivalents. Default 1.
* @type bool $show_available_translations Whether to show available translations. Default true. * @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 * @return string HTML content
*/ */
@ -1140,7 +1140,7 @@ function wp_dropdown_languages( $args = array() ) {
'selected' => '', 'selected' => '',
'echo' => 1, 'echo' => 1,
'show_available_translations' => true, '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. // 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' ) . '">'; $structure[] = '<optgroup label="' . esc_attr_x( 'Installed', 'translations' ) . '">';
} }
if ( $args['show_site_locale_default'] ) { if ( $args['show_option_site_default'] ) {
$structure[] = sprintf( $structure[] = sprintf(
'<option value="site-default" data-installed="1"%s>%s</option>', '<option value="site-default" data-installed="1"%s>%s</option>',
selected( 'site-default', $args['selected'], false ), selected( 'site-default', $args['selected'], false ),

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.