Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-28 07:07:38 +02:00
Code Issues Projects Releases Wiki Activity

Allow wp_dropdown_languages() to return the markup instead of displaying.

Browse Source 
props leewillis77, juliobox.
fixes #32432.
Built from https://develop.svn.wordpress.org/trunk@32510


git-svn-id: http://core.svn.wordpress.org/trunk@32480 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-05-19 00:33:26 +00:00
parent 348ec03052
commit d40fe7d80b
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
wp-includes/l10n.php
View File

@ -851,6 +851,7 @@ function wp_get_pomo_file_data( $po_file ) {
* Language selector. * Language selector.
* *
* @since 4.0.0 * @since 4.0.0
* @since 4.3.0 Introduced the `echo` argument.
* *
* @see get_available_languages() * @see get_available_languages()
* @see wp_get_available_translations() * @see wp_get_available_translations()
@ -858,15 +859,18 @@ function wp_get_pomo_file_data( $po_file ) {
* @param string|array $args { * @param string|array $args {
* Optional. Array or string of arguments for outputting the language selector. * Optional. Array or string of arguments for outputting the language selector.
* *
* @type string $id ID attribute of the select element. Default empty. * @type string $id ID attribute of the select element. Default empty.
* @type string $name Name attribute of the select element. Default empty. * @type string $name Name attribute of the select element. Default empty.
* @type array $languages List of installed languages, contain only the locales. * @type array $languages List of installed languages, contain only the locales.
* Default empty array. * Default empty array.
* @type array $translations List of available translations. Default result of * @type array $translations List of available translations. Default result of
* {@see wp_get_available_translations()}. * {@see wp_get_available_translations()}.
* @type string $selected Language which should be selected. Default empty. * @type string $selected Language which should be selected. Default empty.
* @type bool $show_available_translations Whether to show available translations. Default true. * @type bool|int $echo Whether to echo or return the generated markup. Accepts 0, 1, or their
* bool equivalents. Default 1.
* @type bool $show_available_translations Whether to show available translations. Default true.
* } * }
* @return string HTML content only if 'echo' argument is 0.
*/ */
function wp_dropdown_languages( $args = array() ) { function wp_dropdown_languages( $args = array() ) {
@ -876,6 +880,7 @@ function wp_dropdown_languages( $args = array() ) {
'languages' => array(), 'languages' => array(),
'translations' => array(), 'translations' => array(),
'selected' => '', 'selected' => '',
'echo' => 1,
'show_available_translations' => true, 'show_available_translations' => true,
) ); ) );
@ -912,7 +917,7 @@ function wp_dropdown_languages( $args = array() ) {
$translations_available = ( ! empty( $translations ) && $args['show_available_translations'] ); $translations_available = ( ! empty( $translations ) && $args['show_available_translations'] );
printf( '<select name="%s" id="%s">', esc_attr( $args['name'] ), esc_attr( $args['id'] ) ); $output = sprintf( '<select name="%s" id="%s">', esc_attr( $args['name'] ), esc_attr( $args['id'] ) );
// Holds the HTML markup. // Holds the HTML markup.
$structure = array(); $structure = array();
@ -950,7 +955,13 @@ function wp_dropdown_languages( $args = array() ) {
$structure[] = '</optgroup>'; $structure[] = '</optgroup>';
} }
echo join( "\n", $structure ); $output .= join( "\n", $structure );
echo '</select>'; $output .= '</select>';
if ( $args['echo'] ) {
echo $output;
}
return $output;
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.3-alpha-32509'; $wp_version = '4.3-alpha-32510';
/** /**
* 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.