summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorwebchick <webchick@24967.no-reply.drupal.org>2012-03-26 22:25:40 -0700
committerwebchick <webchick@24967.no-reply.drupal.org>2012-03-26 22:25:40 -0700
commit0932803a2c0a61924209dfe277dec32bced63c0c (patch)
treeb39ef4cb8019dc2e5e272cd52c3349789c5e3b38 /includes
parent505974084d248ebcbb225fe328409ef59a9d4e5a (diff)
downloadbrdo-0932803a2c0a61924209dfe277dec32bced63c0c.tar.gz
brdo-0932803a2c0a61924209dfe277dec32bced63c0c.tar.bz2
Issue #1221276 by gumanist, fietserwin, Gábor Hojtsy, sun, kalman.hosszu: Fixed locale_get_plural() only works for a single language within a request and does not work for English.
Diffstat (limited to 'includes')
-rw-r--r--includes/common.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/includes/common.inc b/includes/common.inc
index f153066e5..cb77e330d 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -1734,7 +1734,8 @@ function format_plural($count, $singular, $plural, array $args = array(), array
// Get the plural index through the gettext formula.
$index = (function_exists('locale_get_plural')) ? locale_get_plural($count, isset($options['langcode']) ? $options['langcode'] : NULL) : -1;
- // Backwards compatibility.
+ // If the index cannot be computed, use the plural as a fallback (which
+ // allows for most flexiblity with the replaceable @count value).
if ($index < 0) {
return t($plural, $args, $options);
}