Ticket #10738: add-new-context.diff

wp-includes/l10n.php

@@ -207 +207 @@
         return esc_attr( translate_with_gettext_context( $single, $context, $domain ) );
 }
 
+function esc_html_x( $single, $context, $domain = 'default' ) {
+        return esc_html( translate_with_gettext_context( $single, $context, $domain ) );
+}
+
 function __ngettext() {
         _deprecated_function( __FUNCTION__, '2.8', '_n()' );
         $args = func_get_args();

wp-admin/users.php

@@ -239 +239 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?>  <a href="user-new.php" class="button add-new-h2"><?php esc_html_e('Add New'); ?></a> <?php
+<h2><?php echo esc_html( $title ); ?>  <a href="user-new.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'user'); ?></a> <?php
 if ( isset($_GET['usersearch']) && $_GET['usersearch'] )
         printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $_GET['usersearch'] ) ); ?>
 </h2>

wp-admin/includes/media.php

@@ -1597 +1597 @@
 <?php _e('Sort Order:'); ?>
 <a href="#" id="asc"><?php _e('Ascending'); ?></a> |
 <a href="#" id="desc"><?php _e('Descending'); ?></a> |
-<a href="#" id="clear"><?php _e('Clear'); ?></a>
+<a href="#" id="clear"><?php echo _x('Clear', 'verb'); ?></a>
 </div>
 <form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="media-upload-form validate" id="gallery-form">
 <?php wp_nonce_field('media-form'); ?>

wp-admin/upload.php

@@ -195 +195 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?> <a href="media-new.php" class="button add-new-h2"><?php esc_html_e('Add New'); ?></a> <?php
+<h2><?php echo esc_html( $title ); ?> <a href="media-new.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'file'); ?></a> <?php
 if ( isset($_GET['s']) && $_GET['s'] )
         printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( get_search_query() ) ); ?>
 </h2>

wp-admin/menu.php

@@ -70 +70 @@
 $menu[60] = array( __('Appearance'), 'switch_themes', 'themes.php', '', 'menu-top', 'menu-appearance', 'div' );
         $submenu['themes.php'][5]  = array(__('Themes'), 'switch_themes', 'themes.php');
         $submenu['themes.php'][10] = array(__('Editor'), 'edit_themes', 'theme-editor.php');
-        $submenu['themes.php'][15] = array(__('Add New Themes'), 'install_themes', 'theme-install.php');
+        $submenu['themes.php'][15] = array(_x('Add New', 'theme'), 'install_themes', 'theme-install.php');
 
 $update_plugins = get_transient( 'update_plugins' );
 $update_count = 0;
@@ -91 +91 @@
 if ( current_user_can('edit_users') ) {
         $_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php.
         $submenu['users.php'][5] = array(__('Authors & Users'), 'edit_users', 'users.php');
-        $submenu['users.php'][10] = array(__('Add New'), 'create_users', 'user-new.php');
+        $submenu['users.php'][10] = array(_x('Add New', 'user'), 'create_users', 'user-new.php');
         $submenu['users.php'][15] = array(__('Your Profile'), 'read', 'profile.php');
 } else {
         $_wp_real_parent_file['users.php'] = 'profile.php';

wp-admin/plugins.php

@@ -270 +270 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?> <a href="plugin-install.php" class="button add-new-h2"><?php esc_html_e('Add New'); ?></a></h2>
+<h2><?php echo esc_html( $title ); ?> <a href="plugin-install.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'plugin'); ?></a></h2>
 
 <?php
 

wp-admin/edit.php

@@ -134 +134 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?> <a href="post-new.php" class="button add-new-h2"><?php esc_html_e('Add New'); ?></a> <?php
+<h2><?php echo esc_html( $title ); ?> <a href="post-new.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'post'); ?></a> <?php
 if ( isset($_GET['s']) && $_GET['s'] )
         printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( get_search_query() ) ); ?>
 </h2>

wp-admin/edit-pages.php

@@ -138 +138 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?> <a href="page-new.php" class="button add-new-h2"><?php esc_html_e('Add New'); ?></a> <?php
+<h2><?php echo esc_html( $title ); ?> <a href="page-new.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'page'); ?></a> <?php
 if ( isset($_GET['s']) && $_GET['s'] )
         printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( get_search_query() ) ); ?>
 </h2>

wp-admin/themes.php

@@ -127 +127 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?> <a href="theme-install.php" class="button add-new-h2"><?php esc_html_e('Add New'); ?></a></h2>
+<h2><?php echo esc_html( $title ); ?> <a href="theme-install.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a></h2>
 
 <h3><?php _e('Current Theme'); ?></h3>
 <div id="current-theme">