<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[18518] trunk/wp-includes/js/tinymce/langs/wp-langs.php: Fix i18n for wp_editor, props SergeyBiryukov, see #17144</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/18518">18518</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-08-07 16:26:31 +0000 (Sun, 07 Aug 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix i18n for wp_editor, props SergeyBiryukov, see <a href="http://core.trac.wordpress.org/ticket/17144">#17144</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjstinymcelangswplangsphp">trunk/wp-includes/js/tinymce/langs/wp-langs.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjstinymcelangswplangsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/langs/wp-langs.php (18517 => 18518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/langs/wp-langs.php 2011-08-06 21:04:15 UTC (rev 18517)
+++ trunk/wp-includes/js/tinymce/langs/wp-langs.php 2011-08-07 16:26:31 UTC (rev 18518)
</span><span class="lines">@@ -2,15 +2,15 @@
</span><span class="cx">
</span><span class="cx"> // escape text only if it needs translating
</span><span class="cx"> function mce_escape($text) {
</span><del>- global $language;
</del><ins>+ global $wp_editor;
</ins><span class="cx">
</span><del>- if ( 'en' == $language )
</del><ins>+ if ( 'en' == $wp_editor->mce_locale )
</ins><span class="cx"> return $text;
</span><span class="cx"> else
</span><span class="cx"> return esc_js($text);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-$lang = 'tinyMCE.addI18n({' . $language . ':{
</del><ins>+$lang = 'tinyMCE.addI18n({' . $this->mce_locale . ':{
</ins><span class="cx"> common:{
</span><span class="cx"> edit_confirm:"' . mce_escape( __('Do you want to use the WYSIWYG mode for this textarea?') ) . '",
</span><span class="cx"> apply:"' . mce_escape( __('Apply') ) . '",
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> }
</span><span class="cx"> }});
</span><span class="cx">
</span><del>-tinyMCE.addI18n("' . $language . '.advanced",{
</del><ins>+tinyMCE.addI18n("' . $this->mce_locale . '.advanced",{
</ins><span class="cx"> style_select:"' . mce_escape( /* translators: TinyMCE font styles */ _x('Styles', 'TinyMCE font styles') ) . '",
</span><span class="cx"> font_size:"' . mce_escape( __('Font size') ) . '",
</span><span class="cx"> fontdefault:"' . mce_escape( __('Font family') ) . '",
</span><span class="lines">@@ -298,7 +298,7 @@
</span><span class="cx"> toolbar:"' . mce_escape( __('Toolbar') ) . '"
</span><span class="cx"> });
</span><span class="cx">
</span><del>-tinyMCE.addI18n("' . $language . '.advanced_dlg",{
</del><ins>+tinyMCE.addI18n("' . $this->mce_locale . '.advanced_dlg",{
</ins><span class="cx"> about_title:"' . mce_escape( __('About TinyMCE') ) . '",
</span><span class="cx"> about_general:"' . mce_escape( __('About') ) . '",
</span><span class="cx"> about_help:"' . mce_escape( __('Help') ) . '",
</span><span class="lines">@@ -352,7 +352,7 @@
</span><span class="cx"> accessibility_usage_title:"' . mce_escape( __('General Usage') ) . '"
</span><span class="cx"> });
</span><span class="cx">
</span><del>-tinyMCE.addI18n("' . $language . '.media_dlg",{
</del><ins>+tinyMCE.addI18n("' . $this->mce_locale . '.media_dlg",{
</ins><span class="cx"> title:"' . mce_escape( __('Insert / edit embedded media') ) . '",
</span><span class="cx"> general:"' . mce_escape( __('General') ) . '",
</span><span class="cx"> advanced:"' . mce_escape( __('Advanced') ) . '",
</span><span class="lines">@@ -462,7 +462,7 @@
</span><span class="cx"> source:"' . mce_escape( __('Source') ) . '"
</span><span class="cx"> });
</span><span class="cx">
</span><del>-tinyMCE.addI18n("' . $language . '.wordpress",{
</del><ins>+tinyMCE.addI18n("' . $this->mce_locale . '.wordpress",{
</ins><span class="cx"> wp_adv_desc:"' . mce_escape( __('Show/Hide Kitchen Sink') ) . ' (Alt+Shift+Z)",
</span><span class="cx"> wp_more_desc:"' . mce_escape( __('Insert More Tag') ) . ' (Alt+Shift+T)",
</span><span class="cx"> wp_page_desc:"' . mce_escape( __('Insert Page break') ) . ' (Alt+Shift+P)",
</span><span class="lines">@@ -477,7 +477,7 @@
</span><span class="cx"> delgallery:"' . mce_escape( __('Delete Gallery') ) . '"
</span><span class="cx"> });
</span><span class="cx">
</span><del>-tinyMCE.addI18n("' . $language . '.wpeditimage",{
</del><ins>+tinyMCE.addI18n("' . $this->mce_locale . '.wpeditimage",{
</ins><span class="cx"> edit_img:"' . mce_escape( __('Edit Image') ) . '",
</span><span class="cx"> del_img:"' . mce_escape( __('Delete Image') ) . '",
</span><span class="cx"> adv_settings:"' . mce_escape( __('Advanced Settings') ) . '",
</span></span></pre>
</div>
</div>
</body>
</html>