Index: includes/install.core.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/install.core.inc,v retrieving revision 1.28 diff -u -p -r1.28 install.core.inc --- includes/install.core.inc 1 Sep 2010 01:24:05 -0000 1.28 +++ includes/install.core.inc 13 Sep 2010 10:16:01 -0000 @@ -1151,6 +1151,9 @@ function install_select_profile_form($fo '#parents' => array('profile'), ); } + $form['help'] = array( + '#markup' => '

' . st('Learn how to install Drupal in other languages') . '

', + ); $form['actions'] = array('#type' => 'actions'); $form['actions']['submit'] = array( '#type' => 'submit', @@ -1205,20 +1208,9 @@ function install_select_locale(&$install if (count($locales) == 1) { if ($profilename == 'standard' && $install_state['interactive']) { drupal_set_title(st('Choose language')); - if (!empty($install_state['parameters']['localize'])) { - $output = '

' . st('With the addition of an appropriate translation package, this installer is capable of proceeding in another language of your choice. To install and use Drupal in a language other than English:') . '

'; - $output .= '

' . st('Alternatively, to install and use Drupal in English, or to defer the selection of an alternative language until after installation, select the first link below.') . '

'; - $output .= '

' . st('How should the installation continue?') . '

'; - $output .= ''; - } - else { - include_once DRUPAL_ROOT . '/includes/form.inc'; - $elements = drupal_get_form('install_select_locale_form', $locales, $profilename); - $output = drupal_render($elements); - } + include_once DRUPAL_ROOT . '/includes/form.inc'; + $elements = drupal_get_form('install_select_locale_form', $locales, $profilename); + $output = drupal_render($elements); return $output; } // One language, but not the default profile or not an interactive @@ -1280,11 +1272,6 @@ function install_select_locale_form($for '#parents' => array('locale') ); } - if ($profilename == 'standard') { - $form['help'] = array( - '#markup' => '

' . st('Learn how to install Drupal in other languages') . '

', - ); - } $form['actions'] = array('#type' => 'actions'); $form['actions']['submit'] = array( '#type' => 'submit',