X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/38ca813a0e312e2768e5b9519f0415cd0aa84781..a7cd4c052013b423c6301153f68c7fdbaa2a447b:/wp-includes/locale.php diff --git a/wp-includes/locale.php b/wp-includes/locale.php index dc3ede6f..73f282c3 100644 --- a/wp-includes/locale.php +++ b/wp-includes/locale.php @@ -25,7 +25,7 @@ class WP_Locale { * 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. * @@ -65,7 +65,7 @@ class WP_Locale { /** * Stores the translated strings for 'am' and 'pm'. * - * Also the capalized versions. + * Also the capitalized versions. * * @since 2.1.0 * @var array @@ -85,14 +85,10 @@ class WP_Locale { var $text_direction = 'ltr'; /** - * Imports the global version to the class property. - * - * @since 2.1.0 * @var array - * @access private */ - var $locale_vars = array('text_direction'); - + var $number_format; + /** * Sets up the translated strings and object properties. * @@ -113,7 +109,7 @@ 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 + // 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'); @@ -186,12 +182,21 @@ class WP_Locale { $trans = __('number_format_decimal_point'); $this->number_format['decimal_point'] = ('number_format_decimal_point' == $trans) ? '.' : $trans; - // 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]; + // 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'; + + 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' ) ); } + } + function rtl_src_admin_notice() { + echo '
' . 'The build
directory of the develop repository must be used for RTL.' . '