X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/699231ae09f7057a4d0000cdf32e50a3df6a04ca..refs/tags/wordpress-3.4:/wp-includes/locale.php

diff --git a/wp-includes/locale.php b/wp-includes/locale.php
index e69cbf5d..bc5037c7 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
@@ -84,15 +84,6 @@ 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');
-
 	/**
 	 * Sets up the translated strings and object properties.
 	 *
@@ -113,7 +104,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 +177,12 @@ 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';
 	}
 
 	/**
@@ -314,7 +305,7 @@ class WP_Locale {
 	}
 
 	/**
-	 * PHP4 style constructor which calls helper methods to set up object variables
+	 * Constructor which calls helper methods to set up object variables
 	 *
 	 * @uses WP_Locale::init()
 	 * @uses WP_Locale::register_globals()
@@ -322,19 +313,20 @@ class WP_Locale {
 	 *
 	 * @return WP_Locale
 	 */
-	function WP_Locale() {
+	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;
-	 }
+	function is_rtl() {
+		return 'rtl' == $this->text_direction;
+	}
 }
 
 /**
@@ -347,5 +339,3 @@ function is_rtl() {
 	global $wp_locale;
 	return $wp_locale->is_rtl();
 }
-
-?>