' . t('Add all languages 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.') . '
'; case 'admin/config/regional/language/configure': - $output = '' . t("Language negotiation settings determine the site's content and presentation languages. For both language types there is a list of language detection methods which can be used to configure the desired language negotiation logic. Each detection method can be dragged to gain a higher priority, but it must be enabled to affect the language negotiation process. If a language detection method is applied then all the lower ones are ignored, otherwise the following one will be taken into account. Some lanaguage detection methods provide a configuration page to further specify their behavior. The default detection method is always applied, so anything below it is always ignored. Modifying this setting may break all incoming URLs and should be used with caution in a production environment.") . '
'; - $output .= '' . t('Available options include:') .'
'; - $output .= '' . t("Determine which languages to use for content and for the administrative interface. Drag the detection methods into the order they should test for languages. The first method that gets a result will set the language for the relevant part of the site. Changing these settings may break all incoming URLs, use with caution in a production environment.") . '
'; + return $output; + case 'admin/config/regional/language/configure/url': + $output = '' . t('Determine the language by examining the URL. Example: "example.com/de/contact" sets language to German based on the use of "de" as the path prefix. "http://de.example.com/contact" sets presentation language to German based on the use of "http://de.example.com" in the domain.') . '
'; + return $output; + case 'admin/config/regional/language/configure/session': + $output = '' . t('Determine the language from a request/session parameter. Example: "example.com?language=de" sets language to German based on the use of "de" within the "language" parameter.') . '
'; return $output; case 'admin/config/regional/translate': $output = '' . t('This page provides an overview of available translatable strings. Drupal displays translatable strings in text groups; modules may define additional text groups containing other 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.') . '
'; @@ -521,7 +524,7 @@ 'file' => $file, 'weight' => -8, 'name' => t('URL'), - 'description' => t('The language is determined from the URL (Path prefix or domain).'), + 'description' => t('Determine the language from the URL (Path prefix or domain).'), 'config' => 'admin/config/regional/language/configure/url', ); @@ -543,7 +546,7 @@ 'file' => $file, 'weight' => -4, 'name' => t('User'), - 'description' => t('The language is determined from the language preference set in the user account.'), + 'description' => t("Show in this user's language preference."), ); $providers[LOCALE_LANGUAGE_NEGOTIATION_BROWSER] = array( Index: includes/locale.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/locale.inc,v retrieving revision 1.234 diff -u -r1.234 locale.inc --- includes/locale.inc 3 Nov 2009 05:27:18 -0000 1.234 +++ includes/locale.inc 1 Dec 2009 22:29:51 -0000 @@ -712,14 +712,13 @@ $form = array(); $form['locale_language_negotiation_url_part'] = array( - '#title' => t('URL language indicator'), + '#title' => t('The part of the URL that will determine the language.'), '#type' => 'radios', '#options' => array( LOCALE_LANGUAGE_NEGOTIATION_URL_PREFIX => t('Path prefix'), LOCALE_LANGUAGE_NEGOTIATION_URL_DOMAIN => t('Domain'), ), '#default_value' => variable_get('locale_language_negotiation_url_part', LOCALE_LANGUAGE_NEGOTIATION_URL_PREFIX), - '#description' => t('Select which part of the URL will determine the language.'), ); $form['#redirect'] = 'admin/config/regional/language/configure'; @@ -737,7 +736,7 @@ '#title' => t('Request/session parameter'), '#type' => 'textfield', '#default_value' => variable_get('locale_language_negotiation_session_param', 'language'), - '#description' => t('This value will be the name of the request/session parameter which will be used to determine the desired language.'), + '#description' => t('Name of the request/session parameter used to determine the desired language.'), ); $form['#redirect'] = 'admin/config/regional/language/configure';