From b4a862ddaa1430dd0bb66c2054eb35afea84bf57 Mon Sep 17 00:00:00 2001
From: Himanshu Pathak <himanshu.pathak@rtcamp.com>
Date: Thu, 23 Apr 2026 21:05:16 +0530
Subject: [PATCH 1/3] Media: Update caption label to differentiate between
 video descriptions and image captions

---
 src/wp-admin/includes/media.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/wp-admin/includes/media.php b/src/wp-admin/includes/media.php
index f4fd963ae5d8e..0fd6c4d242bc2 100644
--- a/src/wp-admin/includes/media.php
+++ b/src/wp-admin/includes/media.php
@@ -3274,7 +3274,17 @@ function edit_form_image_editor( $post ) {
 	<?php endif; ?>
 
 		<p>
-			<label for="attachment_caption"><strong><?php _e( 'Caption' ); ?></strong></label><br />
+			<label for="attachment_caption"><strong>
+				<?php
+				if ( str_starts_with( $post->post_mime_type, 'video' ) ) {
+					_e( 'Video Description' );
+				} elseif ( str_starts_with( $post->post_mime_type, 'image' ) ) {
+					_e( 'Image Caption' );
+				} else {
+					_e( 'Caption' );
+				}
+				?>
+			</strong></label><br />
 			<textarea class="widefat" name="excerpt" id="attachment_caption"><?php echo $post->post_excerpt; ?></textarea>
 		</p>
 

From 3370526efa6374e4ec399aa4a792254c67c2addf Mon Sep 17 00:00:00 2001
From: Himanshu Pathak <himanshu.pathak@rtcamp.com>
Date: Thu, 23 Apr 2026 21:05:46 +0530
Subject: [PATCH 2/3] MediaTemplate: Update caption labels

---
 src/wp-includes/media-template.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/wp-includes/media-template.php b/src/wp-includes/media-template.php
index 5fb6b5d894d9b..6ba0ca49634de 100644
--- a/src/wp-includes/media-template.php
+++ b/src/wp-includes/media-template.php
@@ -538,7 +538,13 @@ function wp_print_media_templates() {
 				<?php endforeach; ?>
 				<# } #>
 				<span class="setting" data-setting="caption">
+					<# if ( 'video' === data.type ) { #>
+					<label for="attachment-details-two-column-caption" class="name"><?php _e( 'Video Description' ); ?></label>
+					<# } else if ( 'image' === data.type ) { #>
+					<label for="attachment-details-two-column-caption" class="name"><?php _e( 'Image Caption' ); ?></label>
+					<# } else { #>
 					<label for="attachment-details-two-column-caption" class="name"><?php _e( 'Caption' ); ?></label>
+					<# } #>
 					<textarea id="attachment-details-two-column-caption" {{ maybeReadOnly }}>{{ data.caption }}</textarea>
 				</span>
 				<span class="setting" data-setting="description">
@@ -790,7 +796,13 @@ function wp_print_media_templates() {
 		<?php endforeach; ?>
 		<# } #>
 		<span class="setting" data-setting="caption">
+			<# if ( 'video' === data.type ) { #>
+			<label for="attachment-details-caption" class="name"><?php _e( 'Video Description' ); ?></label>
+			<# } else if ( 'image' === data.type ) { #>
+			<label for="attachment-details-caption" class="name"><?php _e( 'Image Caption' ); ?></label>
+			<# } else { #>
 			<label for="attachment-details-caption" class="name"><?php _e( 'Caption' ); ?></label>
+			<# } #>
 			<textarea id="attachment-details-caption" {{ maybeReadOnly }}>{{ data.caption }}</textarea>
 		</span>
 		<span class="setting" data-setting="description">

From d848a3096e7958aa3a598b5e38160405659ea0ed Mon Sep 17 00:00:00 2001
From: Himanshu Pathak <himanshu.pathak@rtcamp.com>
Date: Mon, 27 Apr 2026 15:33:07 +0530
Subject: [PATCH 3/3] Escape caption labels

---
 src/wp-admin/includes/media.php    |  6 +++---
 src/wp-includes/media-template.php | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/wp-admin/includes/media.php b/src/wp-admin/includes/media.php
index 0fd6c4d242bc2..aeb80171675c1 100644
--- a/src/wp-admin/includes/media.php
+++ b/src/wp-admin/includes/media.php
@@ -3277,11 +3277,11 @@ function edit_form_image_editor( $post ) {
 			<label for="attachment_caption"><strong>
 				<?php
 				if ( str_starts_with( $post->post_mime_type, 'video' ) ) {
-					_e( 'Video Description' );
+					esc_html_e( 'Video Description' );
 				} elseif ( str_starts_with( $post->post_mime_type, 'image' ) ) {
-					_e( 'Image Caption' );
+					esc_html_e( 'Image Caption' );
 				} else {
-					_e( 'Caption' );
+					esc_html_e( 'Caption' );
 				}
 				?>
 			</strong></label><br />
diff --git a/src/wp-includes/media-template.php b/src/wp-includes/media-template.php
index 6ba0ca49634de..aedbfd4ac82a3 100644
--- a/src/wp-includes/media-template.php
+++ b/src/wp-includes/media-template.php
@@ -539,11 +539,11 @@ function wp_print_media_templates() {
 				<# } #>
 				<span class="setting" data-setting="caption">
 					<# if ( 'video' === data.type ) { #>
-					<label for="attachment-details-two-column-caption" class="name"><?php _e( 'Video Description' ); ?></label>
+					<label for="attachment-details-two-column-caption" class="name"><?php esc_html_e( 'Video Description' ); ?></label>
 					<# } else if ( 'image' === data.type ) { #>
-					<label for="attachment-details-two-column-caption" class="name"><?php _e( 'Image Caption' ); ?></label>
+					<label for="attachment-details-two-column-caption" class="name"><?php esc_html_e( 'Image Caption' ); ?></label>
 					<# } else { #>
-					<label for="attachment-details-two-column-caption" class="name"><?php _e( 'Caption' ); ?></label>
+					<label for="attachment-details-two-column-caption" class="name"><?php esc_html_e( 'Caption' ); ?></label>
 					<# } #>
 					<textarea id="attachment-details-two-column-caption" {{ maybeReadOnly }}>{{ data.caption }}</textarea>
 				</span>
@@ -797,11 +797,11 @@ function wp_print_media_templates() {
 		<# } #>
 		<span class="setting" data-setting="caption">
 			<# if ( 'video' === data.type ) { #>
-			<label for="attachment-details-caption" class="name"><?php _e( 'Video Description' ); ?></label>
+			<label for="attachment-details-caption" class="name"><?php esc_html_e( 'Video Description' ); ?></label>
 			<# } else if ( 'image' === data.type ) { #>
-			<label for="attachment-details-caption" class="name"><?php _e( 'Image Caption' ); ?></label>
+			<label for="attachment-details-caption" class="name"><?php esc_html_e( 'Image Caption' ); ?></label>
 			<# } else { #>
-			<label for="attachment-details-caption" class="name"><?php _e( 'Caption' ); ?></label>
+			<label for="attachment-details-caption" class="name"><?php esc_html_e( 'Caption' ); ?></label>
 			<# } #>
 			<textarea id="attachment-details-caption" {{ maybeReadOnly }}>{{ data.caption }}</textarea>
 		</span>