diff options
| author | Andy Staudacher <andy.st@gmail.com> | 2009-06-29 20:20:15 -0700 |
|---|---|---|
| committer | Andy Staudacher <andy.st@gmail.com> | 2009-06-29 20:20:15 -0700 |
| commit | fe668abcb3612ec1b769e8b976a0aec856c21426 (patch) | |
| tree | f8d12c2087e5504e0b14d31139eb29d1886d6a90 | |
| parent | 06172ecdb9e7a4acf158387c4804b6424e8b1b15 (diff) | |
Fix for ticket 481 - Better plural handling for 2 messages with multiple %count variables.
| -rw-r--r-- | themes/admin_default/views/pager.html.php | 10 | ||||
| -rw-r--r-- | 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"> |