Ticket #48776: 48776.1.patch

src/wp-admin/includes/translation-install.php

@@ -148 +148 @@
 }
 
 /**
+ * Output the option for the language on the installation screen.
+ *
+ * @param array[] $language Array of language attributes.
+ */
+function wp_install_print_language_option( $language ) {
+        $installed_languages = get_available_languages();
+        $language_strings_continue = ! empty( $language['strings']['continue'] ) ? $language['strings']['continue'] : 'Continue';
+        $is_language_installed = in_array( $language['language'], $installed_languages, true );
+
+        printf(
+                '<option value="%s" lang="%s" data-continue="%s"%s>%s</option>' . "\n",
+                esc_attr( $language['language'] ),
+                esc_attr( current( $language['iso'] ) ),
+                esc_attr( $language_strings_continue ),
+                $is_language_installed ? ' data-installed="1"' : '',
+                esc_html( $language['native_name'] )
+        );
+}
+
+/**
  * Output the select form for the language selection on the installation screen.
  *
  * @since 4.0.0
@@ -159 +179 @@
 function wp_install_language_form( $languages ) {
         global $wp_local_package;
 
-        $installed_languages = get_available_languages();
-
         echo "<label class='screen-reader-text' 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>';
@@ -167 +185 @@
         echo "\n";
 
         if ( ! empty( $wp_local_package ) && isset( $languages[ $wp_local_package ] ) ) {
-                if ( isset( $languages[ $wp_local_package ] ) ) {
-                        $language = $languages[ $wp_local_package ];
-                        printf(
-                                '<option value="%s" lang="%s" data-continue="%s"%s>%s</option>' . "\n",
-                                esc_attr( $language['language'] ),
-                                esc_attr( current( $language['iso'] ) ),
-                                esc_attr( $language['strings']['continue'] ),
-                                in_array( $language['language'], $installed_languages ) ? ' data-installed="1"' : '',
-                                esc_html( $language['native_name'] )
-                        );
-
-                        unset( $languages[ $wp_local_package ] );
-                }
+                $language = $languages[ $wp_local_package ];
+                wp_install_print_language_option( $language );
+                unset( $languages[ $wp_local_package ] );
         }
 
         foreach ( $languages as $language ) {
-                printf(
-                        '<option value="%s" lang="%s" data-continue="%s"%s>%s</option>' . "\n",
-                        esc_attr( $language['language'] ),
-                        esc_attr( current( $language['iso'] ) ),
-                        esc_attr( $language['strings']['continue'] ),
-                        in_array( $language['language'], $installed_languages ) ? ' data-installed="1"' : '',
-                        esc_html( $language['native_name'] )
-                );
+                wp_install_print_language_option( $language );
         }
         echo "</select>\n";
         echo '<p class="step"><span class="spinner"></span><input id="language-continue" type="submit" class="button button-primary button-large" value="Continue" /></p>';