Changeset 12231

Timestamp:

11/19/2009 10:49:16 PM (15 years ago)

Author:

ryan

Message:

Add context to strings. Props nbachiyski. fixes #10738

Location:

trunk

Files:

• wp-admin/edit-pages.php (modified) (1 diff)
• wp-admin/edit.php (modified) (1 diff)
• wp-admin/includes/media.php (modified) (1 diff)
• wp-admin/menu.php (modified) (2 diffs)
• wp-admin/plugins.php (modified) (1 diff)
• wp-admin/themes.php (modified) (1 diff)
• wp-admin/upload.php (modified) (1 diff)
• wp-admin/users.php (modified) (1 diff)
• wp-includes/l10n.php (modified) (1 diff)

trunk/wp-admin/edit-pages.php

@@ -142 +142 @@
 <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() ) ); ?>

trunk/wp-admin/edit.php

@@ -135 +135 @@
 <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() ) ); ?>

trunk/wp-admin/includes/media.php

@@ -1658 +1658 @@
 <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">

trunk/wp-admin/menu.php

@@ -71 +71 @@
     $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' );
@@ -92 +92 @@
     $_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 {

trunk/wp-admin/plugins.php

@@ -271 +271 @@
 <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

trunk/wp-admin/themes.php

@@ -128 +128 @@
 <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>

trunk/wp-admin/upload.php

@@ -171 +171 @@
 <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() ) ); ?>

trunk/wp-admin/users.php

@@ -240 +240 @@
 <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'] ) ); ?>

trunk/wp-includes/l10n.php

@@ -206 +206 @@
 function esc_attr_x( $single, $context, $domain = 'default' ) {
     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 ) );
 }