From e4a9b19bf9997f46203fbc18c696c63703a72625 Mon Sep 17 00:00:00 2001 From: Andy Staudacher Date: Thu, 15 Jan 2009 10:02:41 +0000 Subject: Changing t() placeholder syntax from {{replace_me}} to %replace_me. --- modules/akismet/helpers/akismet.php | 2 +- modules/comment/controllers/admin_comments.php | 16 ++++++++-------- .../comment/views/admin_block_recent_comments.html.php | 2 +- modules/comment/views/admin_comments.html.php | 6 +++--- modules/comment/views/comments.html.php | 2 +- modules/info/helpers/info_block.php | 4 ++-- modules/media_rss/controllers/media_rss.php | 2 +- modules/tag/controllers/admin_tags.php | 6 +++--- modules/tag/helpers/tag.php | 2 +- modules/tag/views/admin_tags.html.php | 4 ++-- modules/user/controllers/admin_groups.php | 8 ++++---- modules/user/controllers/admin_users.php | 8 ++++---- modules/user/controllers/login.php | 4 ++-- modules/user/controllers/logout.php | 2 +- modules/user/helpers/group.php | 2 +- modules/user/helpers/user.php | 4 ++-- modules/user/views/admin_groups.html.php | 2 +- modules/watermark/views/admin_watermarks.html.php | 4 ++-- 18 files changed, 40 insertions(+), 40 deletions(-) (limited to 'modules') diff --git a/modules/akismet/helpers/akismet.php b/modules/akismet/helpers/akismet.php index d717268b..d46556de 100644 --- a/modules/akismet/helpers/akismet.php +++ b/modules/akismet/helpers/akismet.php @@ -93,7 +93,7 @@ class akismet_Core { $api_key = module::get_var("akismet", "api_key"); if (empty($api_key)) { site_status::warning( - t("Akismet is not quite ready! Please provide an API Key", + t("Akismet is not quite ready! Please provide an API Key", array("url" => url::site("admin/akismet"))), "akismet_config"); } else { diff --git a/modules/comment/controllers/admin_comments.php b/modules/comment/controllers/admin_comments.php index d1666d41..68ede43d 100644 --- a/modules/comment/controllers/admin_comments.php +++ b/modules/comment/controllers/admin_comments.php @@ -29,26 +29,26 @@ class Admin_Comments_Controller extends Admin_Controller { $view->content->menu = Menu::factory("root") ->append(Menu::factory("link") ->id("unpublished") - ->label(t2("Awaiting Moderation ({{count}})", - "Awaiting Moderation ({{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(t2("Approved ({{count}})", - "Approved ({{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(t2("Spam ({{count}})", - "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(t2("Recently Deleted ({{count}})", - "Recently Deleted ({{count}})", + ->label(t2("Recently Deleted (%count)", + "Recently Deleted (%count)", $view->content->deleted->count())) ->url(url::site("admin/comments/queue/deleted"))); return $view; diff --git a/modules/comment/views/admin_block_recent_comments.html.php b/modules/comment/views/admin_block_recent_comments.html.php index 78e22766..39d39929 100644 --- a/modules/comment/views/admin_block_recent_comments.html.php +++ b/modules/comment/views/admin_block_recent_comments.html.php @@ -8,7 +8,7 @@ width="40" height="40" /> created) ?> - {{author_name}} said {{comment_text}}", + %author_name said %comment_text", array("author_name" => $comment->author_name(), "comment_text" => text::limit_words($comment->text, 50))); ?> diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php index 83672bc1..c5bbc2b6 100644 --- a/modules/comment/views/admin_comments.html.php +++ b/modules/comment/views/admin_comments.html.php @@ -51,15 +51,15 @@
0): ?>

-

count()): ?> count()) ?>

diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php index 111b12bd..ec7530c4 100644 --- a/modules/comment/views/comments.html.php +++ b/modules/comment/views/comments.html.php @@ -11,7 +11,7 @@ width="40" height="40" /> - {{name}} said", + %name said", array("date" => date("Y-M-d H:i:s", $comment->created), "name" => $comment->author_name())); ?>

diff --git a/modules/info/helpers/info_block.php b/modules/info/helpers/info_block.php index 3bc51c73..c832b4f6 100644 --- a/modules/info/helpers/info_block.php +++ b/modules/info/helpers/info_block.php @@ -32,12 +32,12 @@ class info_block_Core { $results = ""; if ($item->view_count) { $results .= "
  • "; - $results .= t("Views: {{view_count}}", array("view_count" => $item->view_count)); + $results .= t("Views: %view_count", array("view_count" => $item->view_count)); $results .= "
    • "; } if ($item->owner) { $results .= "
  • "; - $results .= t("By: {{owner_name}}", array("owner_name" => "{$item->owner->name}")); + $results .= t("By: %owner_name", array("owner_name" => "{$item->owner->name}")); $results .= "
    • "; } return $results; diff --git a/modules/media_rss/controllers/media_rss.php b/modules/media_rss/controllers/media_rss.php index fbc3a29b..1bc34557 100644 --- a/modules/media_rss/controllers/media_rss.php +++ b/modules/media_rss/controllers/media_rss.php @@ -85,7 +85,7 @@ class Media_RSS_Controller extends Controller { $view = new View("feed.mrss"); $view->title = $tag->name; $view->link = url::abs_site("tags/{$tag->id}"); - $view->description = t("Photos related to {{tag_name}}", array("tag_name" => $tag->name)); + $view->description = t("Photos related to %tag_name", array("tag_name" => $tag->name)); $view->feed_link = url::abs_site("media_rss/tags/{$tag->id}"); $view->children = $children; diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php index b30f5b95..1d800fce 100644 --- a/modules/tag/controllers/admin_tags.php +++ b/modules/tag/controllers/admin_tags.php @@ -52,8 +52,8 @@ class Admin_Tags_Controller extends Admin_Controller { $name = $tag->name; Database::instance()->query("DELETE from `items_tags` where `tag_id` = $tag->id"); $tag->delete(); - message::success(t("Deleted tag {{tag_name}}", array("tag_name" => $name))); - log::success("tags", t("Deleted tag {{tag_name}}", array("tag_name" => $name))); + message::success(t("Deleted tag %tag_name", array("tag_name" => $name))); + log::success("tags", t("Deleted tag %tag_name", array("tag_name" => $name))); print json_encode( array("result" => "success", @@ -96,7 +96,7 @@ class Admin_Tags_Controller extends Admin_Controller { $tag->name = $new_name; $tag->save(); - $message = t("Renamed tag {{old_name}} to {{new_name}}", + $message = t("Renamed tag %old_name to %new_name", array("old_name" => $old_name, "new_name" => $tag->name)); message::success($message); log::success("tags", $message); diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php index 98c904d0..7dec6809 100644 --- a/modules/tag/helpers/tag.php +++ b/modules/tag/helpers/tag.php @@ -97,7 +97,7 @@ class tag_Core { static function get_delete_form($tag) { $form = new Forge("admin/tags/delete/$tag->id", "", "post", array("id" => "gDeleteTagForm")); - $group = $form->group("delete_tag")->label(t("Really delete tag {{tag_name}}?", array("tag_name" => $tag->name))); + $group = $form->group("delete_tag")->label(t("Really delete tag %tag_name?", array("tag_name" => $tag->name))); $group->submit("")->value(t("Delete Tag")); $form->add_rules_from(ORM::factory("tag")); return $form; diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php index 12f724b2..5e9613b1 100644 --- a/modules/tag/views/admin_tags.html.php +++ b/modules/tag/views/admin_tags.html.php @@ -25,13 +25,13 @@