' . esc_html(
- add_query_arg(
- array(
-- 'site_url' => site_url(),
-- 'user_login' => $user->user_login,
-- 'password' => '[------]',
-- ),
-- $success_url
-- )
-- ) . ''
-- );
+ __('You will be sent to %s'),
+ '' . esc_html(
+ add_query_arg(
+ array(
-+ 'site_url' => site_url(),
-+ 'user_login' => $user->user_login,
-+ 'password' => '[------]',
-+ ),
+ 'site_url' => site_url(),
+ 'user_login' => $user->user_login,
+ 'password' => '[------]',
+ ),
+- $success_url
+- )
+- ) . ''
+- );
+ $success_url
+ )
+ ) . ''
@@ -2273,16 +2232,15 @@
- 'reject',
- false,
- array(
-- 'aria-describedby' => 'description-reject',
-- )
+ __('No, I do not approve of this connection'),
+ 'secondary',
+ 'reject',
+ false,
+ array(
-+ 'aria-describedby' => 'description-reject',
-+ )
- );
+ 'aria-describedby' => 'description-reject',
+ )
+- );
++ );
?>
diff --git a/wp-admin/comment.php b/wp-admin/comment.php -index 349a32a43e..ae281ea5e1 100644 +index 349a32a43e..5d186bc926 100644 --- a/wp-admin/comment.php +++ b/wp-admin/comment.php @@ -16,9 +16,9 @@ $submenu_file = 'edit-comments.php'; @@ -2367,27 +2325,24 @@ 'content' => - '
' . __( 'You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error.' ) . '
' . - '' . __( 'You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment.' ) . '
', -- ) ++ '' . __('You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error.') . '
' . ++ '' . __('You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment.') . '
', + ) - ); -- ++); + - get_current_screen()->set_help_sidebar( - '' . __( 'For more information:' ) . '
' . - '' . __( 'Documentation on Comments' ) . '
' . - '' . __( 'Support forums' ) . '
' - ); -- -- wp_enqueue_script( 'comment' ); -+ '' . __('You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error.') . '
' . -+ '' . __('You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment.') . '
', -+ ) -+); -+ +get_current_screen()->set_help_sidebar( + '' . __('For more information:') . '
' . -+ '' . __('Documentation on Comments') . '
' . -+ '' . __('Support forums') . '
' ++ '' . __('Documentation on Comments') . '
' . ++ '' . __('Support forums') . '
' +); -+ + +- wp_enqueue_script( 'comment' ); + wp_enqueue_script('comment'); require_once ABSPATH . 'wp-admin/admin-header.php'; @@ -2495,15 +2450,13 @@ wp_admin_notice( - $message, - array( -- 'type' => 'info', -- 'id' => 'message', -- ) + $message, + array( -+ 'type' => 'info', -+ 'id' => 'message', -+ ) - ); + 'type' => 'info', + 'id' => 'message', + ) +- ); ++ ); } } - wp_admin_notice( @@ -2514,9 +2467,8 @@ + array( 'type' => 'warning', 'id' => 'message', -- ) + ) - ); -+ ) +); ?> @@ -2574,9 +2526,10 @@ +printf( /* translators: %s: Comment link. */ - ' | ' . __( 'In reply to %s.' ), -+ ' | ' . __('In reply to %s.'), - '' . $name . '' +- '' . $name . '' - ); ++ ' | ' . __('In reply to %s.'), ++ '' . $name . '' +); } ?> @@ -2600,9 +2553,9 @@ - echo '' . $submitted . ''; + __('%1$s at %2$s'), + /* translators: Comment date format. See https://www.php.net/manual/datetime.format.php */ -+ get_comment_date(__('Y/m/d'), $comment), ++ get_comment_date(__('Y/m/d'), $comment), + /* translators: Comment time format. See https://www.php.net/manual/datetime.format.php */ -+ get_comment_date(__('g:i a'), $comment) ++ get_comment_date(__('g:i a'), $comment) +); + if ( 'approved' === wp_get_comment_status($comment) && ! empty($comment->comment_post_ID) ) { + echo '' . $submitted . ''; @@ -2703,16 +2656,14 @@ + wp_trash_comment($comment); $redir = add_query_arg( - array( -- 'trashed' => '1', -- 'ids' => $comment_id, -- ), -- $redir + array( -+ 'trashed' => '1', -+ 'ids' => $comment_id, -+ ), + 'trashed' => '1', + 'ids' => $comment_id, + ), +- $redir +- ); + $redir - ); ++ ); break; case 'untrashcomment': - wp_untrash_comment( $comment ); @@ -2725,16 +2676,14 @@ + wp_spam_comment($comment); $redir = add_query_arg( - array( -- 'spammed' => '1', -- 'ids' => $comment_id, -- ), -- $redir + array( -+ 'spammed' => '1', -+ 'ids' => $comment_id, -+ ), + 'spammed' => '1', + 'ids' => $comment_id, + ), +- $redir +- ); + $redir - ); ++ ); break; case 'unspamcomment': - wp_unspam_comment( $comment ); @@ -2939,7 +2888,7 @@' . __('Sorry, you are not allowed to customize this site.') . '
', ++ '' . __('Sorry, you are not allowed to customize this site.') . '
', + 403 +); } @@ -68663,7 +68613,7 @@ + if ( ! current_user_can(get_post_type_object('customize_changeset')->cap->edit_post, $changeset_post->ID) ) { +wp_die( + '' . __('Sorry, you are not allowed to edit this changeset.') . '
', ++ '' . __('Sorry, you are not allowed to edit this changeset.') . '
', + 403 +); } @@ -68695,7 +68645,7 @@ - ); +wp_die( + '' . __('Customize New Changes') . '
' . $script, ++ '' . __('Customize New Changes') . '
' . $script, + 200 +); } @@ -68710,8 +68660,8 @@ + if ( in_array(get_post_status($changeset_post->ID), array( 'publish', 'trash' ), true) ) { +wp_die( + '' . __('This changeset cannot be further modified.') . '
' . -+ '' . __('Customize New Changes') . '
', ++ '' . __('This changeset cannot be further modified.') . '
' . ++ '', + 403 +); } @@ -68953,7 +68903,7 @@