Ticket #35729: 35729.2.patch

wp-includes/comment-template.php

@@ -2139 +2139 @@
                 'comment_field'        => '<p class="comment-form-comment"><label for="comment">' . _x( 'Comment', 'noun' ) . '</label> <textarea id="comment" name="comment" cols="45" rows="8" maxlength="65525" aria-required="true" required="required"></textarea></p>',
                 /** This filter is documented in wp-includes/link-template.php */
                 'must_log_in'          => '<p class="must-log-in">' . sprintf( __( 'You must be <a href="%s">logged in</a> to post a comment.' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>',
-                /** This filter is documented in wp-includes/link-template.php */
-                'logged_in_as'         => '<p class="logged-in-as">' . sprintf( __( '<a href="%1$s" aria-label="Logged in as %2$s. Edit your profile.">Logged in as %2$s</a>. <a href="%3$s">Log out?</a>' ), get_edit_user_link(), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>',
+                'logged_in_as'         => '<p class="logged-in-as">' .
+                        sprintf(
+                                __( '%s.' ),
+                                sprintf(
+                                        '<a href="%1$s" aria-label="%2$s">%3$s</a>'
+                                        get_edit_user_link(),
+                                        sprintf(
+                                                /* translators: %s: user display name */
+                                                __( 'Logged in as %s. Edit your profile.' ),
+                                                $user_identity
+                                        ),
+                                        sprintf(
+                                                /* translators: %s: user display name */
+                                                __( 'Logged in as %s' ),
+                                                $user_identity
+                                        )
+                                )
+                        ) .
+                        /** This filter is documented in wp-includes/link-template.php */
+                        ' <a href="' . wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) . '">' . __( 'Log out?' ) . '</a></p>',
                 'comment_notes_before' => '<p class="comment-notes"><span id="email-notes">' . __( 'Your email address will not be published.' ) . '</span>'. ( $req ? $required_text : '' ) . '</p>',
                 'comment_notes_after'  => '',
                 'id_form'              => 'commentform',