From 49b4cfc034c87ff0cc1ef1b5d0657794a9427f92 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Mon, 9 Sep 2019 00:07:57 +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.
Built from https://develop.svn.wordpress.org/trunk@46085


git-svn-id: http://core.svn.wordpress.org/trunk@45897 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/meta-boxes.php | 20 ++++++++++----------
 wp-includes/version.php          |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php
index 504b04eda1..7c5d72570c 100644
--- a/wp-admin/includes/meta-boxes.php
+++ b/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 -->
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index abe569061e..b94a9b3a07 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.3-alpha-46084';
+$wp_version = '5.3-alpha-46085';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.