diff --git includes/install.core.inc includes/install.core.inc index 90e6a3c..dd49514 100644 --- includes/install.core.inc +++ includes/install.core.inc @@ -1203,16 +1203,29 @@ function install_select_locale(&$install_state) { // the user that the installer can be localized. Otherwise we assume the // user knows what he is doing. if (count($locales) == 1) { - if ($profilename == 'standard' && $install_state['interactive']) { + if ($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('Follow these steps to translate Drupal into your language:') . '

'; + $output .= '
  1. ' . st('Download a translation from the translation server.', array( + '@localize' => 'http://localize.drupal.org/download', + )) . '
  2. '; + $output .= '
  3. ' . st('Rename the downloaded file to your language\'s ISO code (e.g., de.po or fr.po) and place it into the following directory: +
    +@profile-path/
    +
    +For detailed instructions, visit the drupal.org handbook page.', array( + '@profile-path' => "/profiles/$profilename/translations", + '@iso-url' => 'http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements', + '@handbook-url' => 'http://drupal.org/localize', + )) . '
  4. '; + $output .= '
  5. ' . st('Reload the language selection page after adding translations.') . '
  6. '; + $output .= '
'; $output .= '

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

'; - $output .= ''; + $output .= ''; } else { include_once DRUPAL_ROOT . '/includes/form.inc'; diff --git profiles/minimal/translations/README.txt profiles/minimal/translations/README.txt new file mode 100644 index 0000000..72d1e60 --- /dev/null +++ profiles/minimal/translations/README.txt @@ -0,0 +1,4 @@ +// $Id$ + +This directory should be used to place downloaded translations +for installing Drupal core. diff --git profiles/standard/translations/README.txt profiles/standard/translations/README.txt new file mode 100644 index 0000000..72d1e60 --- /dev/null +++ profiles/standard/translations/README.txt @@ -0,0 +1,4 @@ +// $Id$ + +This directory should be used to place downloaded translations +for installing Drupal core. diff --git themes/seven/style.css themes/seven/style.css index d6d89aa..d9e4296 100644 --- themes/seven/style.css +++ themes/seven/style.css @@ -139,6 +139,10 @@ pre, kbd { font-size: 1.231em; } +pre { + margin: 0.5em 0; + white-space: pre-wrap; +} /** * Skip link.