Merge branch 'WordPress:trunk' into trunk

dd32 · web-flow · commit dce0a344ef32 · 2026-07-14T01:00:49.000+10:00
diff --git a/src/wp-admin/css/install.css b/src/wp-admin/css/install.css
@@ -322,6 +322,13 @@ body.language-chooser {
 	max-width: 300px;
 }
 
+.language-chooser [for="language"] {
+	display: inline-block;
+	margin-bottom: 10px;
+	font-size: 14px;
+	font-weight: 600;
+}
+
 .language-chooser select {
 	padding: 8px;
 	width: 100%;
diff --git a/src/wp-admin/includes/translation-install.php b/src/wp-admin/includes/translation-install.php
@@ -205,7 +205,7 @@ function wp_install_language_form( $languages ) {
 
 	$installed_languages = get_available_languages();
 
-	echo "<label class='screen-reader-text' for='language'>Select a default language</label>\n";
+	echo "<label for='language'>Select a default language</label>\n";
 	echo "<select size='14' name='language' id='language'>\n";
 	echo '<option value="" lang="en" selected="selected" data-continue="Continue" data-installed="1">English (United States)</option>';
 	echo "\n";
diff --git a/src/wp-admin/install.php b/src/wp-admin/install.php
@@ -10,7 +10,7 @@
 if ( false ) {
 	?>
 <!DOCTYPE html>
-<html>
+<html lang="en-US">
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<title>Error: PHP is not running</title>
diff --git a/src/wp-admin/setup-config.php b/src/wp-admin/setup-config.php
@@ -95,16 +95,15 @@ function setup_config_display_header( $body_classes = array() ) {
 	$body_classes   = (array) $body_classes;
 	$body_classes[] = 'wp-core-ui';
 	$body_classes[] = 'admin-color-modern';
-	$dir_attr       = '';
+
 	if ( is_rtl() ) {
 		$body_classes[] = 'rtl';
-		$dir_attr       = ' dir="rtl"';
 	}
 
 	header( 'Content-Type: text/html; charset=utf-8' );
 	?>
 <!DOCTYPE html>
-<html<?php echo $dir_attr; ?>>
+<html <?php language_attributes(); ?>>
 <head>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -134,7 +133,7 @@ function setup_config_display_header( $body_classes = array() ) {
 			$languages = wp_get_available_translations();
 			if ( $languages ) {
 				setup_config_display_header( 'language-chooser' );
-				echo '<h1 class="screen-reader-text">Select a default language</h1>';
+				echo '<h1 class="screen-reader-text">Welcome to WordPress</h1>';
 				echo '<form id="setup" method="post" action="?step=0">';
 				wp_install_language_form( $languages );
 				echo '</form>';
diff --git a/src/wp-includes/general-template.php b/src/wp-includes/general-template.php
@@ -4546,13 +4546,16 @@ function get_language_attributes( $doctype = 'html' ) {
 		$attributes[] = 'dir="rtl"';
 	}
 
-	$lang = get_bloginfo( 'language' );
+	$lang      = get_bloginfo( 'language' );
+	$html_type = get_option( 'html_type' );
+
 	if ( $lang ) {
-		if ( 'text/html' === get_option( 'html_type' ) || 'html' === $doctype ) {
+		if ( 'text/html' === $html_type || 'html' === $doctype ) {
 			$attributes[] = 'lang="' . esc_attr( $lang ) . '"';
 		}
 
-		if ( 'text/html' !== get_option( 'html_type' ) || 'xhtml' === $doctype ) {
+		// The $html_type option may be false on a new install on the setup-config.php page.
+		if ( ( $html_type && 'text/html' !== $html_type ) || 'xhtml' === $doctype ) {
 			$attributes[] = 'xml:lang="' . esc_attr( $lang ) . '"';
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -4546,13 +4546,16 @@ function get_language_attributes( $doctype = 'html' ) {`
`4546`	`4546`	`$attributes[] = 'dir="rtl"';`
`4547`	`4547`	`}`
`4548`	`4548`
`4549`		`- $lang = get_bloginfo( 'language' );`
	`4549`	`+ $lang = get_bloginfo( 'language' );`
	`4550`	`+ $html_type = get_option( 'html_type' );`
	`4551`	`+`
`4550`	`4552`	`if ( $lang ) {`
`4551`		`- if ( 'text/html' === get_option( 'html_type' ) \|\| 'html' === $doctype ) {`
	`4553`	`+ if ( 'text/html' === $html_type \|\| 'html' === $doctype ) {`
`4552`	`4554`	`$attributes[] = 'lang="' . esc_attr( $lang ) . '"';`
`4553`	`4555`	`}`
`4554`	`4556`
`4555`		`- if ( 'text/html' !== get_option( 'html_type' ) \|\| 'xhtml' === $doctype ) {`
	`4557`	`+ // The $html_type option may be false on a new install on the setup-config.php page.`
	`4558`	`+ if ( ( $html_type && 'text/html' !== $html_type ) \|\| 'xhtml' === $doctype ) {`
`4556`	`4559`	`$attributes[] = 'xml:lang="' . esc_attr( $lang ) . '"';`
`4557`	`4560`	`}`
`4558`	`4561`	`}`