Ticket #13395: _e_x.diff
| File _e_x.diff, 19.1 KB (added by , 15 years ago) |
|---|
-
wp-admin/edit-form-comment.php
### Eclipse Workspace Patch 1.0 #P trunk.domain
47 47 <div id="misc-publishing-actions"> 48 48 49 49 <div class="misc-pub-section" id="comment-status-radio"> 50 <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 />51 <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 />52 <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>50 <label class="approved"><input type="radio"<?php checked( $comment->comment_approved, '1' ); ?> name="comment_status" value="1" /><?php /* translators: comment type radio button */ _e_x('Approved', 'adjective') ?></label><br /> 51 <label class="waiting"><input type="radio"<?php checked( $comment->comment_approved, '0' ); ?> name="comment_status" value="0" /><?php /* translators: comment type radio button */ _e_x('Pending', 'adjective') ?></label><br /> 52 <label class="spam"><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php /* translators: comment type radio button */ _e_x('Spam', 'adjective'); ?></label> 53 53 </div> 54 54 55 55 <div class="misc-pub-section curtime misc-pub-section-last"> -
wp-includes/l10n.php
190 190 return translate_with_gettext_context( $single, $context, $domain ); 191 191 } 192 192 193 /** 194 * Displays translated string with gettext context 195 * 196 * @see _x 197 * @since 3.0.0 198 * 199 * @param string $text Text to translate 200 * @param string $context Context information for the translators 201 * @param string $domain Optional. Domain to retrieve the translated text 202 * @return string Translated context string without pipe 203 */ 204 function _e_x( $single, $context, $domain = 'default' ) { 205 echo _x( $single, $context, $domain ); 206 } 207 193 208 function esc_attr_x( $single, $context, $domain = 'default' ) { 194 209 return esc_attr( translate_with_gettext_context( $single, $context, $domain ) ); 195 210 } -
wp-admin/edit-tag-form.php
33 33 <?php wp_original_referer_field(true, 'previous'); wp_nonce_field('update-tag_' . $tag_ID); ?> 34 34 <table class="form-table"> 35 35 <tr class="form-field form-required"> 36 <th scope="row" valign="top"><label for="name"><?php echo_x('Name', 'Taxonomy Name'); ?></label></th>36 <th scope="row" valign="top"><label for="name"><?php _e_x('Name', 'Taxonomy Name'); ?></label></th> 37 37 <td><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) echo esc_attr($tag->name); ?>" size="40" aria-required="true" /> 38 38 <p class="description"><?php _e('The name is how it appears on your site.'); ?></p></td> 39 39 </tr> 40 40 <?php if ( !global_terms_enabled() ) { ?> 41 41 <tr class="form-field"> 42 <th scope="row" valign="top"><label for="slug"><?php echo_x('Slug', 'Taxonomy Slug'); ?></label></th>42 <th scope="row" valign="top"><label for="slug"><?php _e_x('Slug', 'Taxonomy Slug'); ?></label></th> 43 43 <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" /> 44 44 <p class="description"><?php _e('The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p></td> 45 45 </tr> 46 46 <?php } ?> 47 47 <?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?> 48 48 <tr class="form-field"> 49 <th scope="row" valign="top"><label for="parent"><?php echo_x('Parent', 'Taxonomy Parent'); ?></label></th>49 <th scope="row" valign="top"><label for="parent"><?php _e_x('Parent', 'Taxonomy Parent'); ?></label></th> 50 50 <td> 51 51 <?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 /> 52 52 <?php if ( 'category' == $taxonomy ) : ?> … … 56 56 </tr> 57 57 <?php endif; // is_taxonomy_hierarchical() ?> 58 58 <tr class="form-field"> 59 <th scope="row" valign="top"><label for="description"><?php echo_x('Description', 'Taxonomy Description'); ?></label></th>59 <th scope="row" valign="top"><label for="description"><?php _e_x('Description', 'Taxonomy Description'); ?></label></th> 60 60 <td><textarea name="description" id="description" rows="5" cols="50" style="width: 97%;"><?php echo esc_html($tag->description); ?></textarea><br /> 61 61 <span class="description"><?php _e('The description is not prominent by default, however some themes may show it.'); ?></span></td> 62 62 </tr> -
wp-admin/includes/template.php
3601 3601 <div id="screen-options-wrap" class="hidden"> 3602 3602 <form id="adv-settings" action="" method="post"> 3603 3603 <?php if ( isset($wp_meta_boxes[$screen->id]) ) : ?> 3604 <h5><?php echo_x('Show on screen', 'Metaboxes') ?></h5>3604 <h5><?php _e_x('Show on screen', 'Metaboxes') ?></h5> 3605 3605 <div class="metabox-prefs"> 3606 3606 <?php meta_box_prefs($screen); ?> 3607 3607 <br class="clear" /> 3608 3608 </div> 3609 3609 <?php endif; 3610 3610 if ( ! empty($column_screens) ) : ?> 3611 <h5><?php echo_x('Show on screen', 'Columns') ?></h5>3611 <h5><?php _e_x('Show on screen', 'Columns') ?></h5> 3612 3612 <div class="metabox-prefs"> 3613 3613 <?php manage_columns_prefs($screen); ?> 3614 3614 <br class="clear" /> -
wp-admin/comment.php
159 159 </tr> 160 160 <?php } ?> 161 161 <tr> 162 <th scope="row" valign="top"><?php /* translators: field name in comment form */ echo_x('Comment', 'noun'); ?></th>162 <th scope="row" valign="top"><?php /* translators: field name in comment form */ _e_x('Comment', 'noun'); ?></th> 163 163 <td><?php echo $comment->comment_content; ?></td> 164 164 </tr> 165 165 </table> -
wp-admin/upload.php
363 363 <tr> 364 364 <th scope="col" class="check-column"><input type="checkbox" /></th> 365 365 <th scope="col"></th> 366 <th scope="col"><?php /* translators: column name in media */ echo_x('Media', 'media column name'); ?></th>367 <th scope="col"><?php /* translators: column name in media */ echo_x('Author', 'media column name'); ?></th>368 <th scope="col"><?php /* translators: column name in media */ echo_x('Date Added', 'media column name'); ?></th>366 <th scope="col"><?php /* translators: column name in media */ _e_x('Media', 'media column name'); ?></th> 367 <th scope="col"><?php /* translators: column name in media */ _e_x('Author', 'media column name'); ?></th> 368 <th scope="col"><?php /* translators: column name in media */ _e_x('Date Added', 'media column name'); ?></th> 369 369 </tr> 370 370 </thead> 371 371 … … 373 373 <tr> 374 374 <th scope="col" class="check-column"><input type="checkbox" /></th> 375 375 <th scope="col"></th> 376 <th scope="col"><?php /* translators: column name in media */ echo_x('Media', 'media column name'); ?></th>377 <th scope="col"><?php /* translators: column name in media */ echo_x('Author', 'media column name'); ?></th>378 <th scope="col"><?php /* translators: column name in media */ echo_x('Date Added', 'media column name'); ?></th>376 <th scope="col"><?php /* translators: column name in media */ _e_x('Media', 'media column name'); ?></th> 377 <th scope="col"><?php /* translators: column name in media */ _e_x('Author', 'media column name'); ?></th> 378 <th scope="col"><?php /* translators: column name in media */ _e_x('Date Added', 'media column name'); ?></th> 379 379 </tr> 380 380 </tfoot> 381 381 -
wp-admin/ms-users.php
130 130 <select name="action"> 131 131 <option value="-1" selected="selected"><?php _e( 'Bulk Actions' ); ?></option> 132 132 <option value="delete"><?php _e( 'Delete' ); ?></option> 133 <option value="spam"><?php echo_x( 'Mark as Spam', 'user' ); ?></option>134 <option value="notspam"><?php echo_x( 'Not Spam', 'user' ); ?></option>133 <option value="spam"><?php _e_x( 'Mark as Spam', 'user' ); ?></option> 134 <option value="notspam"><?php _e_x( 'Not Spam', 'user' ); ?></option> 135 135 </select> 136 136 <input type="submit" value="<?php esc_attr_e( 'Apply' ); ?>" name="doaction" id="doaction" class="button-secondary action" /> 137 137 <?php wp_nonce_field( 'bulk-ms-users' ); ?> … … 324 324 <select name="action2"> 325 325 <option value="-1" selected="selected"><?php _e( 'Bulk Actions' ); ?></option> 326 326 <option value="delete"><?php _e( 'Delete' ); ?></option> 327 <option value="spam"><?php echo_x( 'Mark as Spam', 'user' ); ?></option>328 <option value="notspam"><?php echo_x( 'Not Spam', 'user' ); ?></option>327 <option value="spam"><?php _e_x( 'Mark as Spam', 'user' ); ?></option> 328 <option value="notspam"><?php _e_x( 'Not Spam', 'user' ); ?></option> 329 329 </select> 330 330 <input type="submit" value="<?php esc_attr_e( 'Apply' ); ?>" name="doaction2" id="doaction2" class="button-secondary action" /> 331 331 </div> -
wp-admin/includes/media.php
1719 1719 <?php _e('Sort Order:'); ?> 1720 1720 <a href="#" id="asc"><?php _e('Ascending'); ?></a> | 1721 1721 <a href="#" id="desc"><?php _e('Descending'); ?></a> | 1722 <a href="#" id="clear"><?php echo_x('Clear', 'verb'); ?></a>1722 <a href="#" id="clear"><?php _e_x('Clear', 'verb'); ?></a> 1723 1723 </div> 1724 1724 <form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="media-upload-form validate" id="gallery-form"> 1725 1725 <?php wp_nonce_field('media-form'); ?> -
wp-admin/theme-editor.php
172 172 <li><a href="theme-editor.php?file=<?php echo "$template_file"; ?>&theme=<?php echo urlencode($theme) ?>&dir=theme"><?php echo $filedesc ?></a></li> 173 173 <?php endwhile; ?> 174 174 </ul> 175 <h3><?php /* translators: Theme stylesheets in theme editor */ echo_x('Styles', 'Theme stylesheets in theme editor'); ?></h3>175 <h3><?php /* translators: Theme stylesheets in theme editor */ _e_x('Styles', 'Theme stylesheets in theme editor'); ?></h3> 176 176 <ul> 177 177 <?php 178 178 $template_mapping = array(); -
wp-admin/includes/plugin-install.php
169 169 <select name="type" id="typeselector"> 170 170 <option value="term"<?php selected('term', $type) ?>><?php _e('Term'); ?></option> 171 171 <option value="author"<?php selected('author', $type) ?>><?php _e('Author'); ?></option> 172 <option value="tag"<?php selected('tag', $type) ?>><?php echo_x('Tag', 'Plugin Installer'); ?></option>172 <option value="tag"<?php selected('tag', $type) ?>><?php _e_x('Tag', 'Plugin Installer'); ?></option> 173 173 </select> 174 174 <input type="text" name="s" value="<?php echo esc_attr($term) ?>" /> 175 175 <label class="screen-reader-text" for="plugin-search-input"><?php _e('Search Plugins'); ?></label> -
wp-admin/edit-tags.php
348 348 <?php wp_nonce_field('add-tag'); ?> 349 349 350 350 <div class="form-field form-required"> 351 <label for="tag-name"><?php echo_x('Name', 'Taxonomy Name'); ?></label>351 <label for="tag-name"><?php _e_x('Name', 'Taxonomy Name'); ?></label> 352 352 <input name="tag-name" id="tag-name" type="text" value="" size="40" aria-required="true" /> 353 353 <p><?php _e('The name is how it appears on your site.'); ?></p> 354 354 </div> 355 355 <?php if ( ! global_terms_enabled() ) : ?> 356 356 <div class="form-field"> 357 <label for="tag-slug"><?php echo_x('Slug', 'Taxonomy Slug'); ?></label>357 <label for="tag-slug"><?php _e_x('Slug', 'Taxonomy Slug'); ?></label> 358 358 <input name="slug" id="tag-slug" type="text" value="" size="40" /> 359 359 <p><?php _e('The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p> 360 360 </div> 361 361 <?php endif; // is_multisite() ?> 362 362 <?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?> 363 363 <div class="form-field"> 364 <label for="parent"><?php echo_x('Parent', 'Taxonomy Parent'); ?></label>364 <label for="parent"><?php _e_x('Parent', 'Taxonomy Parent'); ?></label> 365 365 <?php wp_dropdown_categories(array('hide_empty' => 0, 'hide_if_empty' => false, 'taxonomy' => $taxonomy, 'name' => 'parent', 'orderby' => 'name', 'hierarchical' => true, 'show_option_none' => __('None'))); ?> 366 366 <?php if ( 'category' == $taxonomy ) : // @todo: Generic text for hierarchical taxonomies ?> 367 367 <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> … … 369 369 </div> 370 370 <?php endif; // is_taxonomy_hierarchical() ?> 371 371 <div class="form-field"> 372 <label for="tag-description"><?php echo_x('Description', 'Taxonomy Description'); ?></label>372 <label for="tag-description"><?php _e_x('Description', 'Taxonomy Description'); ?></label> 373 373 <textarea name="description" id="tag-description" rows="5" cols="40"></textarea> 374 374 <p><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p> 375 375 </div> -
wp-admin/edit-comments.php
316 316 <option value="approve"><?php _e('Approve'); ?></option> 317 317 <?php endif; ?> 318 318 <?php if ( 'all' == $comment_status || 'approved' == $comment_status || 'moderated' == $comment_status ): ?> 319 <option value="spam"><?php echo_x('Mark as Spam', 'comment'); ?></option>319 <option value="spam"><?php _e_x('Mark as Spam', 'comment'); ?></option> 320 320 <?php endif; ?> 321 321 <?php if ( 'trash' == $comment_status ): ?> 322 322 <option value="untrash"><?php _e('Restore'); ?></option> 323 323 <?php elseif ( 'spam' == $comment_status ): ?> 324 <option value="unspam"><?php echo_x('Not Spam', 'comment'); ?></option>324 <option value="unspam"><?php _e_x('Not Spam', 'comment'); ?></option> 325 325 <?php endif; ?> 326 326 <?php if ( 'trash' == $comment_status || 'spam' == $comment_status || !EMPTY_TRASH_DAYS ): ?> 327 327 <option value="delete"><?php _e('Delete Permanently'); ?></option> … … 416 416 <option value="approve"><?php _e('Approve'); ?></option> 417 417 <?php endif; ?> 418 418 <?php if ( 'all' == $comment_status || 'approved' == $comment_status || 'moderated' == $comment_status ): ?> 419 <option value="spam"><?php echo_x('Mark as Spam', 'comment'); ?></option>419 <option value="spam"><?php _e_x('Mark as Spam', 'comment'); ?></option> 420 420 <?php endif; ?> 421 421 <?php if ( 'trash' == $comment_status ): ?> 422 422 <option value="untrash"><?php _e('Restore'); ?></option> … … 424 424 <?php if ( 'trash' == $comment_status || 'spam' == $comment_status || !EMPTY_TRASH_DAYS ): ?> 425 425 <option value="delete"><?php _e('Delete Permanently'); ?></option> 426 426 <?php elseif ( 'spam' == $comment_status ): ?> 427 <option value="unspam"><?php echo_x('Not Spam', 'comment'); ?></option>427 <option value="unspam"><?php _e_x('Not Spam', 'comment'); ?></option> 428 428 <?php else: ?> 429 429 <option value="trash"><?php _e('Move to Trash'); ?></option> 430 430 <?php endif; ?> -
wp-admin/ms-sites.php
113 113 <?php } ?> 114 114 </tr> 115 115 <tr class="form-field"> 116 <th scope="row"><?php echo_x( 'Registered', 'site' ) ?></th>116 <th scope="row"><?php _e_x( 'Registered', 'site' ) ?></th> 117 117 <td><input name="blog[registered]" type="text" id="blog_registered" value="<?php echo esc_attr( $details->registered ) ?>" size="40" /></td> 118 118 </tr> 119 119 <tr class="form-field"> … … 414 414 <select name="action"> 415 415 <option value="-1" selected="selected"><?php _e( 'Bulk Actions' ); ?></option> 416 416 <option value="delete"><?php _e( 'Delete' ); ?></option> 417 <option value="spam"><?php echo_x( 'Mark as Spam', 'site' ); ?></option>418 <option value="notspam"><?php echo_x( 'Not Spam', 'site' ); ?></option>417 <option value="spam"><?php _e_x( 'Mark as Spam', 'site' ); ?></option> 418 <option value="notspam"><?php _e_x( 'Not Spam', 'site' ); ?></option> 419 419 </select> 420 420 <input type="submit" value="<?php esc_attr_e( 'Apply' ); ?>" name="doaction" id="doaction" class="button-secondary action" /> 421 421 <?php wp_nonce_field( 'bulk-ms-sites' ); ?> … … 665 665 <select name="action2"> 666 666 <option value="-1" selected="selected"><?php _e( 'Bulk Actions' ); ?></option> 667 667 <option value="delete"><?php _e( 'Delete' ); ?></option> 668 <option value="spam"><?php echo_x( 'Mark as Spam', 'site' ); ?></option>669 <option value="notspam"><?php echo_x( 'Not Spam', 'site' ); ?></option>668 <option value="spam"><?php _e_x( 'Mark as Spam', 'site' ); ?></option> 669 <option value="notspam"><?php _e_x( 'Not Spam', 'site' ); ?></option> 670 670 </select> 671 671 <input type="submit" value="<?php esc_attr_e( 'Apply' ); ?>" name="doaction2" id="doaction2" class="button-secondary action" /> 672 672 </div> -
wp-admin/includes/theme-install.php
156 156 <select name="type" id="typeselector"> 157 157 <option value="term" <?php selected('term', $type) ?>><?php _e('Term'); ?></option> 158 158 <option value="author" <?php selected('author', $type) ?>><?php _e('Author'); ?></option> 159 <option value="tag" <?php selected('tag', $type) ?>><?php echo_x('Tag', 'Theme Installer'); ?></option>159 <option value="tag" <?php selected('tag', $type) ?>><?php _e_x('Tag', 'Theme Installer'); ?></option> 160 160 </select> 161 161 <input type="text" name="s" size="30" value="<?php echo esc_attr($term) ?>" /> 162 162 <input type="submit" name="search" value="<?php esc_attr_e('Search'); ?>" class="button" />