? drupal.install-language.88.patch ? drupal.install-language.90.patch ? profiles/minimal/translations ? profiles/standard/translations ? sites/default/files ? sites/default/private ? sites/default/settings.php Index: INSTALL.txt =================================================================== RCS file: /cvs/drupal/drupal/INSTALL.txt,v retrieving revision 1.82 diff -u -p -r1.82 INSTALL.txt --- INSTALL.txt 14 Sep 2010 18:46:40 -0000 1.82 +++ INSTALL.txt 14 Sep 2010 20:05:14 -0000 @@ -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. + Optionally, to install Drupal in your language: + + - Download a translation from the translation server: + http://localize.drupal.org/download + Make sure to download the translation file for your version of Drupal. + + - 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 this will be the standard installation profile's + directory): + + /profiles/standard/translations/ + + - Reload the language selection page after adding translations. + + For detailed instructions, visit http://drupal.org/localize. You may also + install Drupal in English and install additional languages later. 2. IF NECESSARY, CREATE THE CONFIGURATION FILE AND GRANT WRITE PERMISSIONS Index: includes/install.core.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/install.core.inc,v retrieving revision 1.29 diff -u -p -r1.29 install.core.inc --- includes/install.core.inc 14 Sep 2010 18:46:40 -0000 1.29 +++ includes/install.core.inc 14 Sep 2010 20:05:15 -0000 @@ -1203,16 +1203,29 @@ function install_select_locale(&$install // 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 .= '
  2. ' . 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', + )) . '
    3. '; + $output .= '
  3. ' . st('Reload the language selection page after adding translations.') . '
    4. '; + $output .= '
'; $output .= '

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

'; - $output .= ''; + $output .= ''; } else { include_once DRUPAL_ROOT . '/includes/form.inc'; Index: modules/locale/locale.module =================================================================== RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v retrieving revision 1.298 diff -u -p -r1.298 locale.module --- modules/locale/locale.module 9 Sep 2010 23:01:48 -0000 1.298 +++ modules/locale/locale.module 14 Sep 2010 20:05:15 -0000 @@ -56,15 +56,15 @@ function locale_help($path, $arg) { $output .= '
' . t('Translations of text in the Drupal interface may be provided by:'); $output .= '
'; $output .= '
' . t('Configuring a multilingual site') . '
'; $output .= '
' . t("Language negotiation allows your site to automatically change language based on the domain or path used for each request. Users may (optionally) select their preferred language on their My account page, and your site can be configured to honor a web browser's preferred language settings. Site content can be translated using the Content translation module.", array('@content-help' => url('admin/help/translation'))) . '
'; $output .= ''; return $output; case 'admin/config/regional/language': - $output = '

' . t('With multiple languages enabled, interface text can be translated, registered users may select their preferred language, and authors can assign a specific language to content. Download contributed translations from Drupal.org.', array('@translations' => 'http://drupal.org/project/translations')) . '

'; + $output = '

' . t('With multiple languages enabled, interface text can be translated, registered users may select their preferred language, and authors can assign a specific language to content. Download contributed translations from Drupal.org.', array('@translations' => 'http://localize.drupal.org/download')) . '

'; return $output; case 'admin/config/regional/language/add': return '

' . t('Add a language to be supported by your site. If your desired language is not available in the Language name drop-down, click Custom language and provide a language code and other details manually. When providing a language code manually, be sure to enter a standardized language code, since this code may be used by browsers to determine an appropriate display language.') . '

'; @@ -80,7 +80,7 @@ function locale_help($path, $arg) { return $output; case 'admin/config/regional/translate/import': $output = '

' . t('This page imports the translated strings contained in an individual Gettext Portable Object (.po) file. Normally distributed as part of a translation package (each translation package may contain several .po files), a .po file may need to be imported after offline editing in a Gettext translation editor. Importing an individual .po file may be a lengthy process.') . '

'; - $output .= '

' . t('Note that the .po files within a translation package are imported automatically (if available) when new modules or themes are enabled, or as new languages are added. Since this page only allows the import of one .po file at a time, it may be simpler to download and extract a translation package into your Drupal installation directory and add the language (which automatically imports all .po files within the package). Translation packages are available for download on the Drupal translation page.', array('@language-add' => url('admin/config/regional/language/add'), '@translations' => 'http://drupal.org/project/translations')) . '

'; + $output .= '

' . t('Note that the .po files within a translation package are imported automatically (if available) when new modules or themes are enabled, or as new languages are added. Since this page only allows the import of one .po file at a time, it may be simpler to download and extract a translation package into your Drupal installation directory and add the language (which automatically imports all .po files within the package). Translation packages are available for download on the Drupal translation page.', array('@language-add' => url('admin/config/regional/language/add'), '@translations' => 'http://localize.drupal.org/download')) . '

'; return $output; case 'admin/config/regional/translate/export': return '

' . t('This page exports the translated strings used by your site. An export file may be in Gettext Portable Object (.po) form, which includes both the original string and the translation (used to share translations with others), or in Gettext Portable Object Template (.pot) form, which includes the original strings only (used to create new translations with a Gettext translation editor).') . '

'; Index: themes/seven/style.css =================================================================== RCS file: /cvs/drupal/drupal/themes/seven/style.css,v retrieving revision 1.69 diff -u -p -r1.69 style.css --- themes/seven/style.css 13 Sep 2010 00:59:47 -0000 1.69 +++ themes/seven/style.css 14 Sep 2010 20:05:15 -0000 @@ -139,6 +139,10 @@ pre, kbd { font-size: 1.231em; } +pre { + margin: 0.5em 0; + white-space: pre-wrap; +} /** * Skip link.