X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/38ca813a0e312e2768e5b9519f0415cd0aa84781..784f914b1e4b1c62d6657e86397c2e83bcee4295:/wp-includes/locale.php diff --git a/wp-includes/locale.php b/wp-includes/locale.php index dc3ede6f..cfca86e8 100644 --- a/wp-includes/locale.php +++ b/wp-includes/locale.php @@ -17,61 +17,63 @@ class WP_Locale { * * @since 2.1.0 * @var array - * @access private */ - var $weekday; + public $weekday; /** * Stores the translated strings for the one character weekday names. * * There is a hack to make sure that Tuesday and Thursday, as well - * as Sunday and Saturday don't conflict. See init() method for more. + * as Sunday and Saturday, don't conflict. See init() method for more. * * @see WP_Locale::init() for how to handle the hack. * * @since 2.1.0 * @var array - * @access private */ - var $weekday_initial; + public $weekday_initial; /** * Stores the translated strings for the abbreviated weekday names. * * @since 2.1.0 * @var array - * @access private */ - var $weekday_abbrev; + public $weekday_abbrev; + + /** + * Stores the default start of the week. + * + * @since 4.4.0 + * @var string + */ + public $start_of_week; /** * Stores the translated strings for the full month names. * * @since 2.1.0 * @var array - * @access private */ - var $month; + public $month; /** * Stores the translated strings for the abbreviated month names. * * @since 2.1.0 * @var array - * @access private */ - var $month_abbrev; + public $month_abbrev; /** * Stores the translated strings for 'am' and 'pm'. * - * Also the capalized versions. + * Also the capitalized versions. * * @since 2.1.0 * @var array - * @access private */ - var $meridiem; + public $meridiem; /** * The text direction of the locale language. @@ -80,18 +82,17 @@ class WP_Locale { * * @since 2.1.0 * @var string - * @access private */ - var $text_direction = 'ltr'; + public $text_direction = 'ltr'; /** - * Imports the global version to the class property. + * The thousands separator and decimal point values used for localizing numbers. * - * @since 2.1.0 + * @since 2.3.0 + * @access public * @var array - * @access private */ - var $locale_vars = array('text_direction'); + public $number_format; /** * Sets up the translated strings and object properties. @@ -102,8 +103,11 @@ class WP_Locale { * * @since 2.1.0 * @access private + * + * @global string $text_direction + * @global string $wp_version */ - function init() { + public function init() { // The Weekdays $this->weekday[0] = /* translators: weekday */ __('Sunday'); $this->weekday[1] = /* translators: weekday */ __('Monday'); @@ -113,19 +117,14 @@ class WP_Locale { $this->weekday[5] = /* translators: weekday */ __('Friday'); $this->weekday[6] = /* translators: weekday */ __('Saturday'); - // The first letter of each day. The _%day%_initial suffix is a hack to make - // sure the day initials are unique. - $this->weekday_initial[__('Sunday')] = /* translators: one-letter abbreviation of the weekday */ __('S_Sunday_initial'); - $this->weekday_initial[__('Monday')] = /* translators: one-letter abbreviation of the weekday */ __('M_Monday_initial'); - $this->weekday_initial[__('Tuesday')] = /* translators: one-letter abbreviation of the weekday */ __('T_Tuesday_initial'); - $this->weekday_initial[__('Wednesday')] = /* translators: one-letter abbreviation of the weekday */ __('W_Wednesday_initial'); - $this->weekday_initial[__('Thursday')] = /* translators: one-letter abbreviation of the weekday */ __('T_Thursday_initial'); - $this->weekday_initial[__('Friday')] = /* translators: one-letter abbreviation of the weekday */ __('F_Friday_initial'); - $this->weekday_initial[__('Saturday')] = /* translators: one-letter abbreviation of the weekday */ __('S_Saturday_initial'); - - foreach ($this->weekday_initial as $weekday_ => $weekday_initial_) { - $this->weekday_initial[$weekday_] = preg_replace('/_.+_initial$/', '', $weekday_initial_); - } + // The first letter of each day. + $this->weekday_initial[ __( 'Sunday' ) ] = /* translators: one-letter abbreviation of the weekday */ _x( 'S', 'Sunday initial' ); + $this->weekday_initial[ __( 'Monday' ) ] = /* translators: one-letter abbreviation of the weekday */ _x( 'M', 'Monday initial' ); + $this->weekday_initial[ __( 'Tuesday' ) ] = /* translators: one-letter abbreviation of the weekday */ _x( 'T', 'Tuesday initial' ); + $this->weekday_initial[ __( 'Wednesday' ) ] = /* translators: one-letter abbreviation of the weekday */ _x( 'W', 'Wednesday initial' ); + $this->weekday_initial[ __( 'Thursday' ) ] = /* translators: one-letter abbreviation of the weekday */ _x( 'T', 'Thursday initial' ); + $this->weekday_initial[ __( 'Friday' ) ] = /* translators: one-letter abbreviation of the weekday */ _x( 'F', 'Friday initial' ); + $this->weekday_initial[ __( 'Saturday' ) ] = /* translators: one-letter abbreviation of the weekday */ _x( 'S', 'Saturday initial' ); // Abbreviations for each day. $this->weekday_abbrev[__('Sunday')] = /* translators: three-letter abbreviation of the weekday */ __('Sun'); @@ -137,37 +136,46 @@ class WP_Locale { $this->weekday_abbrev[__('Saturday')] = /* translators: three-letter abbreviation of the weekday */ __('Sat'); // The Months - $this->month['01'] = /* translators: month name */ __('January'); - $this->month['02'] = /* translators: month name */ __('February'); - $this->month['03'] = /* translators: month name */ __('March'); - $this->month['04'] = /* translators: month name */ __('April'); - $this->month['05'] = /* translators: month name */ __('May'); - $this->month['06'] = /* translators: month name */ __('June'); - $this->month['07'] = /* translators: month name */ __('July'); - $this->month['08'] = /* translators: month name */ __('August'); - $this->month['09'] = /* translators: month name */ __('September'); - $this->month['10'] = /* translators: month name */ __('October'); - $this->month['11'] = /* translators: month name */ __('November'); - $this->month['12'] = /* translators: month name */ __('December'); - - // Abbreviations for each month. Uses the same hack as above to get around the - // 'May' duplication. - $this->month_abbrev[__('January')] = /* translators: three-letter abbreviation of the month */ __('Jan_January_abbreviation'); - $this->month_abbrev[__('February')] = /* translators: three-letter abbreviation of the month */ __('Feb_February_abbreviation'); - $this->month_abbrev[__('March')] = /* translators: three-letter abbreviation of the month */ __('Mar_March_abbreviation'); - $this->month_abbrev[__('April')] = /* translators: three-letter abbreviation of the month */ __('Apr_April_abbreviation'); - $this->month_abbrev[__('May')] = /* translators: three-letter abbreviation of the month */ __('May_May_abbreviation'); - $this->month_abbrev[__('June')] = /* translators: three-letter abbreviation of the month */ __('Jun_June_abbreviation'); - $this->month_abbrev[__('July')] = /* translators: three-letter abbreviation of the month */ __('Jul_July_abbreviation'); - $this->month_abbrev[__('August')] = /* translators: three-letter abbreviation of the month */ __('Aug_August_abbreviation'); - $this->month_abbrev[__('September')] = /* translators: three-letter abbreviation of the month */ __('Sep_September_abbreviation'); - $this->month_abbrev[__('October')] = /* translators: three-letter abbreviation of the month */ __('Oct_October_abbreviation'); - $this->month_abbrev[__('November')] = /* translators: three-letter abbreviation of the month */ __('Nov_November_abbreviation'); - $this->month_abbrev[__('December')] = /* translators: three-letter abbreviation of the month */ __('Dec_December_abbreviation'); - - foreach ($this->month_abbrev as $month_ => $month_abbrev_) { - $this->month_abbrev[$month_] = preg_replace('/_.+_abbreviation$/', '', $month_abbrev_); - } + $this->month['01'] = /* translators: month name */ __( 'January' ); + $this->month['02'] = /* translators: month name */ __( 'February' ); + $this->month['03'] = /* translators: month name */ __( 'March' ); + $this->month['04'] = /* translators: month name */ __( 'April' ); + $this->month['05'] = /* translators: month name */ __( 'May' ); + $this->month['06'] = /* translators: month name */ __( 'June' ); + $this->month['07'] = /* translators: month name */ __( 'July' ); + $this->month['08'] = /* translators: month name */ __( 'August' ); + $this->month['09'] = /* translators: month name */ __( 'September' ); + $this->month['10'] = /* translators: month name */ __( 'October' ); + $this->month['11'] = /* translators: month name */ __( 'November' ); + $this->month['12'] = /* translators: month name */ __( 'December' ); + + // The Months, genitive + $this->month_genitive['01'] = /* translators: month name, genitive */ _x( 'January', 'genitive' ); + $this->month_genitive['02'] = /* translators: month name, genitive */ _x( 'February', 'genitive' ); + $this->month_genitive['03'] = /* translators: month name, genitive */ _x( 'March', 'genitive' ); + $this->month_genitive['04'] = /* translators: month name, genitive */ _x( 'April', 'genitive' ); + $this->month_genitive['05'] = /* translators: month name, genitive */ _x( 'May', 'genitive' ); + $this->month_genitive['06'] = /* translators: month name, genitive */ _x( 'June', 'genitive' ); + $this->month_genitive['07'] = /* translators: month name, genitive */ _x( 'July', 'genitive' ); + $this->month_genitive['08'] = /* translators: month name, genitive */ _x( 'August', 'genitive' ); + $this->month_genitive['09'] = /* translators: month name, genitive */ _x( 'September', 'genitive' ); + $this->month_genitive['10'] = /* translators: month name, genitive */ _x( 'October', 'genitive' ); + $this->month_genitive['11'] = /* translators: month name, genitive */ _x( 'November', 'genitive' ); + $this->month_genitive['12'] = /* translators: month name, genitive */ _x( 'December', 'genitive' ); + + // Abbreviations for each month. + $this->month_abbrev[ __( 'January' ) ] = /* translators: three-letter abbreviation of the month */ _x( 'Jan', 'January abbreviation' ); + $this->month_abbrev[ __( 'February' ) ] = /* translators: three-letter abbreviation of the month */ _x( 'Feb', 'February abbreviation' ); + $this->month_abbrev[ __( 'March' ) ] = /* translators: three-letter abbreviation of the month */ _x( 'Mar', 'March abbreviation' ); + $this->month_abbrev[ __( 'April' ) ] = /* translators: three-letter abbreviation of the month */ _x( 'Apr', 'April abbreviation' ); + $this->month_abbrev[ __( 'May' ) ] = /* translators: three-letter abbreviation of the month */ _x( 'May', 'May abbreviation' ); + $this->month_abbrev[ __( 'June' ) ] = /* translators: three-letter abbreviation of the month */ _x( 'Jun', 'June abbreviation' ); + $this->month_abbrev[ __( 'July' ) ] = /* translators: three-letter abbreviation of the month */ _x( 'Jul', 'July abbreviation' ); + $this->month_abbrev[ __( 'August' ) ] = /* translators: three-letter abbreviation of the month */ _x( 'Aug', 'August abbreviation' ); + $this->month_abbrev[ __( 'September' ) ] = /* translators: three-letter abbreviation of the month */ _x( 'Sep', 'September abbreviation' ); + $this->month_abbrev[ __( 'October' ) ] = /* translators: three-letter abbreviation of the month */ _x( 'Oct', 'October abbreviation' ); + $this->month_abbrev[ __( 'November' ) ] = /* translators: three-letter abbreviation of the month */ _x( 'Nov', 'November abbreviation' ); + $this->month_abbrev[ __( 'December' ) ] = /* translators: three-letter abbreviation of the month */ _x( 'Dec', 'December abbreviation' ); // The Meridiems $this->meridiem['am'] = __('am'); @@ -179,19 +187,45 @@ class WP_Locale { // See http://php.net/number_format /* translators: $thousands_sep argument for http://php.net/number_format, default is , */ - $trans = __('number_format_thousands_sep'); - $this->number_format['thousands_sep'] = ('number_format_thousands_sep' == $trans) ? ',' : $trans; + $thousands_sep = __( 'number_format_thousands_sep' ); + + if ( version_compare( PHP_VERSION, '5.4', '>=' ) ) { + // Replace space with a non-breaking space to avoid wrapping. + $thousands_sep = str_replace( ' ', ' ', $thousands_sep ); + } else { + // PHP < 5.4.0 does not support multiple bytes in thousands separator. + $thousands_sep = str_replace( array( ' ', ' ' ), ' ', $thousands_sep ); + } + + $this->number_format['thousands_sep'] = ( 'number_format_thousands_sep' === $thousands_sep ) ? ',' : $thousands_sep; /* translators: $dec_point argument for http://php.net/number_format, default is . */ - $trans = __('number_format_decimal_point'); - $this->number_format['decimal_point'] = ('number_format_decimal_point' == $trans) ? '.' : $trans; + $decimal_point = __( 'number_format_decimal_point' ); + + $this->number_format['decimal_point'] = ( 'number_format_decimal_point' === $decimal_point ) ? '.' : $decimal_point; + + // Set text direction. + if ( isset( $GLOBALS['text_direction'] ) ) + $this->text_direction = $GLOBALS['text_direction']; + /* translators: 'rtl' or 'ltr'. This sets the text direction for WordPress. */ + elseif ( 'rtl' == _x( 'ltr', 'text direction' ) ) + $this->text_direction = 'rtl'; - // Import global locale vars set during inclusion of $locale.php. - foreach ( (array) $this->locale_vars as $var ) { - if ( isset($GLOBALS[$var]) ) - $this->$var = $GLOBALS[$var]; + if ( 'rtl' === $this->text_direction && strpos( $GLOBALS['wp_version'], '-src' ) ) { + $this->text_direction = 'ltr'; + add_action( 'all_admin_notices', array( $this, 'rtl_src_admin_notice' ) ); } + } + /** + * Outputs an admin notice if the /build directory must be used for RTL. + * + * @since 3.8.0 + * @access public + */ + public function rtl_src_admin_notice() { + /* translators: %s: Name of the directory (build) */ + echo '

' . sprintf( __( 'The %s directory of the develop repository must be used for RTL.' ), 'build' ) . '

'; } /** @@ -207,7 +241,7 @@ class WP_Locale { * @param int $weekday_number 0 for Sunday through 6 Saturday * @return string Full translated weekday */ - function get_weekday($weekday_number) { + public function get_weekday($weekday_number) { return $this->weekday[$weekday_number]; } @@ -225,7 +259,7 @@ class WP_Locale { * @param string $weekday_name * @return string */ - function get_weekday_initial($weekday_name) { + public function get_weekday_initial($weekday_name) { return $this->weekday_initial[$weekday_name]; } @@ -241,7 +275,7 @@ class WP_Locale { * @param string $weekday_name Full translated weekday word * @return string Translated weekday abbreviation */ - function get_weekday_abbrev($weekday_name) { + public function get_weekday_abbrev($weekday_name) { return $this->weekday_abbrev[$weekday_name]; } @@ -262,7 +296,7 @@ class WP_Locale { * @param string|int $month_number '01' through '12' * @return string Translated full month name */ - function get_month($month_number) { + public function get_month($month_number) { return $this->month[zeroise($month_number, 2)]; } @@ -278,7 +312,7 @@ class WP_Locale { * @param string $month_name Translated month to get abbreviated version * @return string Translated abbreviated month */ - function get_month_abbrev($month_name) { + public function get_month_abbrev($month_name) { return $this->month_abbrev[$month_name]; } @@ -293,7 +327,7 @@ class WP_Locale { * @param string $meridiem Either 'am', 'pm', 'AM', or 'PM'. Not translated version. * @return string Translated version */ - function get_meridiem($meridiem) { + public function get_meridiem($meridiem) { return $this->meridiem[$meridiem]; } @@ -303,9 +337,15 @@ class WP_Locale { * @deprecated For backwards compatibility only. * @access private * + * @global array $weekday + * @global array $weekday_initial + * @global array $weekday_abbrev + * @global array $month + * @global array $month_abbrev + * * @since 2.1.0 */ - function register_globals() { + public function register_globals() { $GLOBALS['weekday'] = $this->weekday; $GLOBALS['weekday_initial'] = $this->weekday_initial; $GLOBALS['weekday_abbrev'] = $this->weekday_abbrev; @@ -316,36 +356,52 @@ class WP_Locale { /** * Constructor which calls helper methods to set up object variables * - * @uses WP_Locale::init() - * @uses WP_Locale::register_globals() * @since 2.1.0 - * - * @return WP_Locale */ - function __construct() { + public function __construct() { $this->init(); $this->register_globals(); } + /** * Checks if current locale is RTL. * * @since 3.0.0 * @return bool Whether locale is RTL. */ - function is_rtl() { - return 'rtl' == $this->text_direction; - } + public function is_rtl() { + return 'rtl' == $this->text_direction; + } + + /** + * Register date/time format strings for general POT. + * + * Private, unused method to add some date/time formats translated + * on wp-admin/options-general.php to the general POT that would + * otherwise be added to the admin POT. + * + * @since 3.6.0 + */ + public function _strings_for_pot() { + /* translators: localized date format, see http://php.net/date */ + __( 'F j, Y' ); + /* translators: localized time format, see http://php.net/date */ + __( 'g:i a' ); + /* translators: localized date and time format, see http://php.net/date */ + __( 'F j, Y g:i a' ); + } } /** * Checks if current locale is RTL. * * @since 3.0.0 + * + * @global WP_Locale $wp_locale + * * @return bool Whether locale is RTL. */ function is_rtl() { global $wp_locale; return $wp_locale->is_rtl(); } - -?>