summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorwebchick <webchick@24967.no-reply.drupal.org>2011-12-24 18:07:37 -0800
committerwebchick <webchick@24967.no-reply.drupal.org>2011-12-24 18:07:37 -0800
commit862cfa277446efe0125bd3e40335bcbbebf55299 (patch)
tree01bed486474d9953f0114cbb5ba4c1da191c6d02 /includes
parent0f48b801736782736cad9281ad57bfa7a23e272a (diff)
downloadbrdo-862cfa277446efe0125bd3e40335bcbbebf55299.tar.gz
brdo-862cfa277446efe0125bd3e40335bcbbebf55299.tar.bz2
Issue #1359326 by xjm: Fixed t() documentation does not clearly indicate that options are documented in format_string() docs.
Diffstat (limited to 'includes')
-rw-r--r--includes/bootstrap.inc14
1 files changed, 8 insertions, 6 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 7165958f3..ca12b33dd 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -1427,10 +1427,10 @@ function drupal_unpack($obj, $field = 'data') {
* $text = t("@name's blog", array('@name' => format_username($account)));
* @endcode
* Basically, you can put variables like @name into your string, and t() will
- * substitute their sanitized values at translation time (see $args below or
- * the Localization API pages referenced above for details). Translators can
- * then rearrange the string as necessary for the language (e.g., in Spanish,
- * it might be "blog de @name").
+ * substitute their sanitized values at translation time. (See the
+ * Localization API pages referenced above and the documentation of
+ * format_string() for details.) Translators can then rearrange the string as
+ * necessary for the language (e.g., in Spanish, it might be "blog de @name").
*
* During the Drupal installation phase, some resources used by t() wil not be
* available to code that needs localization. See st() and get_t() for
@@ -1439,8 +1439,9 @@ function drupal_unpack($obj, $field = 'data') {
* @param $string
* A string containing the English string to translate.
* @param $args
- * An associative array of replacements to make after translation.
- * See format_string().
+ * An associative array of replacements to make after translation. Based
+ * on the first character of the key, the value is escaped and/or themed.
+ * See format_string() for details.
* @param $options
* An associative array of additional options, with the following elements:
* - 'langcode' (defaults to the current language): The language code to
@@ -1453,6 +1454,7 @@ function drupal_unpack($obj, $field = 'data') {
*
* @see st()
* @see get_t()
+ * @see format_string()
* @ingroup sanitization
*/
function t($string, array $args = array(), array $options = array()) {