Simplifying the way t() is called. Refactoring localization function t($message, $options=array()) into 2 separate functions:

- the new t($message, $options=array()) is for simple strings, optionally with placeholder interpolation.
- t2($singular, $plural, $count, $options=array()) is for plurals.
This commit is contained in:
Andy Staudacher
2009-01-15 09:30:15 +00:00
parent 0bbde9e059
commit e53916dd06
5 changed files with 60 additions and 38 deletions

View File

@@ -29,27 +29,27 @@ class Admin_Comments_Controller extends Admin_Controller {
$view->content->menu = Menu::factory("root")
->append(Menu::factory("link")
->id("unpublished")
->label(t(array("one" => "Awaiting Moderation ({{count}})",
"other" => "Awaiting Moderation ({{count}})"),
array("count" => $view->content->unpublished->count())))
->label(t2("Awaiting Moderation ({{count}})",
"Awaiting Moderation ({{count}})",
$view->content->unpublished->count()))
->url(url::site("admin/comments/queue/unpublished")))
->append(Menu::factory("link")
->id("published")
->label(t(array("one" => "Approved ({{count}})",
"other" => "Approved ({{count}})"),
array("count" => $view->content->published->count())))
->label(t2("Approved ({{count}})",
"Approved ({{count}})",
$view->content->published->count()))
->url(url::site("admin/comments/queue/published")))
->append(Menu::factory("link")
->id("spam")
->label(t(array("one" => "Spam ({{count}})",
"other" => "Spam ({{count}})"),
array("count" => $view->content->spam->count())))
->label(t2("Spam ({{count}})",
"Spam ({{count}})",
$view->content->spam->count()))
->url(url::site("admin/comments/queue/spam")))
->append(Menu::factory("link")
->id("deleted")
->label(t(array("one" => "Recently Deleted ({{count}})",
"other" => "Recently Deleted ({{count}})"),
array("count" => $view->content->deleted->count())))
->label(t2("Recently Deleted ({{count}})",
"Recently Deleted ({{count}})",
$view->content->deleted->count()))
->url(url::site("admin/comments/queue/deleted")));
return $view;
}