From fe668abcb3612ec1b769e8b976a0aec856c21426 Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Mon, 29 Jun 2009 20:20:15 -0700
Subject: Fix for ticket 481 - Better plural handling for 2 messages with
 multiple %count variables.

---
 themes/admin_default/views/pager.html.php | 10 ++++++----
 themes/default/views/pager.html.php       | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/themes/admin_default/views/pager.html.php b/themes/admin_default/views/pager.html.php
index 8df1b030..471b4811 100644
--- a/themes/admin_default/views/pager.html.php
+++ b/themes/admin_default/views/pager.html.php
@@ -2,10 +2,12 @@
 <? // See http://docs.kohanaphp.com/libraries/pagination ?>
 <ul class="gPager">
   <? /* XXX: This message isn't easily localizable */
-     $from_to_msg = t("Items %from_number - %to_number of %total",
-                      array("from_number" => $current_first_item,
-                            "to_number" => $current_last_item,
-                            "total" => $total_items)) ?>
+     $from_to_msg = t2("Item %from_number of %count",
+                       "Items %from_number - %to_number of %count",
+                       $total_items,
+                       array("from_number" => $current_first_item,
+                             "to_number" => $current_last_item,
+                             "count" => $total_items)) ?>
   <li>
   <? if ($first_page): ?>
     <a href="<?= str_replace('{page}', 1, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
diff --git a/themes/default/views/pager.html.php b/themes/default/views/pager.html.php
index 28a39490..7cdc9bb0 100644
--- a/themes/default/views/pager.html.php
+++ b/themes/default/views/pager.html.php
@@ -2,10 +2,12 @@
 <? // See http://docs.kohanaphp.com/libraries/pagination ?>
 <ul class="gPager">
   <? /* @todo This message isn't easily localizable */
-     $from_to_msg = t("Photos %from_number - %to_number of %total",
-                      array("from_number" => $current_first_item,
-                            "to_number" => $current_last_item,
-                            "total" => $total_items)) ?>
+     $from_to_msg = t2("Photo %from_number of %count",
+                       "Photos %from_number - %to_number of %count",
+                       $total_items,
+                       array("from_number" => $current_first_item,
+                             "to_number" => $current_last_item,
+                             "count" => $total_items)) ?>
   <li>
   <? if ($first_page): ?>
     <a href="<?= str_replace('{page}', 1, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
-- 
cgit v1.2.3