<!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>[27922] trunk/src/wp-includes/class-wp-editor.php: TinyMCE:</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/27922">27922</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-04-03 03:39:21 +0000 (Thu, 03 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>TinyMCE:
- Bring back loading of /langs/[locale].js and /langs/[locale]_dlg.js from PHP. Prevents errors with missing translation files when custom plugins use requireLangPack() without second argument.
- Back to using ISO 639-1 (two letter) locales as the locale is used as part of the translation file name.
See <a href="http://core.trac.wordpress.org/ticket/24067">#24067</a>, fixes <a href="http://core.trac.wordpress.org/ticket/27610">#27610</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpeditorphp">trunk/src/wp-includes/class-wp-editor.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-editor.php (27921 => 27922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-editor.php 2014-04-03 03:37:12 UTC (rev 27921)
+++ trunk/src/wp-includes/class-wp-editor.php 2014-04-03 03:39:21 UTC (rev 27922)
</span><span class="lines">@@ -270,14 +270,10 @@
</span><span class="cx">
</span><span class="cx"> if ( empty( self::$first_init ) ) {
</span><span class="cx"> self::$baseurl = includes_url( 'js/tinymce' );
</span><ins>+
</ins><span class="cx"> $mce_locale = get_locale();
</span><ins>+ self::$mce_locale = $mce_locale = empty( $mce_locale ) ? 'en' : strtolower( substr( $mce_locale, 0, 2 ) ); // ISO 639-1
</ins><span class="cx">
</span><del>- if ( empty( $mce_locale ) || 'en' == substr( $mce_locale, 0, 2 ) ) {
- $mce_locale = 'en';
- }
-
- self::$mce_locale = $mce_locale;
-
</del><span class="cx"> /** This filter is documented in wp-admin/includes/media.php */
</span><span class="cx"> $no_captions = (bool) apply_filters( 'disable_captions', '' );
</span><span class="cx"> $first_run = true;
</span><span class="lines">@@ -392,10 +388,40 @@
</span><span class="cx"> $url = set_url_scheme( $url );
</span><span class="cx"> $mce_external_plugins[ $name ] = $url;
</span><span class="cx"> $plugurl = dirname( $url );
</span><ins>+ $strings = $str1 = $str2 = '';
</ins><span class="cx">
</span><del>- if ( in_array( $name, $loaded_langs ) ) {
- $ext_plugins .= 'tinyMCEPreInit.load_ext("' . $plugurl . '", "' . $mce_locale . '");' . "\n";
</del><ins>+ // Try to load langs/[locale].js and langs/[locale]_dlg.js
+ if ( ! in_array( $name, $loaded_langs, true ) ) {
+ $path = str_replace( content_url(), '', $plugurl );
+ $path = WP_CONTENT_DIR . $path . '/langs/';
+
+ if ( function_exists('realpath') )
+ $path = trailingslashit( realpath($path) );
+
+ if ( @is_file( $path . $mce_locale . '.js' ) )
+ $strings .= @file_get_contents( $path . $mce_locale . '.js' ) . "\n";
+
+ if ( @is_file( $path . $mce_locale . '_dlg.js' ) )
+ $strings .= @file_get_contents( $path . $mce_locale . '_dlg.js' ) . "\n";
+
+ if ( 'en' != $mce_locale && empty( $strings ) ) {
+ if ( @is_file( $path . 'en.js' ) ) {
+ $str1 = @file_get_contents( $path . 'en.js' );
+ $strings .= preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $str1, 1 ) . "\n";
+ }
+
+ if ( @is_file( $path . 'en_dlg.js' ) ) {
+ $str2 = @file_get_contents( $path . 'en_dlg.js' );
+ $strings .= preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $str2, 1 ) . "\n";
+ }
+ }
+
+ if ( ! empty( $strings ) )
+ $ext_plugins .= "\n" . $strings . "\n";
</ins><span class="cx"> }
</span><ins>+
+ $ext_plugins .= 'tinyMCEPreInit.load_ext("' . $plugurl . '", "' . $mce_locale . '");' . "\n";
+ $ext_plugins .= 'tinymce.PluginManager.load("' . $name . '", "' . $url . '");' . "\n";
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>