X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/46588ee871246a923d972538dbc93b26f4fda932..8d3bb1a5dcfdea9857d3c88c3751f09593e34dc8:/wp-includes/l10n.php diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php index 339602b1..c6377745 100644 --- a/wp-includes/l10n.php +++ b/wp-includes/l10n.php @@ -1,34 +1,38 @@ translate( $text ); /** - * Filter text with its translation. + * Filters text with its translation. * * @since 2.0.11 * @@ -113,10 +118,11 @@ function translate( $text, $domain = 'default' ) { */ function before_last_bar( $string ) { $last_bar = strrpos( $string, '|' ); - if ( false == $last_bar ) + if ( false === $last_bar ) { return $string; - else + } else { return substr( $string, 0, $last_bar ); + } } /** @@ -125,18 +131,21 @@ function before_last_bar( $string ) { * If there is no translation, or the text domain isn't loaded the original * text is returned. * + * *Note:* Don't use translate_with_gettext_context() directly, use _x() or related functions. + * * @since 2.8.0 * * @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 text on success, original text on failure. */ function translate_with_gettext_context( $text, $context, $domain = 'default' ) { $translations = get_translations_for_domain( $domain ); $translations = $translations->translate( $text, $context ); /** - * Filter text with its translation based on context information. + * Filters text with its translation based on context information. * * @since 2.8.0 * @@ -149,13 +158,15 @@ function translate_with_gettext_context( $text, $context, $domain = 'default' ) } /** - * Retrieve the translation of $text. If there is no translation, - * or the text domain isn't loaded, the original text is returned. + * Retrieve the translation of $text. + * + * If there is no translation, or the text domain isn't loaded, the original text is returned. * * @since 2.1.0 * * @param string $text Text to translate. * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. + * Default 'default'. * @return string Translated text. */ function __( $text, $domain = 'default' ) { @@ -171,6 +182,7 @@ function __( $text, $domain = 'default' ) { * * @param string $text Text to translate. * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. + * Default 'default'. * @return string Translated text on success, original text on failure. */ function esc_attr__( $text, $domain = 'default' ) { @@ -186,6 +198,7 @@ function esc_attr__( $text, $domain = 'default' ) { * * @param string $text Text to translate. * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. + * Default 'default'. * @return string Translated text */ function esc_html__( $text, $domain = 'default' ) { @@ -199,6 +212,7 @@ function esc_html__( $text, $domain = 'default' ) { * * @param string $text Text to translate. * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. + * Default 'default'. */ function _e( $text, $domain = 'default' ) { echo translate( $text, $domain ); @@ -211,6 +225,7 @@ function _e( $text, $domain = 'default' ) { * * @param string $text Text to translate. * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. + * Default 'default'. */ function esc_attr_e( $text, $domain = 'default' ) { echo esc_attr( translate( $text, $domain ) ); @@ -223,6 +238,7 @@ function esc_attr_e( $text, $domain = 'default' ) { * * @param string $text Text to translate. * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. + * Default 'default'. */ function esc_html_e( $text, $domain = 'default' ) { echo esc_html( translate( $text, $domain ) ); @@ -242,6 +258,7 @@ function esc_html_e( $text, $domain = 'default' ) { * @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 _x( $text, $context, $domain = 'default' ) { @@ -256,6 +273,7 @@ function _x( $text, $context, $domain = 'default' ) { * @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' ) { @@ -270,6 +288,7 @@ function _ex( $text, $context, $domain = 'default' ) { * @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 text */ function esc_attr_x( $text, $context, $domain = 'default' ) { @@ -284,6 +303,7 @@ function esc_attr_x( $text, $context, $domain = 'default' ) { * @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 text. */ function esc_html_x( $text, $context, $domain = 'default' ) { @@ -291,67 +311,77 @@ function esc_html_x( $text, $context, $domain = 'default' ) { } /** - * Retrieve the plural or single form based on the supplied amount. + * Translates and retrieves the singular or plural form based on the supplied number. * - * If the text domain is not set in the $l10n list, then a comparison will be made - * and either $plural or $single parameters returned. + * Used when you want to use the appropriate form of a string based on whether a + * number is singular or plural. + * + * Example: * - * If the text domain does exist, then the parameters $single, $plural, and $number - * will first be passed to the text domain's ngettext method. Then it will be passed - * to the 'ngettext' filter hook along with the same parameters. The expected - * type will be a string. + * $people = sprintf( _n( '%s person', '%s people', $count, 'text-domain' ), number_format_i18n( $count ) ); * * @since 2.8.0 * - * @param string $single The text that will be used if $number is 1. - * @param string $plural The text that will be used if $number is not 1. - * @param int $number The number to compare against to use either $single or $plural. + * @param string $single The text to be used if the number is singular. + * @param string $plural The text to be used if the number is plural. + * @param int $number The number to compare against to use either the singular or plural form. * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. - * @return string Either $single or $plural translated text. + * Default 'default'. + * @return string The translated singular or plural form. */ function _n( $single, $plural, $number, $domain = 'default' ) { $translations = get_translations_for_domain( $domain ); $translation = $translations->translate_plural( $single, $plural, $number ); + /** - * Filter text with its translation when plural option is available. + * Filters the singular or plural form of a string. * * @since 2.2.0 * * @param string $translation Translated text. - * @param string $single The text that will be used if $number is 1. - * @param string $plural The text that will be used if $number is not 1. - * @param string $number The number to compare against to use either $single or $plural. + * @param string $single The text to be used if the number is singular. + * @param string $plural The text to be used if the number is plural. + * @param string $number The number to compare against to use either the singular or plural form. * @param string $domain Text domain. Unique identifier for retrieving translated strings. */ return apply_filters( 'ngettext', $translation, $single, $plural, $number, $domain ); } /** - * Retrieve the plural or single form based on the supplied amount with gettext context. + * Translates and retrieves the singular or plural form based on the supplied number, with gettext context. + * + * This is a hybrid of _n() and _x(). It supports context and plurals. * - * This is a hybrid of _n() and _x(). It supports contexts and plurals. + * Used when you want to use the appropriate form of a string with context based on whether a + * number is singular or plural. + * + * Example: + * + * $people = sprintf( _n( '%s person', '%s people', $count, 'context', 'text-domain' ), number_format_i18n( $count ) ); * * @since 2.8.0 * - * @param string $single The text that will be used if $number is 1. - * @param string $plural The text that will be used if $number is not 1. - * @param int $number The number to compare against to use either $single or $plural. + * @param string $single The text to be used if the number is singular. + * @param string $plural The text to be used if the number is plural. + * @param int $number The number to compare against to use either the singular or plural form. * @param string $context Context information for the translators. * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. - * @return string Either $single or $plural translated text with context. + * Default 'default'. + * @return string The translated singular or plural form. */ function _nx($single, $plural, $number, $context, $domain = 'default') { $translations = get_translations_for_domain( $domain ); $translation = $translations->translate_plural( $single, $plural, $number, $context ); + /** - * Filter text with its translation while plural option and context are available. + * Filters the singular or plural form of a string with gettext context. * * @since 2.8.0 * * @param string $translation Translated text. - * @param string $single The text that will be used if $number is 1. - * @param string $plural The text that will be used if $number is not 1. - * @param string $number The number to compare against to use either $single or $plural. + * @param string $single The text to be used if the number is singular. + * @param string $plural The text to be used if the number is plural. + * @param string $number The number to compare against to use either the singular or plural form. * @param string $context Context information for the translators. * @param string $domain Text domain. Unique identifier for retrieving translated strings. */ @@ -359,55 +389,103 @@ function _nx($single, $plural, $number, $context, $domain = 'default') { } /** - * Register plural strings in POT file, but don't translate them. + * Registers plural strings in POT file, but does not translate them. * * Used when you want to keep structures with translatable plural - * strings and use them later. + * strings and use them later when the number is known. * * Example: * * $messages = array( - * 'post' => _n_noop( '%s post', '%s posts' ), - * 'page' => _n_noop( '%s pages', '%s pages' ), + * 'post' => _n_noop( '%s post', '%s posts', 'text-domain' ), + * 'page' => _n_noop( '%s pages', '%s pages', 'text-domain' ), * ); * ... * $message = $messages[ $type ]; - * $usable_text = sprintf( translate_nooped_plural( $message, $count ), $count ); + * $usable_text = sprintf( translate_nooped_plural( $message, $count, 'text-domain' ), number_format_i18n( $count ) ); * * @since 2.5.0 * - * @param string $singular Single form to be i18ned. - * @param string $plural Plural form to be i18ned. + * @param string $singular Singular form to be localized. + * @param string $plural Plural form to be localized. * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. - * @return array array($singular, $plural) + * Default null. + * @return array { + * Array of translation information for the strings. + * + * @type string $0 Singular form to be localized. No longer used. + * @type string $1 Plural form to be localized. No longer used. + * @type string $singular Singular form to be localized. + * @type string $plural Plural form to be localized. + * @type null $context Context information for the translators. + * @type string $domain Text domain. + * } */ function _n_noop( $singular, $plural, $domain = null ) { return array( 0 => $singular, 1 => $plural, 'singular' => $singular, 'plural' => $plural, 'context' => null, 'domain' => $domain ); } /** - * Register plural strings with context in POT file, but don't translate them. + * Registers plural strings with gettext context in POT file, but does not translate them. + * + * Used when you want to keep structures with translatable plural + * strings and use them later when the number is known. + * + * Example: + * + * $messages = array( + * 'post' => _n_noop( '%s post', '%s posts', 'context', 'text-domain' ), + * 'page' => _n_noop( '%s pages', '%s pages', 'context', 'text-domain' ), + * ); + * ... + * $message = $messages[ $type ]; + * $usable_text = sprintf( translate_nooped_plural( $message, $count, 'text-domain' ), number_format_i18n( $count ) ); * * @since 2.8.0 - * @param string $singular - * @param string $plural - * @param string $context - * @param string|null $domain - * @return array + * + * @param string $singular Singular form to be localized. + * @param string $plural Plural form to be localized. + * @param string $context Context information for the translators. + * @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 $1 Plural form to be localized. No longer used. + * @type string $2 Context information for the translators. No longer used. + * @type string $singular Singular form to be localized. + * @type string $plural Plural form to be localized. + * @type string $context Context information for the translators. + * @type string $domain Text domain. + * } */ function _nx_noop( $singular, $plural, $context, $domain = null ) { return array( 0 => $singular, 1 => $plural, 2 => $context, 'singular' => $singular, 'plural' => $plural, 'context' => $context, 'domain' => $domain ); } /** - * Translate the result of _n_noop() or _nx_noop(). + * Translates and retrieves the singular or plural form of a string that's been registered + * with _n_noop() or _nx_noop(). + * + * Used when you want to use a translatable plural string once the number is known. + * + * Example: + * + * $messages = array( + * 'post' => _n_noop( '%s post', '%s posts', 'text-domain' ), + * 'page' => _n_noop( '%s pages', '%s pages', 'text-domain' ), + * ); + * ... + * $message = $messages[ $type ]; + * $usable_text = sprintf( translate_nooped_plural( $message, $count, 'text-domain' ), number_format_i18n( $count ) ); * * @since 3.1.0 * - * @param array $nooped_plural Array with singular, plural and context keys, usually the result of _n_noop() or _nx_noop() - * @param int $count Number of objects + * @param array $nooped_plural Array with singular, plural, and context keys, usually the result of _n_noop() or _nx_noop(). + * @param int $count Number of objects. * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. If $nooped_plural contains - * a text domain passed to _n_noop() or _nx_noop(), it will override this value. + * a text domain passed to _n_noop() or _nx_noop(), it will override this value. Default 'default'. * @return string Either $single or $plural translated text. */ function translate_nooped_plural( $nooped_plural, $count, $domain = 'default' ) { @@ -431,25 +509,32 @@ function translate_nooped_plural( $nooped_plural, $count, $domain = 'default' ) * * @since 1.5.0 * + * @global array $l10n An array of all currently loaded text domains. + * @global array $l10n_unloaded An array of all text domains that have been unloaded again. + * * @param string $domain Text domain. Unique identifier for retrieving translated strings. * @param string $mofile Path to the .mo file. * @return bool True on success, false on failure. */ function load_textdomain( $domain, $mofile ) { - global $l10n; + global $l10n, $l10n_unloaded; + + $l10n_unloaded = (array) $l10n_unloaded; /** - * Filter text domain and/or MO file path for loading translations. + * Filters whether to override the .mo file loading. * * @since 2.9.0 * - * @param bool $override Whether to override the text domain. Default false. + * @param bool $override Whether to override the .mo file loading. Default false. * @param string $domain Text domain. Unique identifier for retrieving translated strings. * @param string $mofile Path to the MO file. */ $plugin_override = apply_filters( 'override_load_textdomain', false, $domain, $mofile ); if ( true == $plugin_override ) { + unset( $l10n_unloaded[ $domain ] ); + return true; } @@ -464,7 +549,7 @@ function load_textdomain( $domain, $mofile ) { do_action( 'load_textdomain', $domain, $mofile ); /** - * Filter MO file path for loading translations for a specific text domain. + * Filters MO file path for loading translations for a specific text domain. * * @since 2.9.0 * @@ -481,6 +566,8 @@ function load_textdomain( $domain, $mofile ) { if ( isset( $l10n[$domain] ) ) $mo->merge_with( $l10n[$domain] ); + unset( $l10n_unloaded[ $domain ] ); + $l10n[$domain] = &$mo; return true; @@ -491,24 +578,32 @@ function load_textdomain( $domain, $mofile ) { * * @since 3.0.0 * + * @global array $l10n An array of all currently loaded text domains. + * @global array $l10n_unloaded An array of all text domains that have been unloaded again. + * * @param string $domain Text domain. Unique identifier for retrieving translated strings. * @return bool Whether textdomain was unloaded. */ function unload_textdomain( $domain ) { - global $l10n; + global $l10n, $l10n_unloaded; + + $l10n_unloaded = (array) $l10n_unloaded; /** - * Filter the text domain for loading translation. + * Filters whether to override the text domain unloading. * * @since 3.0.0 * - * @param bool $override Whether to override unloading the text domain. Default false. + * @param bool $override Whether to override the text domain unloading. Default false. * @param string $domain Text domain. Unique identifier for retrieving translated strings. */ $plugin_override = apply_filters( 'override_unload_textdomain', false, $domain ); - if ( $plugin_override ) + if ( $plugin_override ) { + $l10n_unloaded[ $domain ] = true; + return true; + } /** * Fires before the text domain is unloaded. @@ -521,6 +616,9 @@ function unload_textdomain( $domain ) { if ( isset( $l10n[$domain] ) ) { unset( $l10n[$domain] ); + + $l10n_unloaded[ $domain ] = true; + return true; } @@ -537,7 +635,7 @@ function unload_textdomain( $domain ) { * * @since 1.5.0 * - * @param string $locale Optional. Locale to load. Default is the value of {@see get_locale()}. + * @param string $locale Optional. Locale to load. Default is the value of get_locale(). * @return bool Whether the textdomain was loaded. */ function load_default_textdomain( $locale = null ) { @@ -555,7 +653,7 @@ function load_default_textdomain( $locale = null ) { return $return; } - if ( is_admin() || defined( 'WP_INSTALLING' ) || ( defined( 'WP_REPAIRING' ) && WP_REPAIRING ) ) { + if ( is_admin() || wp_installing() || ( defined( 'WP_REPAIRING' ) && WP_REPAIRING ) ) { load_textdomain( 'default', WP_LANG_DIR . "/admin-$locale.mo" ); } @@ -566,74 +664,76 @@ function load_default_textdomain( $locale = null ) { } /** - * Load a plugin's translated strings. + * Loads a plugin's translated strings. * * If the path is not given then it will be the root of the plugin directory. * * The .mo file should be named based on the text domain with a dash, and then the locale exactly. * * @since 1.5.0 + * @since 4.6.0 The function now tries to load the .mo file from the languages directory first. * * @param string $domain Unique identifier for retrieving translated strings - * @param string $deprecated Use the $plugin_rel_path parameter instead. + * @param string $deprecated Optional. Use the $plugin_rel_path parameter instead. Defaukt false. * @param string $plugin_rel_path Optional. Relative path to WP_PLUGIN_DIR where the .mo file resides. * Default false. * @return bool True when textdomain is successfully loaded, false otherwise. */ function load_plugin_textdomain( $domain, $deprecated = false, $plugin_rel_path = false ) { - $locale = get_locale(); /** - * Filter a plugin's locale. + * Filters a plugin's locale. * * @since 3.0.0 * * @param string $locale The plugin's current locale. * @param string $domain Text domain. Unique identifier for retrieving translated strings. */ - $locale = apply_filters( 'plugin_locale', $locale, $domain ); + $locale = apply_filters( 'plugin_locale', get_locale(), $domain ); + + $mofile = $domain . '-' . $locale . '.mo'; + + // Try to load from the languages directory first. + if ( load_textdomain( $domain, WP_LANG_DIR . '/plugins/' . $mofile ) ) { + return true; + } - if ( false !== $plugin_rel_path ) { + if ( false !== $plugin_rel_path ) { $path = WP_PLUGIN_DIR . '/' . trim( $plugin_rel_path, '/' ); } elseif ( false !== $deprecated ) { - _deprecated_argument( __FUNCTION__, '2.7' ); + _deprecated_argument( __FUNCTION__, '2.7.0' ); $path = ABSPATH . trim( $deprecated, '/' ); } else { $path = WP_PLUGIN_DIR; } - // Load the textdomain according to the plugin first - $mofile = $domain . '-' . $locale . '.mo'; - if ( $loaded = load_textdomain( $domain, $path . '/'. $mofile ) ) - return $loaded; - - // Otherwise, load from the languages directory - $mofile = WP_LANG_DIR . '/plugins/' . $mofile; - return load_textdomain( $domain, $mofile ); + return load_textdomain( $domain, $path . '/' . $mofile ); } /** * Load the translated strings for a plugin residing in the mu-plugins directory. * * @since 3.0.0 + * @since 4.6.0 The function now tries to load the .mo file from the languages directory first. * * @param string $domain Text domain. Unique identifier for retrieving translated strings. - * @param string $mu_plugin_rel_path Relative to WPMU_PLUGIN_DIR directory in which the .mo file resides. - * Default empty string. + * @param string $mu_plugin_rel_path Optional. Relative to `WPMU_PLUGIN_DIR` directory in which the .mo + * file resides. Default empty string. * @return bool True when textdomain is successfully loaded, false otherwise. */ function load_muplugin_textdomain( $domain, $mu_plugin_rel_path = '' ) { /** This filter is documented in wp-includes/l10n.php */ $locale = apply_filters( 'plugin_locale', get_locale(), $domain ); - $path = trailingslashit( WPMU_PLUGIN_DIR . '/' . ltrim( $mu_plugin_rel_path, '/' ) ); - // Load the textdomain according to the plugin first $mofile = $domain . '-' . $locale . '.mo'; - if ( $loaded = load_textdomain( $domain, $path . $mofile ) ) - return $loaded; - // Otherwise, load from the languages directory - $mofile = WP_LANG_DIR . '/plugins/' . $mofile; - return load_textdomain( $domain, $mofile ); + // Try to load from the languages directory first. + if ( load_textdomain( $domain, WP_LANG_DIR . '/plugins/' . $mofile ) ) { + return true; + } + + $path = trailingslashit( WPMU_PLUGIN_DIR . '/' . ltrim( $mu_plugin_rel_path, '/' ) ); + + return load_textdomain( $domain, $path . '/' . $mofile ); } /** @@ -645,6 +745,7 @@ function load_muplugin_textdomain( $domain, $mu_plugin_rel_path = '' ) { * The .mo files must be named based on the locale exactly. * * @since 1.5.0 + * @since 4.6.0 The function now tries to load the .mo file from the languages directory first. * * @param string $domain Text domain. Unique identifier for retrieving translated strings. * @param string $path Optional. Path to the directory containing the .mo file. @@ -652,28 +753,28 @@ function load_muplugin_textdomain( $domain, $mu_plugin_rel_path = '' ) { * @return bool True when textdomain is successfully loaded, false otherwise. */ function load_theme_textdomain( $domain, $path = false ) { - $locale = get_locale(); /** - * Filter a theme's locale. + * Filters a theme's locale. * * @since 3.0.0 * * @param string $locale The theme's current locale. * @param string $domain Text domain. Unique identifier for retrieving translated strings. */ - $locale = apply_filters( 'theme_locale', $locale, $domain ); + $locale = apply_filters( 'theme_locale', get_locale(), $domain ); - if ( ! $path ) - $path = get_template_directory(); + $mofile = $domain . '-' . $locale . '.mo'; - // Load the textdomain according to the theme - $mofile = untrailingslashit( $path ) . "/{$locale}.mo"; - if ( $loaded = load_textdomain( $domain, $mofile ) ) - return $loaded; + // Try to load from the languages directory first. + if ( load_textdomain( $domain, WP_LANG_DIR . '/themes/' . $mofile ) ) { + return true; + } - // Otherwise, load from the languages directory - $mofile = WP_LANG_DIR . "/themes/{$domain}-{$locale}.mo"; - return load_textdomain( $domain, $mofile ); + if ( ! $path ) { + $path = get_template_directory(); + } + + return load_textdomain( $domain, $path . '/' . $locale . '.mo' ); } /** @@ -697,6 +798,65 @@ function load_child_theme_textdomain( $domain, $path = false ) { return load_theme_textdomain( $domain, $path ); } +/** + * Loads plugin and theme textdomains just-in-time. + * + * When a textdomain is encountered for the first time, we try to load + * the translation file from `wp-content/languages`, removing the need + * to call load_plugin_texdomain() or load_theme_texdomain(). + * + * Holds a cached list of available .mo files to improve performance. + * + * @since 4.6.0 + * @access private + * + * @see get_translations_for_domain() + * @global array $l10n_unloaded An array of all text domains that have been unloaded again. + * + * @param string $domain Text domain. Unique identifier for retrieving translated strings. + * @return bool True when the textdomain is successfully loaded, false otherwise. + */ +function _load_textdomain_just_in_time( $domain ) { + global $l10n_unloaded; + + $l10n_unloaded = (array) $l10n_unloaded; + + static $cached_mofiles = null; + + // Short-circuit if domain is 'default' which is reserved for core. + if ( 'default' === $domain || isset( $l10n_unloaded[ $domain ] ) ) { + return false; + } + + if ( null === $cached_mofiles ) { + $cached_mofiles = array(); + + $locations = array( + WP_LANG_DIR . '/plugins', + WP_LANG_DIR . '/themes', + ); + + foreach ( $locations as $location ) { + foreach ( get_available_languages( $location ) as $file ) { + $cached_mofiles[] = "{$location}/{$file}.mo"; + } + } + } + + $locale = get_locale(); + $mofile = "{$domain}-{$locale}.mo"; + + if ( in_array( WP_LANG_DIR . '/plugins/' . $mofile, $cached_mofiles ) ) { + return load_textdomain( $domain, WP_LANG_DIR . '/plugins/' . $mofile ); + } + + if ( in_array( WP_LANG_DIR . '/themes/' . $mofile, $cached_mofiles ) ) { + return load_textdomain( $domain, WP_LANG_DIR . '/themes/' . $mofile ); + } + + return false; +} + /** * Return the Translations instance for a text domain. * @@ -704,15 +864,23 @@ function load_child_theme_textdomain( $domain, $path = false ) { * * @since 2.8.0 * + * @global array $l10n + * * @param string $domain Text domain. Unique identifier for retrieving translated strings. * @return NOOP_Translations A Translations instance. */ function get_translations_for_domain( $domain ) { global $l10n; - if ( !isset( $l10n[$domain] ) ) { - $l10n[$domain] = new NOOP_Translations; + if ( isset( $l10n[ $domain ] ) || ( _load_textdomain_just_in_time( $domain ) && isset( $l10n[ $domain ] ) ) ) { + return $l10n[ $domain ]; } - return $l10n[$domain]; + + static $noop_translations = null; + if ( null === $noop_translations ) { + $noop_translations = new NOOP_Translations; + } + + return $noop_translations; } /** @@ -720,12 +888,14 @@ function get_translations_for_domain( $domain ) { * * @since 3.0.0 * + * @global array $l10n + * * @param string $domain Text domain. Unique identifier for retrieving translated strings. * @return bool Whether there are translations. */ function is_textdomain_loaded( $domain ) { global $l10n; - return isset( $l10n[$domain] ); + return isset( $l10n[ $domain ] ); } /** @@ -765,7 +935,7 @@ function get_available_languages( $dir = null ) { $lang_files = glob( ( is_null( $dir) ? WP_LANG_DIR : $dir ) . '/*.mo' ); if ( $lang_files ) { - foreach( $lang_files as $lang_file ) { + foreach ( $lang_files as $lang_file ) { $lang_file = basename( $lang_file, '.mo' ); if ( 0 !== strpos( $lang_file, 'continents-cities' ) && 0 !== strpos( $lang_file, 'ms-' ) && 0 !== strpos( $lang_file, 'admin-' ) ) { @@ -807,13 +977,13 @@ function wp_get_installed_translations( $type ) { $language_data = array(); foreach ( $files as $file ) { - if ( '.' === $file[0] || is_dir( $file ) ) { + if ( '.' === $file[0] || is_dir( WP_LANG_DIR . "$dir/$file" ) ) { continue; } if ( substr( $file, -3 ) !== '.po' ) { continue; } - if ( ! preg_match( '/(?:(.+)-)?([A-Za-z_]{2,6}).po/', $file, $match ) ) { + if ( ! preg_match( '/(?:(.+)-)?([a-z]{2,3}(?:_[A-Z]{2})?(?:_[a-z0-9]+)?).po/', $file, $match ) ) { continue; } if ( ! in_array( substr( $file, 0, -3 ) . '.mo', $files ) ) { @@ -855,6 +1025,7 @@ function wp_get_pomo_file_data( $po_file ) { * Language selector. * * @since 4.0.0 + * @since 4.3.0 Introduced the `echo` argument. * * @see get_available_languages() * @see wp_get_available_translations() @@ -862,15 +1033,18 @@ function wp_get_pomo_file_data( $po_file ) { * @param string|array $args { * Optional. Array or string of arguments for outputting the language selector. * - * @type string $id ID 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. - * Default empty array. - * @type array $translations List of available translations. Default result of - * {@see wp_get_available_translations()}. - * @type string $selected Language which should be selected. Default empty. - * @type bool $show_available_translations Whether to show available translations. Default true. + * @type string $id ID 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. + * Default empty array. + * @type array $translations List of available translations. Default result of + * wp_get_available_translations(). + * @type string $selected Language which should be selected. Default empty. + * @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. * } + * @return string HTML content */ function wp_dropdown_languages( $args = array() ) { @@ -880,6 +1054,7 @@ function wp_dropdown_languages( $args = array() ) { 'languages' => array(), 'translations' => array(), 'selected' => '', + 'echo' => 1, 'show_available_translations' => true, ) ); @@ -916,7 +1091,7 @@ function wp_dropdown_languages( $args = array() ) { $translations_available = ( ! empty( $translations ) && $args['show_available_translations'] ); - printf( '', esc_attr( $args['name'] ), esc_attr( $args['id'] ) ); // Holds the HTML markup. $structure = array(); @@ -954,7 +1129,13 @@ function wp_dropdown_languages( $args = array() ) { $structure[] = ''; } - echo join( "\n", $structure ); + $output .= join( "\n", $structure ); + + $output .= ''; + + if ( $args['echo'] ) { + echo $output; + } - echo ''; + return $output; }