diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index 64c7c1e..e75d650 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -1563,8 +1563,15 @@ function install_select_language_form($form, &$form_state, $files = array()) { // Build a select list with language names in native language for the user // to choose from. And build a list of available languages for the browser // to select the language default from. + // Select lists based on all standard languages. + foreach ($standard_languages as $langcode => $language_names) { + $select_options[$langcode] = $language_names[1]; + $browser_options[$langcode] = new Language(array( + 'id' => $langcode, + )); + } + // Add languages based on language files in the translations directory. if (count($files)) { - // Select lists based on available language files. foreach ($files as $langcode => $uri) { $select_options[$langcode] = isset($standard_languages[$langcode]) ? $standard_languages[$langcode][1] : $langcode; $browser_options[$langcode] = new Language(array( @@ -1572,17 +1579,9 @@ function install_select_language_form($form, &$form_state, $files = array()) { )); } } - else { - // Select lists based on all standard languages. - foreach ($standard_languages as $langcode => $language_names) { - $select_options[$langcode] = $language_names[1]; - $browser_options[$langcode] = new Language(array( - 'id' => $langcode, - )); - } - } - + asort($select_options); $browser_langcode = language_from_browser($browser_options); + $form['langcode'] = array( '#type' => 'select', '#title' => t('Choose language'),