' . 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 { - $output = ''; + // If only the built-in (English) language is available, and we are using + // the default profile and performing an interactive installation, inform + // the user that the installer can be localized. Otherwise we assume the + // user knows what he is doing. + if (count($locales) == 1) { + if ($profilename == 'default' && $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 { + $output = ''; + } + return $output; } - return $output; + // One language, but not the default profile or not an interactive + // installation. Assume the user knows what he is doing. + $locale = current($locales); + $install_state['parameters']['locale'] = $locale->name; + return; } - // One language, but not the default profile or not an interactive - // installation. Assume the user knows what he is doing. - $locale = current($locales); - $install_state['parameters']['locale'] = $locale->name; - return; - } - else { - // Allow profile to pre-select the language, skipping the selection. - $function = $profilename . '_profile_details'; - if (function_exists($function)) { - $details = $function(); - if (isset($details['language'])) { + else { + // Allow profile to pre-select the language, skipping the selection. + $function = $profilename . '_profile_details'; + if (function_exists($function)) { + $details = $function(); + if (isset($details['language'])) { + foreach ($locales as $locale) { + if ($details['language'] == $locale->name) { + $install_state['parameters']['locale'] = $locale->name; + return; + } + } + } + } + + if (!empty($_POST['locale'])) { foreach ($locales as $locale) { - if ($details['language'] == $locale->name) { + if ($_POST['locale'] == $locale->name) { $install_state['parameters']['locale'] = $locale->name; return; } } } - } - if (!empty($_POST['locale'])) { - foreach ($locales as $locale) { - if ($_POST['locale'] == $locale->name) { - $install_state['parameters']['locale'] = $locale->name; - return; - } + // We still don't have a locale, so display a form for selecting one. + // Only do this in the case of interactive installations, since this is + // not a real form with submit handlers (the database isn't even set up + // yet), rather just a convenience method for setting parameters in the + // URL. + if ($install_state['interactive']) { + drupal_set_title(st('Choose language')); + include_once DRUPAL_ROOT . '/includes/form.inc'; + return drupal_render(drupal_get_form('install_select_locale_form', $locales)); + } + else { + throw new Exception(st('Sorry, you must select a language to continue the installation.')); } - } - - // We still don't have a locale, so display a form for selecting one. Only - // do this in the case of interactive installations, since this is not a - // real form with submit handlers (the database isn't even set up yet), - // rather just a convenience method for setting parameters in the URL. - if ($install_state['interactive']) { - drupal_set_title(st('Choose language')); - include_once DRUPAL_ROOT . '/includes/form.inc'; - return drupal_render(drupal_get_form('install_select_locale_form', $locales)); - } - else { - throw new Exception(st('Sorry, you must select a language to continue the installation.')); } } - } } /** @@ -1278,19 +1279,19 @@ function install_bootstrap_full(&$instal * The batch definition. */ function install_profile_modules(&$install_state) { - $modules = variable_get('install_profile_modules', array()); - $files = system_get_module_data(); - variable_del('install_profile_modules'); - $operations = array(); - foreach ($modules as $module) { - $operations[] = array('_install_module_batch', array($module, $files[$module]->info['name'])); - } - $batch = array( - 'operations' => $operations, - 'title' => st('Installing @drupal', array('@drupal' => drupal_install_profile_name())), - 'error_message' => st('The installation has encountered an error.'), - ); - return $batch; + $modules = variable_get('install_profile_modules', array()); + $files = system_get_module_data(); + variable_del('install_profile_modules'); + $operations = array(); + foreach ($modules as $module) { + $operations[] = array('_install_module_batch', array($module, $files[$module]->info['name'])); + } + $batch = array( + 'operations' => $operations, + 'title' => st('Installing @drupal', array('@drupal' => drupal_install_profile_name())), + 'error_message' => st('The installation has encountered an error.'), + ); + return $batch; } /** @@ -1302,17 +1303,17 @@ function install_profile_modules(&$insta * The batch definition, if there are language files to import. */ function install_import_locales(&$install_state) { - include_once DRUPAL_ROOT . '/includes/locale.inc'; - $install_locale = $install_state['parameters']['locale']; - // Enable installation language as default site language. - locale_add_language($install_locale, NULL, NULL, NULL, '', NULL, 1, TRUE); - // Collect files to import for this language. - $batch = locale_batch_by_language($install_locale, NULL); - if (!empty($batch)) { - // Remember components we cover in this batch set. - variable_set('install_locale_batch_components', $batch['#components']); - return $batch; - } + include_once DRUPAL_ROOT . '/includes/locale.inc'; + $install_locale = $install_state['parameters']['locale']; + // Enable installation language as default site language. + locale_add_language($install_locale, NULL, NULL, NULL, '', NULL, 1, TRUE); + // Collect files to import for this language. + $batch = locale_batch_by_language($install_locale, NULL); + if (!empty($batch)) { + // Remember components we cover in this batch set. + variable_set('install_locale_batch_components', $batch['#components']); + return $batch; + } } /** @@ -1326,50 +1327,49 @@ function install_import_locales(&$instal * The form API definition for the site configuration form. */ function install_configure_form(&$form_state, &$install_state) { - if (variable_get('site_name', FALSE) || variable_get('site_mail', FALSE)) { - // Site already configured: This should never happen, means re-running - // the installer, possibly by an attacker after the 'install_task' variable - // got accidentally blown somewhere. Stop it now. - throw new Exception(install_already_done_error()); - } - - drupal_set_title(st('Configure site')); + if (variable_get('site_name', FALSE) || variable_get('site_mail', FALSE)) { + // Site already configured: This should never happen, means re-running the + // installer, possibly by an attacker after the 'install_task' variable got + // accidentally blown somewhere. Stop it now. + throw new Exception(install_already_done_error()); + } - // Warn about settings.php permissions risk - $settings_dir = './' . conf_path(); - $settings_file = $settings_dir . '/settings.php'; - if (!drupal_verify_install_file($settings_file, FILE_EXIST|FILE_READABLE|FILE_NOT_WRITABLE) || !drupal_verify_install_file($settings_dir, FILE_NOT_WRITABLE, 'dir')) { - drupal_set_message(st('All necessary changes to %dir and %file have been made, so you should remove write permissions to them now in order to avoid security risks. If you are unsure how to do so, please consult the online handbook.', array('%dir' => $settings_dir, '%file' => $settings_file, '@handbook_url' => 'http://drupal.org/server-permissions')), 'error'); - } - else { - drupal_set_message(st('All necessary changes to %dir and %file have been made. They have been set to read-only for security.', array('%dir' => $settings_dir, '%file' => $settings_file))); - } + drupal_set_title(st('Configure site')); + + // Warn about settings.php permissions risk + $settings_dir = './' . conf_path(); + $settings_file = $settings_dir . '/settings.php'; + if (!drupal_verify_install_file($settings_file, FILE_EXIST|FILE_READABLE|FILE_NOT_WRITABLE) || !drupal_verify_install_file($settings_dir, FILE_NOT_WRITABLE, 'dir')) { + drupal_set_message(st('All necessary changes to %dir and %file have been made, so you should remove write permissions to them now in order to avoid security risks. If you are unsure how to do so, please consult the online handbook.', array('%dir' => $settings_dir, '%file' => $settings_file, '@handbook_url' => 'http://drupal.org/server-permissions')), 'error'); + } + else { + drupal_set_message(st('All necessary changes to %dir and %file have been made. They have been set to read-only for security.', array('%dir' => $settings_dir, '%file' => $settings_file))); + } - // Add JavaScript validation. - _user_password_dynamic_validation(); - drupal_add_js(drupal_get_path('module', 'system') . '/system.js'); - // Add JavaScript time zone detection. - drupal_add_js('misc/timezone.js'); - // We add these strings as settings because JavaScript translation does not - // work on install time. - drupal_add_js(array('copyFieldValue' => array('edit-site-mail' => array('edit-account-mail'))), 'setting'); - drupal_add_js('jQuery(function () { Drupal.cleanURLsInstallCheck(); });', 'inline'); - // Build menu to allow clean URL check. - menu_rebuild(); - - // Cache a fully-built schema. This is necessary for any - // invocation of index.php because: (1) setting cache table - // entries requires schema information, (2) that occurs during - // bootstrap before any module are loaded, so (3) if there is no - // cached schema, drupal_get_schema() will try to generate one - // but with no loaded modules will return nothing. - // - // This logically could be done during the 'install_finished' task, - // but the clean URL check requires it now. - drupal_get_schema(NULL, TRUE); + // Add JavaScript validation. + _user_password_dynamic_validation(); + drupal_add_js(drupal_get_path('module', 'system') . '/system.js'); + // Add JavaScript time zone detection. + drupal_add_js('misc/timezone.js'); + // We add these strings as settings because JavaScript translation does not + // work on install time. + drupal_add_js(array('copyFieldValue' => array('edit-site-mail' => array('edit-account-mail'))), 'setting'); + drupal_add_js('jQuery(function () { Drupal.cleanURLsInstallCheck(); });', 'inline'); + // Build menu to allow clean URL check. + menu_rebuild(); + + // Cache a fully-built schema. This is necessary for any invocation of + // index.php because: (1) setting cache table entries requires schema + // information, (2) that occurs during bootstrap before any module are + // loaded, so (3) if there is no cached schema, drupal_get_schema() will + // try to generate one but with no loaded modules will return nothing. + // + // This logically could be done during the 'install_finished' task, but the + // clean URL check requires it now. + drupal_get_schema(NULL, TRUE); - // Return the form. - return _install_configure_form($form_state, $install_state); + // Return the form. + return _install_configure_form($form_state, $install_state); } /** @@ -1381,13 +1381,13 @@ function install_configure_form(&$form_s * The batch definition, if there are language files to import. */ function install_import_locales_remaining(&$install_state) { - include_once DRUPAL_ROOT . '/includes/locale.inc'; - // Collect files to import for this language. Skip components - // already covered in the initial batch set. - $batch = locale_batch_by_language($install_locale, NULL, variable_get('install_locale_batch_components', array())); - // Remove temporary variable. - variable_del('install_locale_batch_components'); - return $batch; + include_once DRUPAL_ROOT . '/includes/locale.inc'; + // Collect files to import for this language. Skip components already covered + // in the initial batch set. + $batch = locale_batch_by_language($install_locale, NULL, variable_get('install_locale_batch_components', array())); + // Remove temporary variable. + variable_del('install_locale_batch_components'); + return $batch; } /** @@ -1399,28 +1399,28 @@ function install_import_locales_remainin * A message informing the user that the installation is complete. */ function install_finished(&$install_state) { - drupal_set_title(st('@drupal installation complete', array('@drupal' => drupal_install_profile_name()))); - $messages = drupal_set_message(); - $output = '' . st('Congratulations, @drupal has been successfully installed.', array('@drupal' => drupal_install_profile_name())) . '
'; - $output .= '' . (isset($messages['error']) ? st('Please review the messages above before continuing on to your new site.', array('@url' => url(''))) : st('You may now visit your new site.', array('@url' => url('')))) . '
'; - $output .= '' . st('For more information on configuring Drupal, please refer to the help section.', array('@help' => url('admin/help'))) . '
'; - - // Rebuild menu and registry to get content type links registered by the - // profile, and possibly any other menu items created through the tasks. - menu_rebuild(); - - // Register actions declared by any modules. - actions_synchronize(); - - // Randomize query-strings on css/js files, to hide the fact that - // this is a new install, not upgraded yet. - _drupal_flush_css_js(); + drupal_set_title(st('@drupal installation complete', array('@drupal' => drupal_install_profile_name()))); + $messages = drupal_set_message(); + $output = '' . st('Congratulations, @drupal has been successfully installed.', array('@drupal' => drupal_install_profile_name())) . '
'; + $output .= '' . (isset($messages['error']) ? st('Please review the messages above before continuing on to your new site.', array('@url' => url(''))) : st('You may now visit your new site.', array('@url' => url('')))) . '
'; + $output .= '' . st('For more information on configuring Drupal, please refer to the help section.', array('@help' => url('admin/help'))) . '
'; + + // Rebuild menu and registry to get content type links registered by the + // profile, and possibly any other menu items created through the tasks. + menu_rebuild(); + + // Register actions declared by any modules. + actions_synchronize(); + + // Randomize query-strings on css/js files, to hide the fact that this is a + // new install, not upgraded yet. + _drupal_flush_css_js(); - // Remember the profile which was used. - variable_set('install_profile', $install_state['parameters']['profile']); + // Remember the profile which was used. + variable_set('install_profile', $install_state['parameters']['profile']); - // Cache a fully-built schema. - drupal_get_schema(NULL, TRUE); + // Cache a fully-built schema. + drupal_get_schema(NULL, TRUE); // Run cron to populate update status tables (if available) so that users // will be warned if they've installed an out of date Drupal version. Index: includes/install.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/install.inc,v retrieving revision 1.100 diff -u -p -r1.100 install.inc --- includes/install.inc 28 Jul 2009 12:13:46 -0000 1.100 +++ includes/install.inc 28 Jul 2009 14:38:29 -0000 @@ -346,7 +346,7 @@ abstract class DatabaseTasks { } } else { - throw new DatabaseTaskException(st("Failed to run all tasks against the database server. The task %task wasn\'t found.", array('%task' => $task['function']))); + throw new DatabaseTaskException(st("Failed to run all tasks against the database server. The task %task wasn't found.", array('%task' => $task['function']))); } } } @@ -932,13 +932,13 @@ function st($string, $args = array()) { if (!isset($locale_strings)) { $locale_strings = array(); if (isset($install_state['parameters']['profile']) && isset($install_state['parameters']['locale'])) { - $filename = 'profiles/' . $install_state['parameters']['profile'] . '/translations/' . $install_state['parameters']['locale'] . '.po'; - if (file_exists(DRUPAL_ROOT . '/' . $filename)) { - require_once DRUPAL_ROOT . '/includes/locale.inc'; - $file = (object) array('filepath' => $filename); - _locale_import_read_po('mem-store', $file); - $locale_strings = _locale_import_one_string('mem-report'); - } + $filename = 'profiles/' . $install_state['parameters']['profile'] . '/translations/' . $install_state['parameters']['locale'] . '.po'; + if (file_exists(DRUPAL_ROOT . '/' . $filename)) { + require_once DRUPAL_ROOT . '/includes/locale.inc'; + $file = (object) array('filepath' => $filename); + _locale_import_read_po('mem-store', $file); + $locale_strings = _locale_import_one_string('mem-report'); + } } }