WordPress 4.3

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

diff --git a/wp-includes/locale.php b/wp-includes/locale.php
index 1b529bae23eb9ccd82acd8dda1c7ceb4b42c0e37..1319c49daebdd81acfec6d618fdc7176dd5c8738 100644 (file)
--- a/wp-includes/locale.php
+++ b/wp-includes/locale.php
@@ -17,9 +17,8 @@ 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.
 
        /**
         * Stores the translated strings for the one character weekday names.


@@ -31,36 +30,32 @@ class WP_Locale {
         *
         * @since 2.1.0
         * @var array
         *
         * @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'.


@@ -69,9 +64,8 @@ class WP_Locale {
         *
         * @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.


@@ -102,8 +91,11 @@ class WP_Locale {
         *
         * @since 2.1.0
         * @access private
         *
         * @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');
                // The Weekdays
                $this->weekday[0] = /* translators: weekday */ __('Sunday');
                $this->weekday[1] = /* translators: weekday */ __('Monday');


@@ -113,7 +105,7 @@ class WP_Locale {
                $this->weekday[5] = /* translators: weekday */ __('Friday');
                $this->weekday[6] = /* translators: weekday */ __('Saturday');
 
                $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');
                // 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 +178,25 @@ class WP_Locale {
                $trans = __('number_format_decimal_point');
                $this->number_format['decimal_point'] = ('number_format_decimal_point' == $trans) ? '.' : $trans;
 
                $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' ) );

                }
                }

+       }

 
 

+       /**
+        * @since 3.8.0
+        */
+       public function rtl_src_admin_notice() {
+               /* translators: %s: Name of the directory (build) */
+               echo '<div class="error"><p>' . sprintf( __( 'The %s directory of the develop repository must be used for RTL.' ), '<code>build</code>' ) . '</p></div>';

        }
 
        /**
        }
 
        /**


@@ -207,7 +212,7 @@ class WP_Locale {
         * @param int $weekday_number 0 for Sunday through 6 Saturday
         * @return string Full translated weekday
         */
         * @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];
        }
 
                return $this->weekday[$weekday_number];
        }
 


@@ -225,7 +230,7 @@ class WP_Locale {
         * @param string $weekday_name
         * @return string
         */
         * @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];
        }
 
                return $this->weekday_initial[$weekday_name];
        }
 


@@ -241,7 +246,7 @@ class WP_Locale {
         * @param string $weekday_name Full translated weekday word
         * @return string Translated weekday abbreviation
         */
         * @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];
        }
 
                return $this->weekday_abbrev[$weekday_name];
        }
 


@@ -262,7 +267,7 @@ class WP_Locale {
         * @param string|int $month_number '01' through '12'
         * @return string Translated full month name
         */
         * @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)];
        }
 
                return $this->month[zeroise($month_number, 2)];
        }
 


@@ -278,7 +283,7 @@ class WP_Locale {
         * @param string $month_name Translated month to get abbreviated version
         * @return string Translated abbreviated month
         */
         * @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];
        }
 
                return $this->month_abbrev[$month_name];
        }
 


@@ -293,7 +298,7 @@ class WP_Locale {
         * @param string $meridiem Either 'am', 'pm', 'AM', or 'PM'. Not translated version.
         * @return string Translated version
         */
         * @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];
        }
 
                return $this->meridiem[$meridiem];
        }
 


@@ -303,9 +308,15 @@ class WP_Locale {
         * @deprecated For backwards compatibility only.
         * @access private
         *
         * @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
         */
         * @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;
                $GLOBALS['weekday']         = $this->weekday;
                $GLOBALS['weekday_initial'] = $this->weekday_initial;
                $GLOBALS['weekday_abbrev']  = $this->weekday_abbrev;


@@ -316,36 +327,52 @@ class WP_Locale {
        /**
         * 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
         * @since 2.1.0

-        *
-        * @return WP_Locale

         */
         */

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

-
-?>