enmi-conf.org: comparison wp/wp-includes/l10n.php

equal deleted inserted replaced

-:be944660c56a
+:3d72ae0968f4
 /**
 * Determine the current locale desired for the request.
 *
 * @since 5.0.0
 *
-* @global string $pagenow
+* @global string $pagenow The filename of the current screen.
 *
 * @return string The determined locale.
 */
 function determine_locale() {
 	/**
 	if ( isset( $_GET['_locale'] ) && 'user' === $_GET['_locale'] && wp_is_json_request() ) {
 		$determined_locale = get_user_locale();
 	}
-	if ( ! empty( $_GET['wp_lang'] ) && ! empty( $GLOBALS['pagenow'] ) && 'wp-login.php' === $GLOBALS['pagenow'] ) {
+	$wp_lang = '';
-		$determined_locale = sanitize_text_field( $_GET['wp_lang'] );
+	if ( ! empty( $_GET['wp_lang'] ) ) {
+		$wp_lang = sanitize_text_field( $_GET['wp_lang'] );
+	} elseif ( ! empty( $_COOKIE['wp_lang'] ) ) {
+		$wp_lang = sanitize_text_field( $_COOKIE['wp_lang'] );
+	}
+	if ( ! empty( $wp_lang ) && ! empty( $GLOBALS['pagenow'] ) && 'wp-login.php' === $GLOBALS['pagenow'] ) {
+		$determined_locale = $wp_lang;
 	}
 	/**
 	 * Filters the locale for the current request.
 	 *
 	$translation = apply_filters( 'gettext', $translation, $text, $domain );
 	/**
 	 * Filters text with its translation for a domain.
 	 *
-	 * The dynamic portion of the hook, `$domain`, refers to the text domain.
+	 * The dynamic portion of the hook name, `$domain`, refers to the text domain.
 	 *
 	 * @since 5.5.0
 	 *
 	 * @param string $translation Translated text.
 	 * @param string $text        Text to translate.
 	$translation = apply_filters( 'gettext_with_context', $translation, $text, $context, $domain );
 	/**
 	 * Filters text with its translation based on context information for a domain.
 	 *
-	 * The dynamic portion of the hook, `$domain`, refers to the text domain.
+	 * The dynamic portion of the hook name, `$domain`, refers to the text domain.
 	 *
 	 * @since 5.5.0
 	 *
 	 * @param string $translation Translated text.
 	 * @param string $text        Text to translate.
 *
 * @param string $text    Text to translate.
 * @param string $context Context information for the translators.
 * @param string $domain  Optional. Text domain. Unique identifier for retrieving translated strings.
 *                        Default 'default'.
-* @return string Translated context string without pipe.
 */
 function _ex( $text, $context, $domain = 'default' ) {
 	echo _x( $text, $context, $domain );
 }
 	$translation = apply_filters( 'ngettext', $translation, $single, $plural, $number, $domain );
 	/**
 	 * Filters the singular or plural form of a string for a domain.
 	 *
-	 * The dynamic portion of the hook, `$domain`, refers to the text domain.
+	 * The dynamic portion of the hook name, `$domain`, refers to the text domain.
 	 *
 	 * @since 5.5.0
 	 *
 	 * @param string $translation Translated text.
 	 * @param string $single      The text to be used if the number is singular.
 	$translation = apply_filters( 'ngettext_with_context', $translation, $single, $plural, $number, $context, $domain );
 	/**
 	 * Filters the singular or plural form of a string with gettext context for a domain.
 	 *
-	 * The dynamic portion of the hook, `$domain`, refers to the text domain.
+	 * The dynamic portion of the hook name, `$domain`, refers to the text domain.
 	 *
 	 * @since 5.5.0
 	 *
 	 * @param string $translation Translated text.
 	 * @param string $single      The text to be used if the number is singular.
 * @param string $domain   Optional. Text domain. Unique identifier for retrieving translated strings.
 *                         Default null.
 * @return array {
 *     Array of translation information for the strings.
 *
-*     @type string $0        Singular form to be localized. No longer used.
+*     @type string      $0        Singular form to be localized. No longer used.
-*     @type string $1        Plural form to be localized. No longer used.
+*     @type string      $1        Plural form to be localized. No longer used.
-*     @type string $2        Context information for the translators. No longer used.
+*     @type string      $2        Context information for the translators. No longer used.
-*     @type string $singular Singular form to be localized.
+*     @type string      $singular Singular form to be localized.
-*     @type string $plural   Plural form to be localized.
+*     @type string      $plural   Plural form to be localized.
-*     @type string $context  Context information for the translators.
+*     @type string      $context  Context information for the translators.
-*     @type string $domain   Text domain.
+*     @type string|null $domain   Text domain.
 * }
 */
 function _nx_noop( $singular, $plural, $context, $domain = null ) {
 	return array(
 		0          => $singular,
 *
 * @since 4.0.0
 * @since 4.3.0 Introduced the `echo` argument.
 * @since 4.7.0 Introduced the `show_option_site_default` argument.
 * @since 5.1.0 Introduced the `show_option_en_us` argument.
+* @since 5.9.0 Introduced the `explicit_option_en_us` argument.
 *
 * @see get_available_languages()
 * @see wp_get_available_translations()
 *
 * @param string|array $args {
 *     @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_option_site_default     Whether to show an option to fall back to the site's locale. Default false.
 *     @type bool     $show_option_en_us            Whether to show an option for English (United States). Default true.
+*     @type bool     $explicit_option_en_us        Whether the English (United States) option uses an explicit value of en_US
+*                                                  instead of an empty value. Default false.
 * }
 * @return string HTML dropdown list of languages.
 */
 function wp_dropdown_languages( $args = array() ) {
 			'selected'                    => '',
 			'echo'                        => 1,
 			'show_available_translations' => true,
 			'show_option_site_default'    => false,
 			'show_option_en_us'           => true,
+			'explicit_option_en_us'       => false,
 		)
 	);
 	// Bail if no ID or no name.
 	if ( ! $parsed_args['id'] || ! $parsed_args['name'] ) {
 		return;
 	}
 	// English (United States) uses an empty string for the value attribute.
-	if ( 'en_US' === $parsed_args['selected'] ) {
+	if ( 'en_US' === $parsed_args['selected'] && ! $parsed_args['explicit_option_en_us'] ) {
 		$parsed_args['selected'] = '';
 	}
 	$translations = $parsed_args['translations'];
 	if ( empty( $translations ) ) {
 			_x( 'Site Default', 'default site language' )
 		);
 	}
 	if ( $parsed_args['show_option_en_us'] ) {
+		$value       = ( $parsed_args['explicit_option_en_us'] ) ? 'en_US' : '';
 		$structure[] = sprintf(
-			'<option value="" lang="en" data-installed="1"%s>English (United States)</option>',
+			'<option value="%s" lang="en" data-installed="1"%s>English (United States)</option>',
+			esc_attr( $value ),
 			selected( '', $parsed_args['selected'], false )
 		);
 	}
 	// List installed languages.
 	/* @var WP_Locale_Switcher $wp_locale_switcher */
 	global $wp_locale_switcher;
 	return $wp_locale_switcher->is_switched();
 }
+/**
+* Translates the provided settings value using its i18n schema.
+*
+* @since 5.9.0
+* @access private
+*
+* @param string|string[]|array[]|object $i18n_schema I18n schema for the setting.
+* @param string|string[]|array[]        $settings    Value for the settings.
+* @param string                         $textdomain  Textdomain to use with translations.
+*
+* @return string|string[]|array[] Translated settings.
+*/
+function translate_settings_using_i18n_schema( $i18n_schema, $settings, $textdomain ) {
+	if ( empty( $i18n_schema ) || empty( $settings ) || empty( $textdomain ) ) {
+		return $settings;
+	}
+	if ( is_string( $i18n_schema ) && is_string( $settings ) ) {
+		return translate_with_gettext_context( $settings, $i18n_schema, $textdomain );
+	}
+	if ( is_array( $i18n_schema ) && is_array( $settings ) ) {
+		$translated_settings = array();
+		foreach ( $settings as $value ) {
+			$translated_settings[] = translate_settings_using_i18n_schema( $i18n_schema[0], $value, $textdomain );
+		}
+		return $translated_settings;
+	}
+	if ( is_object( $i18n_schema ) && is_array( $settings ) ) {
+		$group_key           = '*';
+		$translated_settings = array();
+		foreach ( $settings as $key => $value ) {
+			if ( isset( $i18n_schema->$key ) ) {
+				$translated_settings[ $key ] = translate_settings_using_i18n_schema( $i18n_schema->$key, $value, $textdomain );
+			} elseif ( isset( $i18n_schema->$group_key ) ) {
+				$translated_settings[ $key ] = translate_settings_using_i18n_schema( $i18n_schema->$group_key, $value, $textdomain );
+			} else {
+				$translated_settings[ $key ] = $value;
+			}
+		}
+		return $translated_settings;
+	}
+	return $settings;
+}
+/**
+* Retrieves the list item separator based on the locale.
+*
+* @since 6.0.0
+*
+* @global WP_Locale $wp_locale WordPress date and time locale object.
+*
+* @return string Locale-specific list item separator.
+*/
+function wp_get_list_item_separator() {
+	global $wp_locale;
+	return $wp_locale->get_list_item_separator();
+}

changeset 19	3d72ae0968f4
parent 18	be944660c56a
child 21	48c4eec2b7e6