Changeset 18518

Timestamp:

08/07/2011 04:26:31 PM (13 years ago)

Author:

azaozz

Message:

Fix i18n for wp_editor, props SergeyBiryukov, see #17144

File:

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

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

@@ -3 +3 @@
 // escape text only if it needs translating
 function mce_escape($text) {
-    global $language;
-
-    if ( 'en' == $language )
+    global $wp_editor;
+
+    if ( 'en' == $wp_editor->mce_locale )
         return $text;
     else
@@ -11 +11 @@
 }
 
-$lang = 'tinyMCE.addI18n({' . $language . ':{
+$lang = 'tinyMCE.addI18n({' . $this->mce_locale . ':{
 common:{
 edit_confirm:"' . mce_escape( __('Do you want to use the WYSIWYG mode for this textarea?') ) . '",
@@ -233 +233 @@
 }});
 
-tinyMCE.addI18n("' . $language . '.advanced",{
+tinyMCE.addI18n("' . $this->mce_locale . '.advanced",{
 style_select:"' . mce_escape( /* translators: TinyMCE font styles */ _x('Styles', 'TinyMCE font styles') ) . '",
 font_size:"' . mce_escape( __('Font size') ) . '",
@@ -299 +299 @@
 });
 
-tinyMCE.addI18n("' . $language . '.advanced_dlg",{
+tinyMCE.addI18n("' . $this->mce_locale . '.advanced_dlg",{
 about_title:"' . mce_escape( __('About TinyMCE') ) . '",
 about_general:"' . mce_escape( __('About') ) . '",
@@ -353 +353 @@
 });
 
-tinyMCE.addI18n("' . $language . '.media_dlg",{
+tinyMCE.addI18n("' . $this->mce_locale . '.media_dlg",{
 title:"' . mce_escape( __('Insert / edit embedded media') ) . '",
 general:"' . mce_escape( __('General') ) . '",
@@ -463 +463 @@
 });
 
-tinyMCE.addI18n("' . $language . '.wordpress",{
+tinyMCE.addI18n("' . $this->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 +478 @@
 });
 
-tinyMCE.addI18n("' . $language . '.wpeditimage",{
+tinyMCE.addI18n("' . $this->mce_locale . '.wpeditimage",{
 edit_img:"' . mce_escape( __('Edit Image') )  . '",
 del_img:"' . mce_escape( __('Delete Image') )  . '",