Changeset 28112 for trunk/src/wp-includes/class-wp-editor.php

Timestamp:

04/14/2014 03:22:38 AM (10 years ago)

Author:

nacin

Message:

TinyMCE: Always load translations, even in English, as we modify some strings.

Move a setting to after the translations filter, and remove unused strings.

see #24067.

File:

• trunk/src/wp-includes/class-wp-editor.php (modified) (4 diffs)

trunk/src/wp-includes/class-wp-editor.php

@@ -755 +755 @@
             'New document' => __( 'New document' ),
             'Formats' => _x( 'Formats', 'TinyMCE' ),
-            'Headers' => _x( 'Headings', 'TinyMCE' ),
-            'Header 1' => __( 'Heading 1' ),
-            'Header 2' => __( 'Heading 2' ),
-            'Header 3' => __( 'Heading 3' ),
-            'Header 4' => __( 'Heading 4' ),
-            'Header 5' => __( 'Heading 5' ),
-            'Header 6' => __( 'Heading 6' ),
 
             'Headings' => _x( 'Headings', 'TinyMCE' ),
@@ -984 +977 @@
         $mce_locale = self::$mce_locale;
 
-        // Set direction
-        if ( is_rtl() ) {
-            $mce_translation['_dir'] = 'rtl';
-        }
-
         /**
          * Filter translated strings prepared for TinyMCE.
@@ -1003 +991 @@
                 $mce_translation[$key] = html_entity_decode( $value, ENT_QUOTES, 'UTF-8' );
             }
+        }
+
+        // Set direction
+        if ( is_rtl() ) {
+            $mce_translation['_dir'] = 'rtl';
         }
 
@@ -1098 +1091 @@
             }
 
-            if ( 'en' != self::$mce_locale )
-                echo "<script type='text/javascript'>\n" . self::wp_mce_translation() . "</script>\n";
+            echo "<script type='text/javascript'>\n" . self::wp_mce_translation() . "</script>\n";
 
             if ( self::$ext_plugins ) {