? files ? locale-text-3.patch ? locale-text-4.patch ? modules/blog/.blog.module.swp ? sites/default/settings.php Index: includes/locale.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/locale.inc,v retrieving revision 1.166 diff -u -p -r1.166 locale.inc --- includes/locale.inc 26 Nov 2007 23:33:03 -0000 1.166 +++ includes/locale.inc 27 Nov 2007 16:11:44 -0000 @@ -159,7 +159,7 @@ function locale_languages_predefined_for '#title' => t('Language name'), '#default_value' => key($predefined), '#options' => $predefined, - '#description' => t('Select the desired language here, or add it below, if you are unable to find it in the list.'), + '#description' => t('Select the desired language and click the Add language button. (Use the Custom language options if your desired language does not appear in this list.)'), ); $form['language list']['submit'] = array('#type' => 'submit', '#value' => t('Add language')); return $form; @@ -240,7 +240,7 @@ function _locale_languages_common_contro '#required' => TRUE, '#default_value' => @$language->language, '#disabled' => (isset($language->language)), - '#description' => t('This should be an RFC 4646 compliant language identifier. Basic tags use a country code with an optional script or regional variant name, like "en", "en-US" and "zh-Hant".', array('@rfc4646' => 'http://www.ietf.org/rfc/rfc4646.txt')), + '#description' => t('RFC 4646 compliant language identifier. Language codes typically use a country code, and optionally, a script or regional variant name. Examples: "en", "en-US" and "zh-Hant".', array('@rfc4646' => 'http://www.ietf.org/rfc/rfc4646.txt')), ); } $form['name'] = array('#type' => 'textfield', @@ -248,7 +248,7 @@ function _locale_languages_common_contro '#maxlength' => 64, '#default_value' => @$language->name, '#required' => TRUE, - '#description' => t('Name of the language. Will be available for translation in all languages.'), + '#description' => t('Name of the language in English. Will be available for translation in all languages.'), ); $form['native'] = array('#type' => 'textfield', '#title' => t('Native language name'), @@ -261,18 +261,18 @@ function _locale_languages_common_contro '#title' => t('Path prefix'), '#maxlength' => 64, '#default_value' => @$language->prefix, - '#description' => t('Optional path prefix, for example "deutsch" for the German version. This value is not used in the "None" and "Domain" negotiation schemes. You can leave this empty if you use "Path only" negotiation and this is the default language. Changing this will break existing URLs.') + '#description' => t('Language code or other custom string for pattern matching within the path. With language negotiation set to Path prefix only or Path prefix with language fallback, this site is presented in this language when the Path prefix value matches an element in the path. For the default language, this value may be left blank. Modifying this value will break existing URLs and should be used with caution in a production environment. Example: Specifying "deutsch" as the path prefix for German results in URLs in the form "www.example.com/deutsch/node".') ); $form['domain'] = array('#type' => 'textfield', '#title' => t('Language domain'), '#maxlength' => 64, '#default_value' => @$language->domain, - '#description' => t('Optional custom domain with protocol (eg. "http://example.de" or "http://de.example.com" for the German version). This value is only used in the "Domain" negotiation mode. If left empty and in "Domain" mode, this language will not be accessible.'), + '#description' => t('Language code or other custom string for pattern matching within the domain. With language negotiation set to Domain name only, the site is presented in this language when the Language domain value matches an element in the domain. For the default language, this value may be left blank. This value must include a protocol as part of the string. Example: Specifying "http://example.de" or "http://de.example.com" as language domains for German results in URLs in the forms "http://example.de/node" and "http://de.example.com/node", respectively.'), ); $form['direction'] = array('#type' => 'radios', '#title' => t('Direction'), '#required' => TRUE, - '#description' => t('Direction of the text being written in this language.'), + '#description' => t('Direction that text in this language is presented.'), '#default_value' => @$language->direction, '#options' => array(LANGUAGE_LTR => t('Left to right'), LANGUAGE_RTL => t('Right to left')) ); @@ -444,12 +444,12 @@ function locale_languages_configure_form '#title' => t('Language negotiation'), '#type' => 'radios', '#options' => array( - LANGUAGE_NEGOTIATION_NONE => t('None. Language will be independent of visitor preferences and language prefixes or domains.'), - LANGUAGE_NEGOTIATION_PATH_DEFAULT => t('Path prefix only. If a suitable path prefix is not identified, the default language is used.'), - LANGUAGE_NEGOTIATION_PATH => t('Path prefix with language fallback. If a suitable path prefix is not identified, language is based on user preferences and browser language settings.'), - LANGUAGE_NEGOTIATION_DOMAIN => t('Domain name only. If a suitable domain name is not identified, the default language is used.')), + LANGUAGE_NEGOTIATION_NONE => t('None.'), + LANGUAGE_NEGOTIATION_PATH_DEFAULT => t('Path prefix only.'), + LANGUAGE_NEGOTIATION_PATH => t('Path prefix with language fallback.'), + LANGUAGE_NEGOTIATION_DOMAIN => t('Domain name only.')), '#default_value' => variable_get('language_negotiation', LANGUAGE_NEGOTIATION_NONE), - '#description' => t('The used language detection mode. Changing this also changes how paths are constructed, so setting a different value breaks all incoming links. Do not change on a live site without thinking twice!') + '#description' => t('Select the mechanism used to determine your site\'s presentation language. Modifying this setting may break all incoming URLs and should be used with caution in a production environment.') ); $form['submit'] = array( '#type' => 'submit', @@ -606,7 +606,7 @@ function locale_translate_import_form() $form['import']['file'] = array('#type' => 'file', '#title' => t('Language file'), '#size' => 50, - '#description' => t('A gettext Portable Object (.po) file.'), + '#description' => t('A Gettext Portable Object (.po) file.'), ); $form['import']['langcode'] = array('#type' => 'select', '#title' => t('Import into'), @@ -701,7 +701,7 @@ function locale_translate_export_po_form $form['export']['langcode'] = array('#type' => 'select', '#title' => t('Language name'), '#options' => $names, - '#description' => t('Select the language you would like to export in gettext Portable Object (.po) format.'), + '#description' => t('Select the language you would like to export in Gettext Portable Object (.po) format.'), ); $form['export']['group'] = array('#type' => 'radios', '#title' => t('Text group'), @@ -720,7 +720,7 @@ function locale_translate_export_pot_for $form['export'] = array('#type' => 'fieldset', '#title' => t('Export template'), '#collapsible' => TRUE, - '#description' => t('Generate a gettext Portable Object Template (.pot) file with all strings from the Drupal locale database.'), + '#description' => t('Generate a Gettext Portable Object Template (.pot) file with all strings from the Drupal locale database.'), ); $form['export']['group'] = array('#type' => 'radios', '#title' => t('Text group'), Index: modules/locale/locale.module =================================================================== RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v retrieving revision 1.202 diff -u -p -r1.202 locale.module --- modules/locale/locale.module 26 Nov 2007 22:34:09 -0000 1.202 +++ modules/locale/locale.module 27 Nov 2007 16:11:44 -0000 @@ -32,33 +32,41 @@ define('LANGUAGE_RTL', 1); function locale_help($path, $arg) { switch ($path) { case 'admin/help#locale': - $output = '

'. t('The locale module allows you to present your Drupal site in a language other than the default English. You can use it to set up a multi-lingual website or replace given built-in text with text which has been customized for your site. Whenever the locale module encounters text which needs to be displayed, it tries to translate it into the currently selected language. If a translation is not available, then the string is remembered, so you can look up untranslated strings easily.') .'

'; - $output .= '

'. t('The locale module provides two options for providing translations. The first is the integrated web interface, via which you can search for untranslated strings, and specify their translations. An easier and less time-consuming method is to import existing translations for your language. These translations are available as GNU gettext Portable Object files (.po files for short). Translations for many languages are available for download from the translation page.') .'

'; - $output .= '

'. t("If an existing translation does not meet your needs, the .po files are easily edited with special editing tools. The locale module's import feature allows you to add strings from such files into your site's database. The export functionality enables you to share your translations with others, generating Portable Object files from your site strings.") .'

'; + $output = '

'. t('The locale module allows your Drupal site to be presented in languages other than the default English, a key feature of multi-lingual websites. The locale module works by examining text as it is about to be displayed: when a translation of the text is available in the language to be displayed, the translation is displayed rather than the original text. When a translation is unavailable, the original text is displayed, and then stored for later review by a translator.') .'

'; + $output .= '

'. t('Translations may be provided by:') .'

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

'. t('If an existing translation pack does not meet your needs, the .po files within a pack may be modified, or new .po files may be created, using a desktop Gettext editor. The locale module\'s import feature allows translated strings found in new or modified .po files to be added to your site database. The locale module\'s export feature generates .po files from the translated strings found in your site database.', array('@import' => url('admin/build/translate/import'), '@export' => url('admin/build/translate/export'))) .'

'; $output .= '

'. t('For more information please read the configuration and customization handbook Locale page.', array('@locale' => 'http://drupal.org/handbook/modules/locale/')) .'

'; return $output; case 'admin/settings/language': - $output = '

'. t('Drupal provides support for the translation of its interface text into different languages. This page provides an overview of the installed languages. You can add a language on the add language page, or directly by importing a translation. If multiple languages are enabled, registered users will be able to set their preferred language. The site default will be used for anonymous visitors and for users without their own settings.', array('@add-language' => url('admin/settings/language/add'), '@import' => url('admin/build/translate/import'))) .'

'; - $output .= '

'. t('Drupal interface translations may be added or extended by importing an existing translation, by translating everything from scratch, or by a combination of these approaches.', array('@import' => url('admin/build/translate/import'), '@search' => url('admin/build/translate/search'))) .'

'; - $output .= '

'. t('To quickly add additional languages to your site, a number of contributed translations are available.', array('@translations' => 'http://drupal.org/project/translations')) .'

'; + $output = '

'. t('This page provides an overview of your site\'s enabled languages. If multiple languages are available and enabled, registered users may select their preferred language. The site\'s default language is used for anonymous visitors and for users who have not selected a preferred language.') .'

'; + $output .= '

'. t('For each language available on the site, use the edit link to configure language details, including name, an optional language-specific path or custom domain used in language display negotiation, and whether the language is natively presented either left-to-right or right-to-left.') .'

'; + $output .= '

' .t('Use the add language page to enable an additional language for manual translation, or the import page to add a pre-packaged set of translations (or language pack) for a specific language. A number of contributed translation packs are available on the Drupal.org translations page.', array('@add-language' => url('admin/settings/language/add'), '@search' => url('admin/build/translate/search'), '@import' => url('admin/build/translate/import'), '@translations' => 'http://drupal.org/project/translations')) .'

'; return $output; case 'admin/settings/language/add': - return '

'. t("You need to add all languages in which you would like to display the site interface. If you can't find the desired language in the quick-add dropdown, then you will need to provide the proper language code yourself. The language code may be used to negotiate with browsers and to present flags, etc., so it is important to pick a code that is standardized for the desired language. You can also add a language by importing a translation.", array("@import" => url("admin/build/translate/import"))) .'

'; + return '

'. t("Add all languages in which the site should be displayed. If your desired language is not available for selection 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.) Languages may also be added by importing pre-packaged translation packs.", array("@import" => url("admin/build/translate/import"))) .'

'; case 'admin/settings/language/configure': - return '

'. t('The language used to display a web page is determined with a negotiation algorithm. You can choose how this algorithm should work. By default, there is no negotiation and the default language is used. You can use path prefixes (like "de" and "it" for German and Italian content) with different fallback options, so you can have web addresses like /de/contact and /it/contact. Alternatively you can use custom domains like de.example.com and it.example.com. Customize path prefixes and set domain names on the language editing pages.', array('@languages' => url('admin/settings/language'))) .'

'; + $output = '

'. t('Language negotiation settings determine how the site\'s presentation language is determined. Available options include:') .'

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

'. t('The strings to be matched on either the path or domain name may be set on the language\'s editing page. In the absence of an appropriate match, the site is displayed in the default language.', array('@languages' => url('admin/settings/language'))) .'

'; + return $output; case 'admin/build/translate': - $output = '

'. t("This page provides an overview of interface translation on the site. Drupal groups all translatable strings in so called 'text groups'. Modules may provide additional to the 'built-in interface' default, to separate strings used for other purposes, allowing you to focus your translation efforts on the groups of text you care most about. For example, a translation team could choose not to fully translate a text group that includes less important data, being still able to ensure that built-in interface is always fully translated.") .'

'; - $output .= '

'. t('To quickly add additional languages to your site, a number of contributed translations are available.', array('@translations' => 'http://drupal.org/project/translations')) .'

'; + $output = '

'. t('This page provides an overview of available site translations. Drupal displays translatable strings in text groups; modules may define additional text groups containing other categories of translatable strings. Because text groups provide a method of grouping related strings, they are often used to focus translation efforts on specific areas of the Drupal interface.') .'

'; + $output .= '

'. t('To quickly add additional languages to your site, a number of contributed translations are available and can be imported.', array('@translations' => 'http://drupal.org/project/translations', '@import' => url('admin/build/translate/import'))) .'

'; return $output; case 'admin/build/translate/import': - return '

'. t('This page allows you to import a translation provided in the gettext Portable Object (.po) format. The easiest way to get your site translated is to obtain an existing Drupal translation and to import it. You can find existing translations on the Drupal translation page. Note that importing a translation file might take a while.', array('@translations' => 'http://drupal.org/project/translations')) .'

'; + return '

'. t('This page allows for the import of Gettext Portable Object (.po) files. Gettext files are normally contained within a translation pack. Each translation pack enables the display of a specific Drupal version in a specific language, and downloading and importing these packs is the simplest method of providing a translation of your site interface. Although not all languages are available for every version of Drupal, many language packs are available for download on the Drupal translation page. Note that importing a translation file may be a lengthy process.', array('@translations' => 'http://drupal.org/project/translations')) .'

'; case 'admin/build/translate/export': - return '

'. t('This page allows you to export Drupal strings. The first option is to export a translation so it can be shared. The second option generates a translation template, which contains all Drupal strings, but without their translations. You can use this template to start a new translation using various software packages designed for this task.') .'

'; + return '

'. t('This page allows for the export of the translated strings used by your site in Gettext Portable Object (.po) format. Exports may include the original string and its translation (used to share translations with others) or may include only the original strings (used to edit or create a translation with a Gettext translation editor).') .'

'; case 'admin/build/translate/search': - return '

'. t('It is often convenient to get the strings from your setup on the export page, and use a desktop Gettext translation editor to edit the translations. On this page you can search in the translated and untranslated strings, and the default English texts provided by Drupal.', array('@export' => url('admin/build/translate/export'))) .'

'; + return '

'. t('This page allows a translator to search for specific translated and untranslated strings, and is used when building a new or editing an existing translation. (Note: For translation tasks involving many strings, it may be more convenient to export strings for editing in a desktop Gettext translation editor.) Searches may be limited to strings found within a specific text group or in a specific language.', array('@export' => url('admin/build/translate/export'))) .'

'; case 'admin/build/block/configure': if ($arg[4] == 'locale' && $arg[5] == 0) { - return '

'. t("This block is only shown if you have at least two languages enabled and you have a language negotiation setting other than 'none', so you have different web addresses for different language versions.", array('@languages' => url('admin/settings/language'), '@configuration' => url('admin/settings/language/configure'))) .'

'; + return '

'. t('This block is only shown if at least two languages are enabled and language negotiation is set to something other than none.', array('@languages' => url('admin/settings/language'), '@configuration' => url('admin/settings/language/configure'))) .'

'; } break; } @@ -239,7 +247,7 @@ function locale_form_alter(&$form, $form '#options' => array('' => t('All languages')) + locale_language_list('name'), '#default_value' => $form['language']['#value'], '#weight' => -10, - '#description' => t('Path aliases added for languages take precedence over path aliases added for all languages for the same Drupal path.'), + '#description' => t('A path alias set for a specific language will always be used when displaying this page in that language, and takes precedence over path aliases set for All languages.'), ); break;