<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[16503] trunk/wp-includes/script-loader.php:
Add missing calls to convertEntities for js l10n</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16503">16503</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-11-20 11:56:59 +0000 (Sat, 20 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add missing calls to convertEntities for js l10n</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (16502 => 16503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2010-11-20 06:10:07 UTC (rev 16502)
+++ trunk/wp-includes/script-loader.php 2010-11-20 11:56:59 UTC (rev 16503)
</span><span class="lines">@@ -235,8 +235,8 @@
</span><span class="cx"> 'dismiss' => __('Dismiss'),
</span><span class="cx"> 'crunching' => __('Crunching&hellip;'),
</span><span class="cx"> 'deleted' => __('moved to the trash.'),
</span><ins>+ 'error_uploading' => __('&#8220;%s&#8221; has failed to upload due to an error'),
</ins><span class="cx"> 'l10n_print_after' => 'try{convertEntities(swfuploadL10n);}catch(e){};',
</span><del>- 'error_uploading' => __('&#8220;%s&#8221; has failed to upload due to an error')
</del><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'comment-reply', "/wp-includes/js/comment-reply$suffix.js", false, '20090102');
</span><span class="lines">@@ -267,12 +267,14 @@
</span><span class="cx"> $scripts->localize( 'admin-bar', 'adminBarL10n', array(
</span><span class="cx"> 'url' => __( 'URL:' ),
</span><span class="cx"> 'noShortlink' => __( 'No shortlink available for this page.' ),
</span><ins>+ 'l10n_print_after' => 'try{convertEntities(adminBarL10n);}catch(e){};',
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'wplink', "/wp-includes/js/tinymce/plugins/wplink/js/wplink$suffix.js", array('jquery'), '20101119d' );
</span><span class="cx"> $scripts->localize( 'wplink', 'wpLinkL10n', array(
</span><span class="cx"> 'untitled' => __('Untitled'),
</span><span class="cx"> 'noMatchesFound' => __('No matches found.'),
</span><ins>+ 'l10n_print_after' => 'try{convertEntities(wpLinkL10n);}catch(e){};',
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'wpdialogs-popup', "/wp-includes/js/tinymce/plugins/wpdialogs/js/popup$suffix.js", array( 'jquery-ui-dialog' ), '20101119' );
</span><span class="lines">@@ -380,7 +382,8 @@
</span><span class="cx"> $scripts->localize( 'list-table', 'listTableL10n', array(
</span><span class="cx"> 'loading' => __('Loading...'),
</span><span class="cx"> 'error' => __('An error has occurred while loading the items.'),
</span><del>- 'search' => __('Search results for &#8220;%s&#8221;')
</del><ins>+ 'search' => __('Search results for &#8220;%s&#8221;'),
+ 'l10n_print_after' => 'try{convertEntities(listTableL10n);}catch(e){};'
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'suggest' ), '20100707' );
</span><span class="lines">@@ -429,7 +432,8 @@
</span><span class="cx"> 'setThumbnail' => __( 'Use as featured image' ),
</span><span class="cx"> 'saving' => __( 'Saving...' ),
</span><span class="cx"> 'error' => __( 'Could not set that as the thumbnail image. Try a different attachment.' ),
</span><del>- 'done' => __( 'Done' )
</del><ins>+ 'done' => __( 'Done' ),
+ 'l10n_print_after' => 'try{convertEntities(setPostThumbnailL10n);}catch(e){};'
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> // Navigation Menus
</span><span class="lines">@@ -438,6 +442,7 @@
</span><span class="cx"> 'noResultsFound' => _x('No results found.', 'search results'),
</span><span class="cx"> 'warnDeleteMenu' => __( "You are about to permanently delete this menu. \n 'Cancel' to stop, 'OK' to delete." ),
</span><span class="cx"> 'saveAlert' => __('The changes you made will be lost if you navigate away from this page.'),
</span><ins>+ 'l10n_print_after' => 'try{convertEntities(navMenuL10n);}catch(e){};'
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'custom-background', "/wp-admin/js/custom-background$suffix.js", array('farbtastic'), '20101025' );
</span></span></pre>
</div>
</div>
</body>
</html>