Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Text Changes: Unify various "Back to..." vs. "Return to..." vs. "Go to..." strings. 

Standardize on "Go to..." as a more appropriate option for most cases.

Props garrett-eclipse, kharisblank, audrasjb, ramiy, valentinbora.
Fixes #47235.
Built from https://develop.svn.wordpress.org/trunk@49539


git-svn-id: http://core.svn.wordpress.org/trunk@49277 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-11-09 10:53:10 +00:00
parent 4a18c93f42
commit a2d42351c5
29 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/about.php
View File

@ -270,7 +270,7 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
<div class="return-to-dashboard">
<?php if ( current_user_can( 'update_core' ) && isset( $_GET['updated'] ) ) : ?>
<a href="<?php echo esc_url( self_admin_url( 'update-core.php' ) ); ?>">
<?php is_multisite() ? _e( 'Return to Updates' ) : _e( 'Return to Dashboard &rarr; Updates' ); ?>
<?php is_multisite() ? _e( 'Go to Updates' ) : _e( 'Go to Dashboard &rarr; Updates' ); ?>
</a> |
<?php endif; ?>
<a href="<?php echo esc_url( self_admin_url() ); ?>"><?php is_blog_admin() ? _e( 'Go to Dashboard &rarr; Home' ) : _e( 'Go to Dashboard' ); ?></a>

2
wp-admin/css/about-rtl.css
View File

@ -1042,7 +1042,7 @@
width: 100%;
}
/* Return to Dashboard Home link */
/* Go to Dashboard Home link */
.about-wrap .return-to-dashboard {
margin: 30px -5px 0 0;

2
wp-admin/css/about.css
View File

@ -1041,7 +1041,7 @@
width: 100%;
}
/* Return to Dashboard Home link */
/* Go to Dashboard Home link */
.about-wrap .return-to-dashboard {
margin: 30px 0 0 -5px;

4
wp-admin/includes/class-bulk-plugin-upgrader-skin.php
View File

@ -48,12 +48,12 @@ class Bulk_Plugin_Upgrader_Skin extends Bulk_Upgrader_Skin {
'plugins_page' => sprintf(
'<a href="%s" target="_parent">%s</a>',
self_admin_url( 'plugins.php' ),
__( 'Return to Plugins page' )
__( 'Go to Plugins page' )
),
'updates_page' => sprintf(
'<a href="%s" target="_parent">%s</a>',
self_admin_url( 'update-core.php' ),
__( 'Return to WordPress Updates page' )
__( 'Go to WordPress Updates page' )
),
);

4
wp-admin/includes/class-bulk-theme-upgrader-skin.php
View File

@ -48,12 +48,12 @@ class Bulk_Theme_Upgrader_Skin extends Bulk_Upgrader_Skin {
'themes_page' => sprintf(
'<a href="%s" target="_parent">%s</a>',
self_admin_url( 'themes.php' ),
__( 'Return to Themes page' )
__( 'Go to Themes page' )
),
'updates_page' => sprintf(
'<a href="%s" target="_parent">%s</a>',
self_admin_url( 'update-core.php' ),
__( 'Return to WordPress Updates page' )
__( 'Go to WordPress Updates page' )
),
);

2
wp-admin/includes/class-language-pack-upgrader-skin.php
View File

@ -75,7 +75,7 @@ class Language_Pack_Upgrader_Skin extends WP_Upgrader_Skin {
'updates_page' => sprintf(
'<a href="%s" target="_parent">%s</a>',
self_admin_url( 'update-core.php' ),
__( 'Return to WordPress Updates page' )
__( 'Go to WordPress Updates page' )
),
);

10
wp-admin/includes/class-plugin-installer-skin.php
View File

@ -107,7 +107,7 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin {
$install_actions['activate_plugin'] = sprintf(
'<a class="button button-primary" href="%s" target="_parent">%s</a>',
wp_nonce_url( 'plugins.php?action=activate&amp;from=press-this&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ),
__( 'Activate Plugin &amp; Return to Press This' )
__( 'Activate Plugin &amp; Go to Press This' )
);
} else {
$install_actions['activate_plugin'] = sprintf(
@ -130,25 +130,25 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin {
$install_actions['importers_page'] = sprintf(
'<a href="%s" target="_parent">%s</a>',
admin_url( 'import.php' ),
__( 'Return to Importers' )
__( 'Go to Importers' )
);
} elseif ( 'web' === $this->type ) {
$install_actions['plugins_page'] = sprintf(
'<a href="%s" target="_parent">%s</a>',
self_admin_url( 'plugin-install.php' ),
__( 'Return to Plugin Installer' )
__( 'Go to Plugin Installer' )
);
} elseif ( 'upload' === $this->type && 'plugins' === $from ) {
$install_actions['plugins_page'] = sprintf(
'<a href="%s">%s</a>',
self_admin_url( 'plugin-install.php' ),
__( 'Return to Plugin Installer' )
__( 'Go to Plugin Installer' )
);
} else {
$install_actions['plugins_page'] = sprintf(
'<a href="%s" target="_parent">%s</a>',
self_admin_url( 'plugins.php' ),
__( 'Return to Plugins page' )
__( 'Go to Plugins page' )
);
}

2
wp-admin/includes/class-plugin-upgrader-skin.php
View File

@ -98,7 +98,7 @@ class Plugin_Upgrader_Skin extends WP_Upgrader_Skin {
'plugins_page' => sprintf(
'<a href="%s" target="_parent">%s</a>',
self_admin_url( 'plugins.php' ),
__( 'Return to Plugins page' )
__( 'Go to Plugins page' )
),
);

4
wp-admin/includes/class-theme-installer-skin.php
View File

@ -155,13 +155,13 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin {
$install_actions['themes_page'] = sprintf(
'<a href="%s" target="_parent">%s</a>',
self_admin_url( 'theme-install.php' ),
__( 'Return to Theme Installer' )
__( 'Go to Theme Installer' )
);
} elseif ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) ) {
$install_actions['themes_page'] = sprintf(
'<a href="%s" target="_parent">%s</a>',
self_admin_url( 'themes.php' ),
__( 'Return to Themes page' )
__( 'Go to Themes page' )
);
}

2
wp-admin/includes/class-theme-upgrader-skin.php
View File

@ -124,7 +124,7 @@ class Theme_Upgrader_Skin extends WP_Upgrader_Skin {
$update_actions['themes_page'] = sprintf(
'<a href="%s" target="_parent">%s</a>',
self_admin_url( 'themes.php' ),
__( 'Return to Themes page' )
__( 'Go to Themes page' )
);
/**

2
wp-admin/includes/class-wp-privacy-policy-content.php
View File

@ -424,7 +424,7 @@ final class WP_Privacy_Policy_Content {
$content .= '</div>';
}
$content .= '<a href="#wpbody" class="return-to-top"><span aria-hidden="true">&uarr; </span> ' . __( 'Return to top' ) . '</a>';
$content .= '<a href="#wpbody" class="return-to-top"><span aria-hidden="true">&uarr; </span> ' . __( 'Go to top' ) . '</a>';
$content .= '</div>'; // End of .privacy-text-section.
}

2
wp-admin/includes/network.php
View File

@ -145,7 +145,7 @@ function network_step1( $errors = false ) {
__( 'You cannot use port numbers such as %s.' ),
'<code>' . $has_ports . '</code>'
) . '</p>';
echo '<a href="' . esc_url( admin_url() ) . '">' . __( 'Return to Dashboard' ) . '</a>';
echo '<a href="' . esc_url( admin_url() ) . '">' . __( 'Go to Dashboard' ) . '</a>';
echo '</div>';
require_once ABSPATH . 'wp-admin/admin-footer.php';
die();

2
wp-admin/includes/privacy-tools.php
View File

@ -279,7 +279,7 @@ function wp_privacy_generate_personal_data_export_group_html( $group_data, $grou
if ( $groups_count > 1 ) {
$group_html .= '<div class="return-to-top">';
$group_html .= '<a href="#top"><span aria-hidden="true">&uarr; </span> ' . esc_html__( 'Return to top' ) . '</a>';
$group_html .= '<a href="#top"><span aria-hidden="true">&uarr; </span> ' . esc_html__( 'Go to top' ) . '</a>';
$group_html .= '</div>';
}

2
wp-admin/revision.php
View File

@ -107,7 +107,7 @@ switch ( $action ) {
$post_title = '<a href="' . $post_edit_link . '">' . _draft_or_post_title() . '</a>';
/* translators: %s: Post title. */
$h1 = sprintf( __( 'Compare Revisions of &#8220;%s&#8221;' ), $post_title );
$return_to_post = '<a href="' . $post_edit_link . '">' . __( '&larr; Return to editor' ) . '</a>';
$return_to_post = '<a href="' . $post_edit_link . '">' . __( '&larr; Go to editor' ) . '</a>';
$title = __( 'Revisions' );
$redirect = false;

2
wp-admin/user-edit.php
View File

@ -202,7 +202,7 @@ switch ( $action ) {
<p><strong><?php _e( 'User updated.' ); ?></strong></p>
<?php endif; ?>
<?php if ( $wp_http_referer && false === strpos( $wp_http_referer, 'user-new.php' ) && ! IS_PROFILE_PAGE ) : ?>
<p><a href="<?php echo esc_url( wp_validate_redirect( esc_url_raw( $wp_http_referer ), self_admin_url( 'users.php' ) ) ); ?>"><?php _e( '&larr; Back to Users' ); ?></a></p>
<p><a href="<?php echo esc_url( wp_validate_redirect( esc_url_raw( $wp_http_referer ), self_admin_url( 'users.php' ) ) ); ?>"><?php _e( '&larr; Go to Users' ); ?></a></p>
<?php endif; ?>
</div>
<?php endif; ?>

2
wp-content/themes/twentyeleven/image.php
View File

@ -32,7 +32,7 @@ get_header(); ?>
$metadata = wp_get_attachment_metadata();
printf(
/* translators: 1: Time, 2: Date, 3: Image permalink, 4: Image width, 5: Image height, 6: Parent permalink, 7: Parent post title, 8: Parent post title. */
__( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span> at <a href="%3$s" title="Link to full-size image">%4$s &times; %5$s</a> in <a href="%6$s" title="Return to %7$s" rel="gallery">%8$s</a>', 'twentyeleven' ),
__( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span> at <a href="%3$s" title="Link to full-size image">%4$s &times; %5$s</a> in <a href="%6$s" title="Go to %7$s" rel="gallery">%8$s</a>', 'twentyeleven' ),
esc_attr( get_the_time() ),
get_the_date(),
esc_url( wp_get_attachment_url() ),

2
wp-content/themes/twentyeleven/languages/twentyeleven.pot
View File

@ -441,7 +441,7 @@ msgid "Next &rarr;"
msgstr ""
#: image.php:34
msgid "<span class=\"meta-prep meta-prep-entry-date\">Published </span> <span class=\"entry-date\"><abbr class=\"published\" title=\"%1$s\">%2$s</abbr></span> at <a href=\"%3$s\" title=\"Link to full-size image\">%4$s &times; %5$s</a> in <a href=\"%6$s\" title=\"Return to %7$s\" rel=\"gallery\">%8$s</a>"
msgid "<span class=\"meta-prep meta-prep-entry-date\">Published </span> <span class=\"entry-date\"><abbr class=\"published\" title=\"%1$s\">%2$s</abbr></span> at <a href=\"%3$s\" title=\"Link to full-size image\">%4$s &times; %5$s</a> in <a href=\"%6$s\" title=\"Go to %7$s\" rel=\"gallery\">%8$s</a>"
msgstr ""
#: inc/theme-options.php:56 inc/theme-options.php:564

2
wp-content/themes/twentyten/languages/twentyten.pot
View File

@ -263,7 +263,7 @@ msgid "Skip to content"
msgstr ""
#: loop-attachment.php:25
msgid "Return to %s"
msgid "Go to %s"
msgstr ""
#. translators: %s - title of parent post

2
wp-content/themes/twentyten/loop-attachment.php
View File

@ -24,7 +24,7 @@ if ( have_posts() ) {
<?php
if ( ! empty( $post->post_parent ) ) :
/* translators: %s: Post title. */
$post_tile = sprintf( __( 'Return to %s', 'twentyten' ), strip_tags( get_the_title( $post->post_parent ) ) );
$post_tile = sprintf( __( 'Go to %s', 'twentyten' ), strip_tags( get_the_title( $post->post_parent ) ) );
?>
<p class="page-title"><a href="<?php echo esc_url( get_permalink( $post->post_parent ) ); ?>" title="<?php echo esc_attr( $post_title ); ?>" rel="gallery">
<?php

2
wp-content/themes/twentythirteen/image.php
View File

@ -27,7 +27,7 @@ get_header(); ?>
<div class="entry-meta">
<?php
/* translators: 1: Date, 2: Date, 3, Parent permalink, 4, Post title, 5: Post title. */
$published_text = __( '<span class="attachment-meta">Published on <time class="entry-date" datetime="%1$s">%2$s</time> in <a href="%3$s" title="Return to %4$s" rel="gallery">%5$s</a></span>', 'twentythirteen' );
$published_text = __( '<span class="attachment-meta">Published on <time class="entry-date" datetime="%1$s">%2$s</time> in <a href="%3$s" title="Go to %4$s" rel="gallery">%5$s</a></span>', 'twentythirteen' );
$post_title = get_the_title( $post->post_parent );
if ( empty( $post_title ) || 0 == $post->post_parent ) {
$published_text = '<span class="attachment-meta"><time class="entry-date" datetime="%1$s">%2$s</time></span>';

2
wp-content/themes/twentytwelve/image.php
View File

@ -28,7 +28,7 @@ get_header(); ?>
$metadata = wp_get_attachment_metadata();
printf(
/* translators: 1: Date, 2: Date, 3: Attachment URL, 4: Image width in pixels, 5: Image height in pixels, 6: Post parent permalink, 7: Post parent title, 8: Post parent title. */
__( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><time class="entry-date" datetime="%1$s">%2$s</time></span> at <a href="%3$s" title="Link to full-size image">%4$s &times; %5$s</a> in <a href="%6$s" title="Return to %7$s" rel="gallery">%8$s</a>.', 'twentytwelve' ),
__( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><time class="entry-date" datetime="%1$s">%2$s</time></span> at <a href="%3$s" title="Link to full-size image">%4$s &times; %5$s</a> in <a href="%6$s" title="Go to %7$s" rel="gallery">%8$s</a>.', 'twentytwelve' ),
esc_attr( get_the_date( 'c' ) ),
esc_html( get_the_date() ),
esc_url( wp_get_attachment_url() ),

8
wp-includes/class-wp-block.php
View File

@ -213,12 +213,12 @@ class WP_Block {
}
if ( $is_dynamic ) {
$global_post = $post;
$parent = WP_Block_Supports::$block_to_render;
$global_post = $post;
$parent = WP_Block_Supports::$block_to_render;
WP_Block_Supports::$block_to_render = $this->parsed_block;
$block_content = (string) call_user_func( $this->block_type->render_callback, $this->attributes, $block_content, $this );
$block_content = (string) call_user_func( $this->block_type->render_callback, $this->attributes, $block_content, $this );
WP_Block_Supports::$block_to_render = $parent;
$post = $global_post;
$post = $global_post;
}
if ( ! empty( $this->block_type->script ) ) {

2
wp-includes/customize/class-wp-customize-themes-section.php
View File

@ -121,7 +121,7 @@ class WP_Customize_Themes_Section extends WP_Customize_Section {
*/
protected function filter_bar_content_template() {
?>
<button type="button" class="button button-primary customize-section-back customize-themes-mobile-back"><?php _e( 'Back to theme sources' ); ?></button>
<button type="button" class="button button-primary customize-section-back customize-themes-mobile-back"><?php _e( 'Go to theme sources' ); ?></button>
<# if ( 'wporg' === data.action ) { #>
<div class="search-form">
<label for="wp-filter-search-input-{{ data.id }}" class="screen-reader-text"><?php _e( 'Search themes&hellip;' ); ?></label>

2
wp-includes/js/media-views.js
View File

@ -8114,7 +8114,7 @@ AttachmentsBrowser = View.extend(/** @lends wp.media.view.AttachmentsBrowser.pro
}, 200 ),
editSelection: function( modal ) {
// When editing a selection, move focus to the "Return to library" button.
// When editing a selection, move focus to the "Go to library" button.
modal.$( '.media-button-backToLibrary' ).focus();
},

2
wp-includes/media.php
View File

@ -4290,7 +4290,7 @@ function wp_enqueue_media( $args = array() ) {
'createNewGallery' => __( 'Create a new gallery' ),
'createNewPlaylist' => __( 'Create a new playlist' ),
'createNewVideoPlaylist' => __( 'Create a new video playlist' ),
'returnToLibrary' => __( '&#8592; Return to library' ),
'returnToLibrary' => __( '&#8592; Go to library' ),
'allMediaItems' => __( 'All media items' ),
'allDates' => __( 'All dates' ),
'noItemsFound' => __( 'No items found.' ),

2
wp-includes/ms-functions.php
View File

@ -2275,7 +2275,7 @@ function maybe_add_existing_user_to_blog() {
wp_die(
sprintf(
/* translators: %s: Home URL. */
__( 'An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.' ),
__( 'An error occurred adding you to this site. Go to the <a href="%s">homepage</a>.' ),
home_url()
)
);

4
wp-includes/taxonomy.php
View File

@ -139,7 +139,7 @@ function create_initial_taxonomies() {
'separate_items_with_commas' => null,
'add_or_remove_items' => null,
'choose_from_most_used' => null,
'back_to_items' => __( '&larr; Back to Link Categories' ),
'back_to_items' => __( '&larr; Go to Link Categories' ),
),
'capabilities' => array(
'manage_terms' => 'manage_links',
@ -604,7 +604,7 @@ function get_taxonomy_labels( $tax ) {
'items_list' => array( __( 'Tags list' ), __( 'Categories list' ) ),
/* translators: Tab heading when selecting from the most used terms. */
'most_used' => array( _x( 'Most Used', 'tags' ), _x( 'Most Used', 'categories' ) ),
'back_to_items' => array( __( '&larr; Back to Tags' ), __( '&larr; Back to Categories' ) ),
'back_to_items' => array( __( '&larr; Go to Tags' ), __( '&larr; Go to Categories' ) ),
);
$nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.6-beta3-49538';
$wp_version = '5.6-beta3-49539';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

2
wp-login.php
View File

@ -285,7 +285,7 @@ function login_footer( $input_id = '' ) {
<?php
/* translators: %s: Site title. */
printf( _x( '&larr; Back to %s', 'site' ), get_bloginfo( 'title', 'display' ) );
printf( _x( '&larr; Go to %s', 'site' ), get_bloginfo( 'title', 'display' ) );
?>
</a></p>