diff --git INSTALL.txt INSTALL.txt index 3630823..159a6ab 100644 --- INSTALL.txt +++ INSTALL.txt @@ -72,12 +72,24 @@ INSTALLATION mv drupal-x.x/* drupal-x.x/.htaccess /var/www/html - If you would like to have the default English interface translated to a - different language, we have good news. You can install and use Drupal in - other languages from the start. Check whether a released package of the - language desired is available for this Drupal version at - http://drupal.org/project/translations and download the package. Extract - the contents to the same directory where you extracted Drupal into. + By default, Drupal is installed in English, and further languages may be + installed later. Follow these steps to translate Drupal into your language + during installation: + + - Download a translation file for this Drupal version from the translation + server: + http://localize.drupal.org/download + + - Rename the downloaded file to your language's ISO code (e.g., de.po or + fr.po) and place it into the directory /translations right below + the installation profile's directory that you want to use for your + installation (usually "standard"): + + /profiles/standard/translations/ + + - Reload the language selection page after adding translations. + + For detailed instructions, visit http://drupal.org/localize. 2. IF NECESSARY, CREATE THE CONFIGURATION FILE AND GRANT WRITE PERMISSIONS diff --git includes/install.core.inc includes/install.core.inc index fed7784..f1fa67f 100644 --- includes/install.core.inc +++ includes/install.core.inc @@ -1198,21 +1198,28 @@ function install_select_locale(&$install_state) { } if (empty($install_state['parameters']['locale'])) { - // 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 only the built-in (English) language is available, and we are + // 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 == '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('How should the installation continue?') . '

'; - $output .= ''; + $output = '

Follow these steps to translate Drupal into your language:

'; + $output .= '
    '; + $output .= '
  1. Download a translation from the translation server.
  2. '; + $output .= '
  3. Rename the downloaded file to your language\'s ISO code (e.g., de.po or fr.po) and place it into the following directory: +
    +/profiles/' . $profilename . '/translations/
    +
  4. '; + $output .= '
'; + $output .= '

For more information on installing Drupal in different languages, visit the drupal.org handbook page.

'; + $output .= '

How should the installation continue?

'; + $output .= ''; } else { include_once DRUPAL_ROOT . '/includes/form.inc'; @@ -1221,8 +1228,8 @@ function install_select_locale(&$install_state) { } return $output; } - // One language, but not the default profile or not an interactive - // installation. Assume the user knows what he is doing. + // One language, but not an interactive installation. Assume the user + // knows what he is doing. $locale = current($locales); $install_state['parameters']['locale'] = $locale->name; return; @@ -1263,7 +1270,7 @@ function install_select_locale(&$install_state) { /** * Form API array definition for language selection. */ -function install_select_locale_form($form, &$form_state, $locales, $profilename = 'standard') { +function install_select_locale_form($form, &$form_state, $locales, $profilename) { include_once DRUPAL_ROOT . '/includes/iso.inc'; $languages = _locale_get_predefined_list(); foreach ($locales as $locale) { @@ -1280,7 +1287,7 @@ function install_select_locale_form($form, &$form_state, $locales, $profilename '#parents' => array('locale') ); } - if ($profilename == 'standard') { + if (count($locales) == 1) { $form['help'] = array( '#markup' => '

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

', ); 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 07ef649..1cfe3b1 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.