From c70ac59b6ecec08aa7aa9d2fb78f11be3a23f781 Mon Sep 17 00:00:00 2001
From: azaozz <azaozz@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sun, 7 Aug 2011 16:26:31 +0000
Subject: [PATCH] Fix i18n for wp_editor, props SergeyBiryukov, see #17144

git-svn-id: http://svn.automattic.com/wordpress/trunk@18518 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/js/tinymce/langs/wp-langs.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/wp-includes/js/tinymce/langs/wp-langs.php b/wp-includes/js/tinymce/langs/wp-langs.php
index 32e9c3704..8552590c0 100644
--- a/wp-includes/js/tinymce/langs/wp-langs.php
+++ b/wp-includes/js/tinymce/langs/wp-langs.php
@@ -2,15 +2,15 @@
 
 // escape text only if it needs translating
 function mce_escape($text) {
-	global $language;
+	global $wp_editor;
 
-	if ( 'en' == $language )
+	if ( 'en' == $wp_editor->mce_locale )
 		return $text;
 	else
 		return esc_js($text);
 }
 
-$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?') ) . '",
 apply:"' . mce_escape( __('Apply') ) . '",
@@ -232,7 +232,7 @@ words:"' . mce_escape( __('Words:') ) . ' "
 }
 }});
 
-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') ) . '",
 fontdefault:"' . mce_escape( __('Font family') ) . '",
@@ -298,7 +298,7 @@ rich_text_area:"' . mce_escape( __('Rich Text Area') ) . '",
 toolbar:"' . mce_escape( __('Toolbar') ) . '"
 });
 
-tinyMCE.addI18n("' . $language . '.advanced_dlg",{
+tinyMCE.addI18n("' . $this->mce_locale . '.advanced_dlg",{
 about_title:"' . mce_escape( __('About TinyMCE') ) . '",
 about_general:"' . mce_escape( __('About') ) . '",
 about_help:"' . mce_escape( __('Help') ) . '",
@@ -352,7 +352,7 @@ accessibility_help:"' . mce_escape( __('Accessibility Help') ) . '",
 accessibility_usage_title:"' . mce_escape( __('General Usage') ) . '"
 });
 
-tinyMCE.addI18n("' . $language . '.media_dlg",{
+tinyMCE.addI18n("' . $this->mce_locale . '.media_dlg",{
 title:"' . mce_escape( __('Insert / edit embedded media') ) . '",
 general:"' . mce_escape( __('General') ) . '",
 advanced:"' . mce_escape( __('Advanced') ) . '",
@@ -462,7 +462,7 @@ poster:"' . mce_escape( __('Poster') ) . '",
 source:"' . mce_escape( __('Source') ) . '"
 });
 
-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)",
 wp_page_desc:"' . mce_escape( __('Insert Page break') ) . ' (Alt+Shift+P)",
@@ -477,7 +477,7 @@ editgallery:"' . mce_escape( __('Edit Gallery') ) . '",
 delgallery:"' . mce_escape( __('Delete Gallery') ) . '"
 });
 
-tinyMCE.addI18n("' . $language . '.wpeditimage",{
+tinyMCE.addI18n("' . $this->mce_locale . '.wpeditimage",{
 edit_img:"' . mce_escape( __('Edit Image') )  . '",
 del_img:"' . mce_escape( __('Delete Image') )  . '",
 adv_settings:"' . mce_escape( __('Advanced Settings') )  . '",