diff --git a/src/wp-admin/edit-form-comment.php b/src/wp-admin/edit-form-comment.php
index a64be9c..b8efd2c 100644
--- a/src/wp-admin/edit-form-comment.php
+++ b/src/wp-admin/edit-form-comment.php
@@ -103,15 +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' ),
+	date_i18n( _x( 'M j, Y', 'edit comment submitted-on date format. See https://secure.php.net/date' ), strtotime( $comment->comment_date ) ),
+	date_i18n( _x( 'H:i', 'edit comment submitted-on time format. See https://secure.php.net/date' ), 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>'
+	'<b>' . $submitted . '</b>'
 );
 ?>
 </span>
diff --git a/src/wp-admin/includes/template.php b/src/wp-admin/includes/template.php
index 8740c59..a804657 100644
--- a/src/wp-admin/includes/template.php
+++ b/src/wp-admin/includes/template.php
@@ -812,7 +812,7 @@ function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) {
 
 	echo '<div class="timestamp-wrap">';
 	/* translators: 1: month, 2: day, 3: year, 4: hour, 5: minute */
-	printf( __( '%1$s %2$s, %3$s @ %4$s:%5$s' ), $month, $day, $year, $hour, $minute );
+	printf( __( '%1$s %2$s, %3$s at %4$s:%5$s' ), $month, $day, $year, $hour, $minute );
 
 	echo '</div><input type="hidden" id="ss" name="ss" value="' . $ss . '" />';
 
diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
index c06680c..0762452 100644
--- a/src/wp-includes/script-loader.php
+++ b/src/wp-includes/script-loader.php
@@ -1611,7 +1611,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' ),
 			)
 		);