Go to the @contact-page.
', array('@contact-page' => l(t('contact page'), 'contact'))); + * @endcode + * + * Here is an example of t() used correctly: + * @code + * $output .= '' . t('Go to the contact page.', array('@contact-page' => url('contact'))) . '
'; + * @endcode + * + * Also avoid escaping quotation marks wherever possible. + * + * Incorrect: + * @code + * $output .= t('Don\'t click me.'); + * @endcode + * + * Correct: + * @code + * $output .= t("Don't click me."); + * @endcode + * + * @param $string + * A string containing the English string to translate. + * @param $args + * An associative array of replacements to make after translation. Incidences + * of any key in this array are replaced with the corresponding value. + * Based on the first character of the key, the value is escaped and/or themed: + * - !variable: inserted as is + * - @variable: escape plain text to HTML (check_plain) + * - %variable: escape text and theme as a placeholder for user-submitted + * content (check_plain + theme_placeholder) + * @param $langcode + * Optional language code to translate to a language other than what is used + * to display the page. + * @return + * The translated string. + */ +function t($string, $args = array(), $langcode = NULL) { + static $t_exists; + if (!$t_exists && function_exists('t') && drupal_get_bootstrap_phase() >= DRUPAL_BOOTSTRAP_LANGUAGE) { + $t_exists = TRUE; + } + if ($t_exists) { + return _t($string, $args, $langcode); + } + if (function_exists('st')) { + return st($string, $args, $langcode); + } +} === modified file 'includes/common.inc' --- includes/common.inc 2008-10-15 16:05:51 +0000 +++ includes/common.inc 2008-10-19 19:33:16 +0000 @@ -682,7 +682,7 @@ function _drupal_log_error($type, $messa drupal_set_message(t('@type: %message in %function (line %line of %file).', array('@type' => $type, '%message' => $message, '%function' => $caller['function'], '%line' => $caller['line'], '%file' => $caller['file'])), 'error'); } - watchdog('php', '%type: %message in %function (line %line of %file).', array('%type' => $type, '%message' => $message, '%function' => $caller['function'], '%file' => $caller['file'], '%line' => $caller['line']), WATCHDOG_ERROR); + watchdog('php', '%type: %message in %function (line %line of %file).', array('%type' => $type, '%message' => $message, '%function' => $caller['function'], '%file' => $caller['file'], '%line' => $caller['line']), WATCHDOG_ERROR); if ($fatal) { drupal_set_header($_SERVER['SERVER_PROTOCOL'] . ' Service unavailable'); @@ -691,7 +691,7 @@ function _drupal_log_error($type, $messa print theme('page', t('The website encountered an unexpected error. Please try again later.'), FALSE); } else { - print theme('maintenance_page', t('The website encountered an unexpected error. Please try again later.'), FALSE); + print theme('maintenance_page', t('The website encountered an unexpected error. Please try again later.'), FALSE); } exit; } @@ -774,104 +774,9 @@ function fix_gpc_magic() { } /** - * Translate strings to the page language or a given language. - * - * All human-readable text that will be displayed somewhere within a page should - * be run through the t() function. - * - * Examples: - * @code - * if (!$info || !$info['extension']) { - * form_set_error('picture_upload', t('The uploaded file was not an image.')); - * } - * - * $form['submit'] = array( - * '#type' => 'submit', - * '#value' => t('Log in'), - * ); - * @endcode - * - * Any text within t() can be extracted by translators and changed into - * the equivalent text in their native language. - * - * Special variables called "placeholders" are used to signal dynamic - * information in a string which should not be translated. Placeholders - * can also be used for text that may change from time to time - * (such as link paths) to be changed without requiring updates to translations. - * - * For example: - * @code - * $output = t('There are currently %members and %visitors online.', array( - * '%members' => format_plural($total_users, '1 user', '@count users'), - * '%visitors' => format_plural($guests->count, '1 guest', '@count guests'))); - * @endcode - * - * There are three styles of placeholders: - * - !variable, which indicates that the text should be inserted as-is. This is - * useful for inserting variables into things like e-mail. - * @code - * $message[] = t("If you don't want to receive such e-mails, you can change your settings at !url.", array('!url' => url("user/$account->uid", array('absolute' => TRUE)))); - * @endcode - * - * - @variable, which indicates that the text should be run through check_plain, - * to escape HTML characters. Use this for any output that's displayed within - * a Drupal page. - * @code - * drupal_set_title($title = t("@name's blog", array('@name' => $account->name)), PASS_THROUGH); - * @endcode - * - * - %variable, which indicates that the string should be HTML escaped and - * highlighted with theme_placeholder() which shows up by default as - * emphasized. - * @code - * $message = t('%name-from sent %name-to an e-mail.', array('%name-from' => $user->name, '%name-to' => $account->name)); - * @endcode - * - * When using t(), try to put entire sentences and strings in one t() call. - * This makes it easier for translators, as it provides context as to what each - * word refers to. HTML markup within translation strings is allowed, but should - * be avoided if possible. The exception are embedded links; link titles add a - * context for translators, so should be kept in the main string. - * - * Here is an example of incorrect usage of t(): - * @code - * $output .= t('Go to the @contact-page.
', array('@contact-page' => l(t('contact page'), 'contact'))); - * @endcode - * - * Here is an example of t() used correctly: - * @code - * $output .= '' . t('Go to the contact page.', array('@contact-page' => url('contact'))) . '
'; - * @endcode - * - * Also avoid escaping quotation marks wherever possible. - * - * Incorrect: - * @code - * $output .= t('Don\'t click me.'); - * @endcode - * - * Correct: - * @code - * $output .= t("Don't click me."); - * @endcode - * - * @param $string - * A string containing the English string to translate. - * @param $args - * An associative array of replacements to make after translation. Incidences - * of any key in this array are replaced with the corresponding value. - * Based on the first character of the key, the value is escaped and/or themed: - * - !variable: inserted as is - * - @variable: escape plain text to HTML (check_plain) - * - %variable: escape text and theme as a placeholder for user-submitted - * content (check_plain + theme_placeholder) - * @param $langcode - * Optional language code to translate to a language other than what is used - * to display the page. - * @return - * The translated string. + * Helper for t(). @see t() */ -function t($string, $args = array(), $langcode = NULL) { +function _t($string, $args = array(), $langcode = NULL) { global $language; static $custom_strings; @@ -2773,7 +2678,7 @@ function drupal_system_listing($mask, $d /** * Hands off structured Drupal arrays to type-specific *_alter implementations. - * + * * This dispatch function hands off structured Drupal arrays to type-specific * *_alter implementations. It ensures a consistent interface for all altering * operations.