WordPress 4.2.4-scripts

[autoinstalls/wordpress.git] / wp-includes / locale.php

diff --git a/wp-includes/locale.php b/wp-includes/locale.php
index 7f5392c1bce5844e0223a022ca0ef5ad83110e4e..b3f4b455e18f097e6bdbc0b4125fc5d0cf568f12 100644 (file)
--- a/wp-includes/locale.php
+++ b/wp-includes/locale.php
@@ -17,61 +17,55 @@ class WP_Locale {
         *
         * @since 2.1.0
         * @var array
         *
         * @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
 
        /**
         * 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
         *
         * @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
 
        /**
         * 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 translated strings for the full month names.
         *
         * @since 2.1.0
         * @var array
 
        /**
         * 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
 
        /**
         * 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'.
         *
 
        /**
         * Stores the translated strings for 'am' and 'pm'.
         *

-        * Also the capalized versions.
+        * Also the capitalized versions.

         *
         * @since 2.1.0
         * @var array
         *
         * @since 2.1.0
         * @var array

-        * @access private

         */
         */

-       var $meridiem;
+       public $meridiem;

 
        /**
         * The text direction of the locale language.
 
        /**
         * The text direction of the locale language.


@@ -80,18 +74,13 @@ class WP_Locale {
         *
         * @since 2.1.0
         * @var string
         *
         * @since 2.1.0
         * @var string

-        * @access private

         */
         */

-       var $text_direction = 'ltr';
+       public $text_direction = 'ltr';

 
        /**
 
        /**

-        * Imports the global version to the class property.
-        *
-        * @since 2.1.0

         * @var array
         * @var array

-        * @access private

         */
         */

-       var $locale_vars = array('text_direction');
+       public $number_format;

 
        /**
         * Sets up the translated strings and object properties.
 
        /**
         * Sets up the translated strings and object properties.


@@ -105,65 +94,65 @@ class WP_Locale {
         */
        function init() {
                // The Weekdays
         */
        function init() {
                // The Weekdays

-               $this->weekday[0] = __('Sunday');
-               $this->weekday[1] = __('Monday');
-               $this->weekday[2] = __('Tuesday');
-               $this->weekday[3] = __('Wednesday');
-               $this->weekday[4] = __('Thursday');
-               $this->weekday[5] = __('Friday');
-               $this->weekday[6] = __('Saturday');
-
-               // The first letter of each day.  The _%day%_initial suffix is a hack to make
+               $this->weekday[0] = /* translators: weekday */ __('Sunday');
+               $this->weekday[1] = /* translators: weekday */ __('Monday');
+               $this->weekday[2] = /* translators: weekday */ __('Tuesday');
+               $this->weekday[3] = /* translators: weekday */ __('Wednesday');
+               $this->weekday[4] = /* translators: weekday */ __('Thursday');
+               $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.
                // sure the day initials are unique.

-               $this->weekday_initial[__('Sunday')]    = __('S_Sunday_initial');
-               $this->weekday_initial[__('Monday')]    = __('M_Monday_initial');
-               $this->weekday_initial[__('Tuesday')]   = __('T_Tuesday_initial');
-               $this->weekday_initial[__('Wednesday')] = __('W_Wednesday_initial');
-               $this->weekday_initial[__('Thursday')]  = __('T_Thursday_initial');
-               $this->weekday_initial[__('Friday')]    = __('F_Friday_initial');
-               $this->weekday_initial[__('Saturday')]  = __('S_Saturday_initial');
+               $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_);
                }
 
                // Abbreviations for each day.
 
                foreach ($this->weekday_initial as $weekday_ => $weekday_initial_) {
                        $this->weekday_initial[$weekday_] = preg_replace('/_.+_initial$/', '', $weekday_initial_);
                }
 
                // Abbreviations for each day.

-               $this->weekday_abbrev[__('Sunday')]    = __('Sun');
-               $this->weekday_abbrev[__('Monday')]    = __('Mon');
-               $this->weekday_abbrev[__('Tuesday')]   = __('Tue');
-               $this->weekday_abbrev[__('Wednesday')] = __('Wed');
-               $this->weekday_abbrev[__('Thursday')]  = __('Thu');
-               $this->weekday_abbrev[__('Friday')]    = __('Fri');
-               $this->weekday_abbrev[__('Saturday')]  = __('Sat');
+               $this->weekday_abbrev[__('Sunday')]    = /* translators: three-letter abbreviation of the weekday */ __('Sun');
+               $this->weekday_abbrev[__('Monday')]    = /* translators: three-letter abbreviation of the weekday */ __('Mon');
+               $this->weekday_abbrev[__('Tuesday')]   = /* translators: three-letter abbreviation of the weekday */ __('Tue');
+               $this->weekday_abbrev[__('Wednesday')] = /* translators: three-letter abbreviation of the weekday */ __('Wed');
+               $this->weekday_abbrev[__('Thursday')]  = /* translators: three-letter abbreviation of the weekday */ __('Thu');
+               $this->weekday_abbrev[__('Friday')]    = /* translators: three-letter abbreviation of the weekday */ __('Fri');
+               $this->weekday_abbrev[__('Saturday')]  = /* translators: three-letter abbreviation of the weekday */ __('Sat');

 
                // The Months
 
                // The Months

-               $this->month['01'] = __('January');
-               $this->month['02'] = __('February');
-               $this->month['03'] = __('March');
-               $this->month['04'] = __('April');
-               $this->month['05'] = __('May');
-               $this->month['06'] = __('June');
-               $this->month['07'] = __('July');
-               $this->month['08'] = __('August');
-               $this->month['09'] = __('September');
-               $this->month['10'] = __('October');
-               $this->month['11'] = __('November');
-               $this->month['12'] = __('December');
+               $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.
 
                // Abbreviations for each month. Uses the same hack as above to get around the
                // 'May' duplication.

-               $this->month_abbrev[__('January')] = __('Jan_January_abbreviation');
-               $this->month_abbrev[__('February')] = __('Feb_February_abbreviation');
-               $this->month_abbrev[__('March')] = __('Mar_March_abbreviation');
-               $this->month_abbrev[__('April')] = __('Apr_April_abbreviation');
-               $this->month_abbrev[__('May')] = __('May_May_abbreviation');
-               $this->month_abbrev[__('June')] = __('Jun_June_abbreviation');
-               $this->month_abbrev[__('July')] = __('Jul_July_abbreviation');
-               $this->month_abbrev[__('August')] = __('Aug_August_abbreviation');
-               $this->month_abbrev[__('September')] = __('Sep_September_abbreviation');
-               $this->month_abbrev[__('October')] = __('Oct_October_abbreviation');
-               $this->month_abbrev[__('November')] = __('Nov_November_abbreviation');
-               $this->month_abbrev[__('December')] = __('Dec_December_abbreviation');
+               $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_);
 
                foreach ($this->month_abbrev as $month_ => $month_abbrev_) {
                        $this->month_abbrev[$month_] = preg_replace('/_.+_abbreviation$/', '', $month_abbrev_);


@@ -178,24 +167,29 @@ class WP_Locale {
                // Numbers formatting
                // See http://php.net/number_format
 
                // Numbers formatting
                // See http://php.net/number_format
 

-               /* translators: $decimals argument for http://php.net/number_format, default is 0 */
-               $trans = __('number_format_decimals');
-               $this->number_format['decimals'] = ('number_format_decimals' == $trans) ? 0 : $trans;
+               /* 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;

 
                /* 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;
 
 
                /* 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;
 

-               /* 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;
+               // 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' ) );

                }
                }

+       }

 
 

+       function rtl_src_admin_notice() {
+               echo '<div class="error"><p>' . 'The <code>build</code> directory of the develop repository must be used for RTL.' . '</p></div>';

        }
 
        /**
        }
 
        /**


@@ -318,18 +312,54 @@ 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()
         * @since 2.1.0
         *
         *
         * @uses WP_Locale::init()
         * @uses WP_Locale::register_globals()
         * @since 2.1.0
         *

-        * @return WP_Locale

         */
         */

-       function WP_Locale() {
+       function __construct() {

                $this->init();
                $this->register_globals();
        }
                $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;
+       }
+
+       /**
+        * 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
+        */
+       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
+ * @return bool Whether locale is RTL.
+ */
+function is_rtl() {
+       global $wp_locale;
+       return $wp_locale->is_rtl();
+}