Changeset 19836

Timestamp:

02/06/2012 07:36:24 PM (13 years ago)

Author:

nacin

Message:

Do RTL detection based on a translated string, rather than a hardcoded list. Makes things a bit cleaner. fixes #19924, fixes #19600.

Location:

trunk/wp-includes

Files:

• load.php (modified) (1 diff)
• locale.php (modified) (3 diffs)

trunk/wp-includes/load.php

@@ -727 +727 @@
                     if ( defined( 'WP_SETUP_CONFIG' ) && file_exists( $location . '/admin-' . $locale . '.mo' ) )
                         load_textdomain( 'default', $location . '/admin-' . $locale . '.mo' );
-                    if ( WP_Locale::is_locale_rtl( $locale ) )
-                        $text_direction = 'rtl';
                     break 2;
                 }

trunk/wp-includes/locale.php

@@ -84 +84 @@
      */
     var $text_direction = 'ltr';
-
-    /**
-     * Locales which are known to be right-to-left.
-     *
-     * @since 3.4.0
-     * @var array
-     * @access private
-     * @static
-     */
-    private static $rtl_locales = array( 'ar', 'ckb', 'fa_IR', 'he_IL', 'ug_CN', 'dv', 'fa_AF', 'ha', 'ps', 'uz_UZ', 'yi' );
 
     /**
@@ -191 +181 @@
         if ( isset( $GLOBALS['text_direction'] ) )
             $this->text_direction = $GLOBALS['text_direction'];
-        elseif ( is_textdomain_loaded( 'default' ) && self::is_locale_rtl( get_locale() ) )
+        elseif ( 'rtl' == _x( 'ltr', 'text direction' ) )
             $this->text_direction = 'rtl';
     }
@@ -336 +326 @@
     function is_rtl() {
         return 'rtl' == $this->text_direction;
-    }
-
-    /**
-     * Determines whether a locale is known to be right-to-left.
-     *
-     * @since 3.4.0
-     * @static
-     *
-     * @param string Locale in WP format.
-     * @return bool Whether locale is RTL.
-     */
-    public static function is_locale_rtl( $locale ) {
-        return in_array( $locale, self::$rtl_locales );
     }
 }