<!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>[14647] trunk: Introduce _ex(), a hybrid between _e() and _x()
-- translate with context, then echo.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14647">14647</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-05-14 21:46:25 +0000 (Fri, 14 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce _ex(), a hybrid between _e() and _x() -- translate with context, then echo. props westi, see <a href="http://trac.wordpress.org/ticket/13395">#13395</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincommentphp">trunk/wp-admin/comment.php</a></li>
<li><a href="#trunkwpadmineditcommentsphp">trunk/wp-admin/edit-comments.php</a></li>
<li><a href="#trunkwpadmineditformcommentphp">trunk/wp-admin/edit-form-comment.php</a></li>
<li><a href="#trunkwpadminedittagformphp">trunk/wp-admin/edit-tag-form.php</a></li>
<li><a href="#trunkwpadminedittagsphp">trunk/wp-admin/edit-tags.php</a></li>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpadminincludesplugininstallphp">trunk/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminincludesthemeinstallphp">trunk/wp-admin/includes/theme-install.php</a></li>
<li><a href="#trunkwpadminmssitesphp">trunk/wp-admin/ms-sites.php</a></li>
<li><a href="#trunkwpadminmsusersphp">trunk/wp-admin/ms-users.php</a></li>
<li><a href="#trunkwpadminthemeeditorphp">trunk/wp-admin/theme-editor.php</a></li>
<li><a href="#trunkwpadminuploadphp">trunk/wp-admin/upload.php</a></li>
<li><a href="#trunkwpincludesl10nphp">trunk/wp-includes/l10n.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/comment.php (14646 => 14647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/comment.php 2010-05-14 21:22:14 UTC (rev 14646)
+++ trunk/wp-admin/comment.php 2010-05-14 21:46:25 UTC (rev 14647)
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> </tr>
</span><span class="cx"> <?php } ?>
</span><span class="cx"> <tr>
</span><del>-<th scope="row" valign="top"><?php /* translators: field name in comment form */ echo _x('Comment', 'noun'); ?></th>
</del><ins>+<th scope="row" valign="top"><?php /* translators: field name in comment form */ _ex('Comment', 'noun'); ?></th>
</ins><span class="cx"> <td><?php echo $comment->comment_content; ?></td>
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span></span></pre></div>
<a id="trunkwpadmineditcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-comments.php (14646 => 14647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-comments.php 2010-05-14 21:22:14 UTC (rev 14646)
+++ trunk/wp-admin/edit-comments.php 2010-05-14 21:46:25 UTC (rev 14647)
</span><span class="lines">@@ -316,12 +316,12 @@
</span><span class="cx"> <option value="approve"><?php _e('Approve'); ?></option>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php if ( 'all' == $comment_status || 'approved' == $comment_status || 'moderated' == $comment_status ): ?>
</span><del>-<option value="spam"><?php echo _x('Mark as Spam', 'comment'); ?></option>
</del><ins>+<option value="spam"><?php _ex('Mark as Spam', 'comment'); ?></option>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php if ( 'trash' == $comment_status ): ?>
</span><span class="cx"> <option value="untrash"><?php _e('Restore'); ?></option>
</span><span class="cx"> <?php elseif ( 'spam' == $comment_status ): ?>
</span><del>-<option value="unspam"><?php echo _x('Not Spam', 'comment'); ?></option>
</del><ins>+<option value="unspam"><?php _ex('Not Spam', 'comment'); ?></option>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php if ( 'trash' == $comment_status || 'spam' == $comment_status || !EMPTY_TRASH_DAYS ): ?>
</span><span class="cx"> <option value="delete"><?php _e('Delete Permanently'); ?></option>
</span><span class="lines">@@ -416,7 +416,7 @@
</span><span class="cx"> <option value="approve"><?php _e('Approve'); ?></option>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php if ( 'all' == $comment_status || 'approved' == $comment_status || 'moderated' == $comment_status ): ?>
</span><del>-<option value="spam"><?php echo _x('Mark as Spam', 'comment'); ?></option>
</del><ins>+<option value="spam"><?php _ex('Mark as Spam', 'comment'); ?></option>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php if ( 'trash' == $comment_status ): ?>
</span><span class="cx"> <option value="untrash"><?php _e('Restore'); ?></option>
</span><span class="lines">@@ -424,7 +424,7 @@
</span><span class="cx"> <?php if ( 'trash' == $comment_status || 'spam' == $comment_status || !EMPTY_TRASH_DAYS ): ?>
</span><span class="cx"> <option value="delete"><?php _e('Delete Permanently'); ?></option>
</span><span class="cx"> <?php elseif ( 'spam' == $comment_status ): ?>
</span><del>-<option value="unspam"><?php echo _x('Not Spam', 'comment'); ?></option>
</del><ins>+<option value="unspam"><?php _ex('Not Spam', 'comment'); ?></option>
</ins><span class="cx"> <?php else: ?>
</span><span class="cx"> <option value="trash"><?php _e('Move to Trash'); ?></option>
</span><span class="cx"> <?php endif; ?>
</span></span></pre></div>
<a id="trunkwpadmineditformcommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-comment.php (14646 => 14647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-comment.php 2010-05-14 21:22:14 UTC (rev 14646)
+++ trunk/wp-admin/edit-form-comment.php 2010-05-14 21:46:25 UTC (rev 14647)
</span><span class="lines">@@ -47,9 +47,9 @@
</span><span class="cx"> <div id="misc-publishing-actions">
</span><span class="cx">
</span><span class="cx"> <div class="misc-pub-section" id="comment-status-radio">
</span><del>-<label class="approved"><input type="radio"<?php checked( $comment->comment_approved, '1' ); ?> name="comment_status" value="1" /><?php /* translators: comment type radio button */ echo _x('Approved', 'adjective') ?></label><br />
-<label class="waiting"><input type="radio"<?php checked( $comment->comment_approved, '0' ); ?> name="comment_status" value="0" /><?php /* translators: comment type radio button */ echo _x('Pending', 'adjective') ?></label><br />
-<label class="spam"><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php /* translators: comment type radio button */ echo _x('Spam', 'adjective'); ?></label>
</del><ins>+<label class="approved"><input type="radio"<?php checked( $comment->comment_approved, '1' ); ?> name="comment_status" value="1" /><?php /* translators: comment type radio button */ _ex('Approved', 'adjective') ?></label><br />
+<label class="waiting"><input type="radio"<?php checked( $comment->comment_approved, '0' ); ?> name="comment_status" value="0" /><?php /* translators: comment type radio button */ _ex('Pending', 'adjective') ?></label><br />
+<label class="spam"><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php /* translators: comment type radio button */ _ex('Spam', 'adjective'); ?></label>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="misc-pub-section curtime misc-pub-section-last">
</span></span></pre></div>
<a id="trunkwpadminedittagformphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tag-form.php (14646 => 14647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tag-form.php 2010-05-14 21:22:14 UTC (rev 14646)
+++ trunk/wp-admin/edit-tag-form.php 2010-05-14 21:46:25 UTC (rev 14647)
</span><span class="lines">@@ -33,20 +33,20 @@
</span><span class="cx"> <?php wp_original_referer_field(true, 'previous'); wp_nonce_field('update-tag_' . $tag_ID); ?>
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr class="form-field form-required">
</span><del>- <th scope="row" valign="top"><label for="name"><?php echo _x('Name', 'Taxonomy Name'); ?></label></th>
</del><ins>+ <th scope="row" valign="top"><label for="name"><?php _ex('Name', 'Taxonomy Name'); ?></label></th>
</ins><span class="cx"> <td><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) echo esc_attr($tag->name); ?>" size="40" aria-required="true" />
</span><span class="cx"> <p class="description"><?php _e('The name is how it appears on your site.'); ?></p></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <?php if ( !global_terms_enabled() ) { ?>
</span><span class="cx"> <tr class="form-field">
</span><del>- <th scope="row" valign="top"><label for="slug"><?php echo _x('Slug', 'Taxonomy Slug'); ?></label></th>
</del><ins>+ <th scope="row" valign="top"><label for="slug"><?php _ex('Slug', 'Taxonomy Slug'); ?></label></th>
</ins><span class="cx"> <td><input name="slug" id="slug" type="text" value="<?php if ( isset( $tag->slug ) ) echo esc_attr(apply_filters('editable_slug', $tag->slug)); ?>" size="40" />
</span><span class="cx"> <p class="description"><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <?php } ?>
</span><span class="cx"> <?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?>
</span><span class="cx"> <tr class="form-field">
</span><del>- <th scope="row" valign="top"><label for="parent"><?php echo _x('Parent', 'Taxonomy Parent'); ?></label></th>
</del><ins>+ <th scope="row" valign="top"><label for="parent"><?php _ex('Parent', 'Taxonomy Parent'); ?></label></th>
</ins><span class="cx"> <td>
</span><span class="cx"> <?php wp_dropdown_categories(array('hide_empty' => 0, 'hide_if_empty' => false, 'name' => 'parent', 'orderby' => 'name', 'taxonomy' => $taxonomy, 'selected' => $tag->parent, 'exclude' => $tag->term_id, 'hierarchical' => true, 'show_option_none' => __('None'))); ?><br />
</span><span class="cx"> <?php if ( 'category' == $taxonomy ) : ?>
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> </tr>
</span><span class="cx"> <?php endif; // is_taxonomy_hierarchical() ?>
</span><span class="cx"> <tr class="form-field">
</span><del>- <th scope="row" valign="top"><label for="description"><?php echo _x('Description', 'Taxonomy Description'); ?></label></th>
</del><ins>+ <th scope="row" valign="top"><label for="description"><?php _ex('Description', 'Taxonomy Description'); ?></label></th>
</ins><span class="cx"> <td><textarea name="description" id="description" rows="5" cols="50" style="width: 97%;"><?php echo esc_html($tag->description); ?></textarea><br />
</span><span class="cx"> <span class="description"><?php _e('The description is not prominent by default, however some themes may show it.'); ?></span></td>
</span><span class="cx"> </tr>
</span></span></pre></div>
<a id="trunkwpadminedittagsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tags.php (14646 => 14647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tags.php 2010-05-14 21:22:14 UTC (rev 14646)
+++ trunk/wp-admin/edit-tags.php 2010-05-14 21:46:25 UTC (rev 14647)
</span><span class="lines">@@ -348,20 +348,20 @@
</span><span class="cx"> <?php wp_nonce_field('add-tag'); ?>
</span><span class="cx">
</span><span class="cx"> <div class="form-field form-required">
</span><del>- <label for="tag-name"><?php echo _x('Name', 'Taxonomy Name'); ?></label>
</del><ins>+ <label for="tag-name"><?php _ex('Name', 'Taxonomy Name'); ?></label>
</ins><span class="cx"> <input name="tag-name" id="tag-name" type="text" value="" size="40" aria-required="true" />
</span><span class="cx"> <p><?php _e('The name is how it appears on your site.'); ?></p>
</span><span class="cx"> </div>
</span><span class="cx"> <?php if ( ! global_terms_enabled() ) : ?>
</span><span class="cx"> <div class="form-field">
</span><del>- <label for="tag-slug"><?php echo _x('Slug', 'Taxonomy Slug'); ?></label>
</del><ins>+ <label for="tag-slug"><?php _ex('Slug', 'Taxonomy Slug'); ?></label>
</ins><span class="cx"> <input name="slug" id="tag-slug" type="text" value="" size="40" />
</span><span class="cx"> <p><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p>
</span><span class="cx"> </div>
</span><span class="cx"> <?php endif; // is_multisite() ?>
</span><span class="cx"> <?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?>
</span><span class="cx"> <div class="form-field">
</span><del>- <label for="parent"><?php echo _x('Parent', 'Taxonomy Parent'); ?></label>
</del><ins>+ <label for="parent"><?php _ex('Parent', 'Taxonomy Parent'); ?></label>
</ins><span class="cx"> <?php wp_dropdown_categories(array('hide_empty' => 0, 'hide_if_empty' => false, 'taxonomy' => $taxonomy, 'name' => 'parent', 'orderby' => 'name', 'hierarchical' => true, 'show_option_none' => __('None'))); ?>
</span><span class="cx"> <?php if ( 'category' == $taxonomy ) : // @todo: Generic text for hierarchical taxonomies ?>
</span><span class="cx"> <p><?php _e('Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.'); ?></p>
</span><span class="lines">@@ -369,7 +369,7 @@
</span><span class="cx"> </div>
</span><span class="cx"> <?php endif; // is_taxonomy_hierarchical() ?>
</span><span class="cx"> <div class="form-field">
</span><del>- <label for="tag-description"><?php echo _x('Description', 'Taxonomy Description'); ?></label>
</del><ins>+ <label for="tag-description"><?php _ex('Description', 'Taxonomy Description'); ?></label>
</ins><span class="cx"> <textarea name="description" id="tag-description" rows="5" cols="40"></textarea>
</span><span class="cx"> <p><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (14646 => 14647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2010-05-14 21:22:14 UTC (rev 14646)
+++ trunk/wp-admin/includes/media.php 2010-05-14 21:46:25 UTC (rev 14647)
</span><span class="lines">@@ -1719,7 +1719,7 @@
</span><span class="cx"> <?php _e('Sort Order:'); ?>
</span><span class="cx"> <a href="#" id="asc"><?php _e('Ascending'); ?></a> |
</span><span class="cx"> <a href="#" id="desc"><?php _e('Descending'); ?></a> |
</span><del>-<a href="#" id="clear"><?php echo _x('Clear', 'verb'); ?></a>
</del><ins>+<a href="#" id="clear"><?php _ex('Clear', 'verb'); ?></a>
</ins><span class="cx"> </div>
</span><span class="cx"> <form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="media-upload-form validate" id="gallery-form">
</span><span class="cx"> <?php wp_nonce_field('media-form'); ?>
</span></span></pre></div>
<a id="trunkwpadminincludesplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin-install.php (14646 => 14647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin-install.php 2010-05-14 21:22:14 UTC (rev 14646)
+++ trunk/wp-admin/includes/plugin-install.php 2010-05-14 21:46:25 UTC (rev 14647)
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> <select name="type" id="typeselector">
</span><span class="cx"> <option value="term"<?php selected('term', $type) ?>><?php _e('Term'); ?></option>
</span><span class="cx"> <option value="author"<?php selected('author', $type) ?>><?php _e('Author'); ?></option>
</span><del>- <option value="tag"<?php selected('tag', $type) ?>><?php echo _x('Tag', 'Plugin Installer'); ?></option>
</del><ins>+ <option value="tag"<?php selected('tag', $type) ?>><?php _ex('Tag', 'Plugin Installer'); ?></option>
</ins><span class="cx"> </select>
</span><span class="cx"> <input type="text" name="s" value="<?php echo esc_attr($term) ?>" />
</span><span class="cx"> <label class="screen-reader-text" for="plugin-search-input"><?php _e('Search Plugins'); ?></label>
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (14646 => 14647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-05-14 21:22:14 UTC (rev 14646)
+++ trunk/wp-admin/includes/template.php 2010-05-14 21:46:25 UTC (rev 14647)
</span><span class="lines">@@ -3602,7 +3602,7 @@
</span><span class="cx"> <div id="screen-options-wrap" class="hidden">
</span><span class="cx"> <form id="adv-settings" action="" method="post">
</span><span class="cx"> <?php if ( isset($wp_meta_boxes[$screen->id]) ) : ?>
</span><del>- <h5><?php echo _x('Show on screen', 'Metaboxes') ?></h5>
</del><ins>+ <h5><?php _ex('Show on screen', 'Metaboxes') ?></h5>
</ins><span class="cx"> <div class="metabox-prefs">
</span><span class="cx"> <?php meta_box_prefs($screen); ?>
</span><span class="cx"> <br class="clear" />
</span></span></pre></div>
<a id="trunkwpadminincludesthemeinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme-install.php (14646 => 14647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme-install.php 2010-05-14 21:22:14 UTC (rev 14646)
+++ trunk/wp-admin/includes/theme-install.php 2010-05-14 21:46:25 UTC (rev 14647)
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> <select name="type" id="typeselector">
</span><span class="cx"> <option value="term" <?php selected('term', $type) ?>><?php _e('Term'); ?></option>
</span><span class="cx"> <option value="author" <?php selected('author', $type) ?>><?php _e('Author'); ?></option>
</span><del>- <option value="tag" <?php selected('tag', $type) ?>><?php echo _x('Tag', 'Theme Installer'); ?></option>
</del><ins>+ <option value="tag" <?php selected('tag', $type) ?>><?php _ex('Tag', 'Theme Installer'); ?></option>
</ins><span class="cx"> </select>
</span><span class="cx"> <input type="text" name="s" size="30" value="<?php echo esc_attr($term) ?>" />
</span><span class="cx"> <input type="submit" name="search" value="<?php esc_attr_e('Search'); ?>" class="button" />
</span></span></pre></div>
<a id="trunkwpadminmssitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-sites.php (14646 => 14647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-sites.php 2010-05-14 21:22:14 UTC (rev 14646)
+++ trunk/wp-admin/ms-sites.php 2010-05-14 21:46:25 UTC (rev 14647)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> <?php } ?>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr class="form-field">
</span><del>- <th scope="row"><?php echo _x( 'Registered', 'site' ) ?></th>
</del><ins>+ <th scope="row"><?php _ex( 'Registered', 'site' ) ?></th>
</ins><span class="cx"> <td><input name="blog[registered]" type="text" id="blog_registered" value="<?php echo esc_attr( $details->registered ) ?>" size="40" /></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr class="form-field">
</span><span class="lines">@@ -414,8 +414,8 @@
</span><span class="cx"> <select name="action">
</span><span class="cx"> <option value="-1" selected="selected"><?php _e( 'Bulk Actions' ); ?></option>
</span><span class="cx"> <option value="delete"><?php _e( 'Delete' ); ?></option>
</span><del>- <option value="spam"><?php echo _x( 'Mark as Spam', 'site' ); ?></option>
- <option value="notspam"><?php echo _x( 'Not Spam', 'site' ); ?></option>
</del><ins>+ <option value="spam"><?php _ex( 'Mark as Spam', 'site' ); ?></option>
+ <option value="notspam"><?php _ex( 'Not Spam', 'site' ); ?></option>
</ins><span class="cx"> </select>
</span><span class="cx"> <input type="submit" value="<?php esc_attr_e( 'Apply' ); ?>" name="doaction" id="doaction" class="button-secondary action" />
</span><span class="cx"> <?php wp_nonce_field( 'bulk-ms-sites' ); ?>
</span><span class="lines">@@ -665,8 +665,8 @@
</span><span class="cx"> <select name="action2">
</span><span class="cx"> <option value="-1" selected="selected"><?php _e( 'Bulk Actions' ); ?></option>
</span><span class="cx"> <option value="delete"><?php _e( 'Delete' ); ?></option>
</span><del>- <option value="spam"><?php echo _x( 'Mark as Spam', 'site' ); ?></option>
- <option value="notspam"><?php echo _x( 'Not Spam', 'site' ); ?></option>
</del><ins>+ <option value="spam"><?php _ex( 'Mark as Spam', 'site' ); ?></option>
+ <option value="notspam"><?php _ex( 'Not Spam', 'site' ); ?></option>
</ins><span class="cx"> </select>
</span><span class="cx"> <input type="submit" value="<?php esc_attr_e( 'Apply' ); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpadminmsusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-users.php (14646 => 14647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-users.php 2010-05-14 21:22:14 UTC (rev 14646)
+++ trunk/wp-admin/ms-users.php 2010-05-14 21:46:25 UTC (rev 14647)
</span><span class="lines">@@ -130,8 +130,8 @@
</span><span class="cx"> <select name="action">
</span><span class="cx"> <option value="-1" selected="selected"><?php _e( 'Bulk Actions' ); ?></option>
</span><span class="cx"> <option value="delete"><?php _e( 'Delete' ); ?></option>
</span><del>- <option value="spam"><?php echo _x( 'Mark as Spam', 'user' ); ?></option>
- <option value="notspam"><?php echo _x( 'Not Spam', 'user' ); ?></option>
</del><ins>+ <option value="spam"><?php _ex( 'Mark as Spam', 'user' ); ?></option>
+ <option value="notspam"><?php _ex( 'Not Spam', 'user' ); ?></option>
</ins><span class="cx"> </select>
</span><span class="cx"> <input type="submit" value="<?php esc_attr_e( 'Apply' ); ?>" name="doaction" id="doaction" class="button-secondary action" />
</span><span class="cx"> <?php wp_nonce_field( 'bulk-ms-users' ); ?>
</span><span class="lines">@@ -324,8 +324,8 @@
</span><span class="cx"> <select name="action2">
</span><span class="cx"> <option value="-1" selected="selected"><?php _e( 'Bulk Actions' ); ?></option>
</span><span class="cx"> <option value="delete"><?php _e( 'Delete' ); ?></option>
</span><del>- <option value="spam"><?php echo _x( 'Mark as Spam', 'user' ); ?></option>
- <option value="notspam"><?php echo _x( 'Not Spam', 'user' ); ?></option>
</del><ins>+ <option value="spam"><?php _ex( 'Mark as Spam', 'user' ); ?></option>
+ <option value="notspam"><?php _ex( 'Not Spam', 'user' ); ?></option>
</ins><span class="cx"> </select>
</span><span class="cx"> <input type="submit" value="<?php esc_attr_e( 'Apply' ); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpadminthemeeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/theme-editor.php (14646 => 14647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/theme-editor.php 2010-05-14 21:22:14 UTC (rev 14646)
+++ trunk/wp-admin/theme-editor.php 2010-05-14 21:46:25 UTC (rev 14647)
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx"> <li><a href="theme-editor.php?file=<?php echo "$template_file"; ?>&amp;theme=<?php echo urlencode($theme) ?>&amp;dir=theme"><?php echo $filedesc ?></a></li>
</span><span class="cx"> <?php endwhile; ?>
</span><span class="cx"> </ul>
</span><del>- <h3><?php /* translators: Theme stylesheets in theme editor */ echo _x('Styles', 'Theme stylesheets in theme editor'); ?></h3>
</del><ins>+ <h3><?php /* translators: Theme stylesheets in theme editor */ _ex('Styles', 'Theme stylesheets in theme editor'); ?></h3>
</ins><span class="cx"> <ul>
</span><span class="cx"> <?php
</span><span class="cx"> $template_mapping = array();
</span></span></pre></div>
<a id="trunkwpadminuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upload.php (14646 => 14647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upload.php 2010-05-14 21:22:14 UTC (rev 14646)
+++ trunk/wp-admin/upload.php 2010-05-14 21:46:25 UTC (rev 14647)
</span><span class="lines">@@ -363,9 +363,9 @@
</span><span class="cx"> <tr>
</span><span class="cx"> <th scope="col" class="check-column"><input type="checkbox" /></th>
</span><span class="cx"> <th scope="col"></th>
</span><del>- <th scope="col"><?php /* translators: column name in media */ echo _x('Media', 'media column name'); ?></th>
- <th scope="col"><?php /* translators: column name in media */ echo _x('Author', 'media column name'); ?></th>
- <th scope="col"><?php /* translators: column name in media */ echo _x('Date Added', 'media column name'); ?></th>
</del><ins>+ <th scope="col"><?php /* translators: column name in media */ _ex('Media', 'media column name'); ?></th>
+ <th scope="col"><?php /* translators: column name in media */ _ex('Author', 'media column name'); ?></th>
+ <th scope="col"><?php /* translators: column name in media */ _ex('Date Added', 'media column name'); ?></th>
</ins><span class="cx"> </tr>
</span><span class="cx"> </thead>
</span><span class="cx">
</span><span class="lines">@@ -373,9 +373,9 @@
</span><span class="cx"> <tr>
</span><span class="cx"> <th scope="col" class="check-column"><input type="checkbox" /></th>
</span><span class="cx"> <th scope="col"></th>
</span><del>- <th scope="col"><?php /* translators: column name in media */ echo _x('Media', 'media column name'); ?></th>
- <th scope="col"><?php /* translators: column name in media */ echo _x('Author', 'media column name'); ?></th>
- <th scope="col"><?php /* translators: column name in media */ echo _x('Date Added', 'media column name'); ?></th>
</del><ins>+ <th scope="col"><?php /* translators: column name in media */ _ex('Media', 'media column name'); ?></th>
+ <th scope="col"><?php /* translators: column name in media */ _ex('Author', 'media column name'); ?></th>
+ <th scope="col"><?php /* translators: column name in media */ _ex('Date Added', 'media column name'); ?></th>
</ins><span class="cx"> </tr>
</span><span class="cx"> </tfoot>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesl10nphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/l10n.php (14646 => 14647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/l10n.php 2010-05-14 21:22:14 UTC (rev 14646)
+++ trunk/wp-includes/l10n.php 2010-05-14 21:46:25 UTC (rev 14647)
</span><span class="lines">@@ -190,6 +190,21 @@
</span><span class="cx"> return translate_with_gettext_context( $single, $context, $domain );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Displays translated string with gettext context
+ *
+ * @see _x
+ * @since 3.0.0
+ *
+ * @param string $text Text to translate
+ * @param string $context Context information for the translators
+ * @param string $domain Optional. Domain to retrieve the translated text
+ * @return string Translated context string without pipe
+ */
+function _ex( $single, $context, $domain = 'default' ) {
+ echo _x( $single, $context, $domain );
+}
+
</ins><span class="cx"> function esc_attr_x( $single, $context, $domain = 'default' ) {
</span><span class="cx"> return esc_attr( translate_with_gettext_context( $single, $context, $domain ) );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>