Merge branch 'master' of git@github.com:gallery/gallery3

gallery · Jun 30, 2009 · b78bfa5 · b78bfa5
2 parents df84861 + e3b4c6a
commit b78bfa5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git 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
@@ -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">