vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-07-01 15:50:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

I18N: Add ability to change user's locale back to site's locale.

Browse Source 
Previously there was no way to remove the user locale setting again, even though that might be desirable.

This adds a new 'Site Default' option to the user-specific language setting by introducing a new `show_site_locale_default` argument to `wp_dropdown_languages()`.

Props ocean90.
See #29783.
Fixes #38632.

git-svn-id: https://develop.svn.wordpress.org/trunk@39169 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Pascal Birchler
2016-11-08 23:00:38 +00:00
parent 5f610350e1
commit 21e874e00a
6 changed files with 95 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1048,6 +1048,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.
*
* @see get_available_languages()
* @see wp_get_available_translations()
@@ -1065,6 +1066,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.
* }
* @return string HTML content
*/
@@ -1078,8 +1080,14 @@ function wp_dropdown_languages( $args = array() ) {
'selected' => '',
'echo' => 1,
'show_available_translations' => true,
'show_site_locale_default' => false,
) );
// English (United States) uses an empty string for the value attribute.
if ( 'en_US' === $args['selected'] ) {
$args['selected'] = '';
}
$translations = $args['translations'];
if ( empty( $translations ) ) {
require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
@@ -1122,7 +1130,20 @@ function wp_dropdown_languages( $args = array() ) {
if ( $translations_available ) {
$structure[] = '<optgroup label="' . esc_attr_x( 'Installed', 'translations' ) . '">';
}
$structure[] = '<option value="" lang="en" data-installed="1">English (United States)</option>';
if ( $args['show_site_locale_default'] ) {
$structure[] = sprintf(
'<option value="site-default" data-installed="1"%s>%s</option>',
selected( 'site-default', $args['selected'], false ),
_x( 'Site Default', 'default site language' )
);
}
$structure[] = sprintf(
'<option value="" lang="en" data-installed="1"%s>English (United States)</option>',
selected( '', $args['selected'], false )
);
foreach ( $languages as $language ) {
$structure[] = sprintf(
'<option value="%s" lang="%s"%s data-installed="1">%s</option>',