From da3c19b36c5b45cd2a395e5930fce27f04460918 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Hojtsy?= <gabor@hojtsy.hu>
Date: Wed, 29 Aug 2007 17:28:02 +0000
Subject: #170334 by JirkaRybka: allow @count to be used in singular
 format_plural() values too

---
 includes/common.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'includes')

diff --git a/includes/common.inc b/includes/common.inc
index 1a2d79c30..3619c325b 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -955,10 +955,10 @@ function format_xml_elements($array) {
  *   A translated string.
  */
 function format_plural($count, $singular, $plural, $args = array(), $langcode = NULL) {
+  $args['@count'] = $count;
   if ($count == 1) {
-    return t($singular, $args);
+    return t($singular, $args, $langcode);
   }
-  $args['@count'] = $count;
 
   // get the plural index through the gettext formula
   $index = (function_exists('locale_get_plural')) ? locale_get_plural($count, $langcode) : -1;
-- 
cgit v1.2.3