X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/9e77185fafaf4e60e2b73821e0e4b9b1a11fb85f..refs/tags/wordpress-4.3:/wp-admin/includes/translation-install.php
diff --git a/wp-admin/includes/translation-install.php b/wp-admin/includes/translation-install.php
index f3cc370a..8e1b827c 100644
--- a/wp-admin/includes/translation-install.php
+++ b/wp-admin/includes/translation-install.php
@@ -124,6 +124,8 @@ function wp_get_available_translations() {
*
* @since 4.0.0
*
+ * @global string $wp_local_package
+ *
* @param array $languages Array of available languages (populated via the Translation API).
*/
function wp_install_language_form( $languages ) {
@@ -141,7 +143,7 @@ function wp_install_language_form( $languages ) {
$language = $languages[ $wp_local_package ];
printf( '' . "\n",
esc_attr( $language['language'] ),
- esc_attr( $language['iso'][1] ),
+ esc_attr( current( $language['iso'] ) ),
esc_attr( $language['strings']['continue'] ),
in_array( $language['language'], $installed_languages ) ? ' data-installed="1"' : '',
esc_html( $language['native_name'] ) );
@@ -153,7 +155,7 @@ function wp_install_language_form( $languages ) {
foreach ( $languages as $language ) {
printf( '' . "\n",
esc_attr( $language['language'] ),
- esc_attr( $language['iso'][1] ),
+ esc_attr( current( $language['iso'] ) ),
esc_attr( $language['strings']['continue'] ),
in_array( $language['language'], $installed_languages ) ? ' data-installed="1"' : '',
esc_html( $language['native_name'] ) );
@@ -229,6 +231,7 @@ function wp_can_install_language_pack() {
require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
$skin = new Automatic_Upgrader_Skin;
$upgrader = new Language_Pack_Upgrader( $skin );
+ $upgrader->init();
$check = $upgrader->fs_connect( array( WP_CONTENT_DIR, WP_LANG_DIR ) );