From 23b6ca3bcb2736f3138eddaf82618273422b2dcf Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Mon, 9 Sep 2019 00:06:29 +0000
Subject: [PATCH] Accessibility: Media: 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 audrasjb, afercia.
Fixes #47893.

git-svn-id: https://develop.svn.wordpress.org/trunk@46085 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/meta-boxes.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/wp-admin/includes/meta-boxes.php b/src/wp-admin/includes/meta-boxes.php
index 504b04eda1..7c5d72570c 100644
--- a/src/wp-admin/includes/meta-boxes.php
+++ b/src/wp-admin/includes/meta-boxes.php
@@ -380,18 +380,18 @@ function attachment_submit_meta_box( $post ) {
 <div id="misc-publishing-actions">
 	<div class="misc-pub-section curtime misc-pub-curtime">
 		<span id="timestamp">
-		<?php
-			$date = date_i18n(
+			<?php
+			$uploaded_on = sprintf(
+				/* translators: Publish box date string. 1: Date, 2: Time. See https://secure.php.net/date */
+				__( '%1$s at %2$s' ),
 				/* translators: Publish box date format, see https://secure.php.net/date */
-				__( 'M j, Y @ H:i' ),
-				strtotime( $post->post_date )
+				date_i18n( _x( 'M j, Y', 'publish box date format' ), strtotime( $post->post_date ) ),
+				/* translators: Publish box time format, see https://secure.php.net/date */
+				date_i18n( _x( 'H:i', 'publish box time format' ), strtotime( $post->post_date ) )
 			);
-			printf(
-				/* translators: Attachment information. %s: Date the attachment was uploaded. */
-				__( 'Uploaded on: %s' ),
-				'<b>' . $date . '</b>'
-			);
-		?>
+			/* translators: Attachment information. %s: Date the attachment was uploaded. */
+			printf( __( 'Uploaded on: %s' ), '<b>' . $uploaded_on . '</b>' );
+			?>
 		</span>
 	</div><!-- .misc-pub-section -->