Changeset 19420 for trunk/wp-includes/js/tinymce/langs/wp-langs.php

Timestamp:

11/23/2011 07:06:52 PM (15 years ago)

Author:

nacin

Message:

Move WP_Editor to a _WP_Editors encapsulation.

• WP_Editor will return in 3.4 as a one true API for editor instances. Stick to wp_editor() for now.
• TinyMCE can now be forced on with tinymce = true. It defaults to the value for user_can_richedit().
• Restores wp_default_editor(), wp_link_query(), wp_link_dialog(), wp_fullscreen_html().

fixes #19320.

File:

• trunk/wp-includes/js/tinymce/langs/wp-langs.php (modified) (6 diffs)

trunk/wp-includes/js/tinymce/langs/wp-langs.php

@@ -1 +1 @@
 <?php
 
-// escape text only if it needs translating
 function mce_escape($text) {
-        global $wp_editor;
-
-        if ( 'en' == $wp_editor->mce_locale )
-                return $text;
-        else
-                return esc_js($text);
+        return esc_js($text);
 }
 
-$lang = 'tinyMCE.addI18n({' . $this->mce_locale . ':{
+if ( ! class_exists( '_WP_Editors' ) )
+        require( ABSPATH . WPINC . '/class-wp-editor.php' );
+
+$lang = 'tinyMCE.addI18n({' . _WP_Editors::$mce_locale . ':{
 common:{
 edit_confirm:"' . mce_escape( __('Do you want to use the WYSIWYG mode for this textarea?') ) . '",
@@ -233 +230 @@
 }});
 
-tinyMCE.addI18n("' . $this->mce_locale . '.advanced",{
+tinyMCE.addI18n("' . _WP_Editors::$mce_locale . '.advanced",{
 style_select:"' . mce_escape( /* translators: TinyMCE font styles */ _x('Styles', 'TinyMCE font styles') ) . '",
 font_size:"' . mce_escape( __('Font size') ) . '",
@@ -299 +296 @@
 });
 
-tinyMCE.addI18n("' . $this->mce_locale . '.advanced_dlg",{
+tinyMCE.addI18n("' . _WP_Editors::$mce_locale . '.advanced_dlg",{
 about_title:"' . mce_escape( __('About TinyMCE') ) . '",
 about_general:"' . mce_escape( __('About') ) . '",
@@ -353 +350 @@
 });
 
-tinyMCE.addI18n("' . $this->mce_locale . '.media_dlg",{
+tinyMCE.addI18n("' . _WP_Editors::$mce_locale . '.media_dlg",{
 title:"' . mce_escape( __('Insert / edit embedded media') ) . '",
 general:"' . mce_escape( __('General') ) . '",
@@ -463 +460 @@
 });
 
-tinyMCE.addI18n("' . $this->mce_locale . '.wordpress",{
+tinyMCE.addI18n("' . _WP_Editors::$mce_locale . '.wordpress",{
 wp_adv_desc:"' . mce_escape( __('Show/Hide Kitchen Sink (Alt + Shift + Z)') )  . '",
 wp_more_desc:"' . mce_escape( __('Insert More Tag (Alt + Shift + T)') ) . '",
@@ -478 +475 @@
 });
 
-tinyMCE.addI18n("' . $this->mce_locale . '.wpeditimage",{
+tinyMCE.addI18n("' . _WP_Editors::$mce_locale . '.wpeditimage",{
 edit_img:"' . mce_escape( __('Edit Image') )  . '",
 del_img:"' . mce_escape( __('Delete Image') )  . '",