From 86a10090a0a97219bf8e3465075210c95a958796 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sun, 8 Sep 2019 23:53:55 +0000
Subject: [PATCH] Accessibility: Comments: Replace `@` with `at` in the
 displayed date format.

The `@` symbol makes sense in the context of email addresses, but does not have a universal meaning in the context of dates.

Props birgire, afercia, audrasjb, SergeyBiryukov.
Fixes #47893.
Built from https://develop.svn.wordpress.org/trunk@46084


git-svn-id: http://core.svn.wordpress.org/trunk@45896 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/comment.php                            |  1 +
 wp-admin/edit-form-comment.php                  | 17 ++++++++++-------
 .../includes/class-wp-comments-list-table.php   |  1 +
 wp-includes/script-loader.php                   |  2 +-
 wp-includes/version.php                         |  2 +-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/wp-admin/comment.php b/wp-admin/comment.php
index b434dd0ea2..ee7a514be4 100644
--- a/wp-admin/comment.php
+++ b/wp-admin/comment.php
@@ -209,6 +209,7 @@ switch ( $action ) {
 			__( '%1$s at %2$s' ),
 			/* translators: Comment date format. See https://secure.php.net/date */
 			get_comment_date( __( 'Y/m/d' ), $comment ),
+			/* translators: Comment time format. See https://secure.php.net/date */
 			get_comment_date( __( 'g:i a' ), $comment )
 		);
 		if ( 'approved' === wp_get_comment_status( $comment ) && ! empty( $comment->comment_post_ID ) ) {
diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php
index 79d215a923..b0b13636f1 100644
--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -103,16 +103,19 @@ if ( 'approved' === wp_get_comment_status( $comment ) && $comment->comment_post_
 
 <div class="misc-pub-section curtime misc-pub-curtime">
 <?php
-/* translators: Publish box date format, see https://secure.php.net/date */
-$datef = __( 'M j, Y @ H:i' );
+$submitted = sprintf(
+	/* translators: 1: Comment date, 2: Comment time. */
+	__( '%1$s at %2$s' ),
+	/* translators: Publish box date format, see https://secure.php.net/date */
+	date_i18n( _x( 'M j, Y', 'publish box date format' ), strtotime( $comment->comment_date ) ),
+	/* translators: Publish box time format, see https://secure.php.net/date */
+	date_i18n( _x( 'H:i', 'publish box time format' ), strtotime( $comment->comment_date ) )
+);
 ?>
 <span id="timestamp">
 <?php
-printf(
-	/* translators: %s: Comment date. */
-	__( 'Submitted on: %s' ),
-	'<b>' . date_i18n( $datef, strtotime( $comment->comment_date ) ) . '</b>'
-);
+/* translators: %s: Comment date. */
+printf( __( 'Submitted on: %s' ), '<b>' . $submitted . '</b>' );
 ?>
 </span>
 <a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit date and time' ); ?></span></a>
diff --git a/wp-admin/includes/class-wp-comments-list-table.php b/wp-admin/includes/class-wp-comments-list-table.php
index 6bf89d876c..3ab1442d14 100644
--- a/wp-admin/includes/class-wp-comments-list-table.php
+++ b/wp-admin/includes/class-wp-comments-list-table.php
@@ -867,6 +867,7 @@ class WP_Comments_List_Table extends WP_List_Table {
 			__( '%1$s at %2$s' ),
 			/* translators: Comment date format. See https://secure.php.net/date */
 			get_comment_date( __( 'Y/m/d' ), $comment ),
+			/* translators: Comment time format. See https://secure.php.net/date */
 			get_comment_date( __( 'g:i a' ), $comment )
 		);
 
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 69aa8a980f..fa8b60b3eb 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -1615,7 +1615,7 @@ function wp_default_scripts( &$scripts ) {
 			array(
 				'submittedOn' => __( 'Submitted on:' ),
 				/* translators: 1: Month, 2: Day, 3: Year, 4: Hour, 5: Minute. */
-				'dateFormat'  => __( '%1$s %2$s, %3$s @ %4$s:%5$s' ),
+				'dateFormat'  => __( '%1$s %2$s, %3$s at %4$s:%5$s' ),
 			)
 		);
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 34254533d6..abe569061e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.3-alpha-46083';
+$wp_version = '5.3-alpha-46084';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.