Changing t() placeholder syntax from {{replace_me}} to %replace_me.

4 files changed, 13 insertions, 13 deletions

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" />
     <?= date("Y-M-d H:i:s", $comment->created) ?>
-    <?= t("<a href=#>{{author_name}}</a> said <em>{{comment_text}}</em>",
+    <?= t("<a href=#>%author_name</a> said <em>%comment_text</em>",
           array("author_name" => $comment->author_name(),
                 "comment_text" => text::limit_words($comment->text, 50))); ?>
   </li>
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 @@
   <div>
     <? if ($spam_caught > 0): ?>
     <p>
-      <?= t2("Gallery has caught {{count}} spam for you since you installed spam filtering.",
-             "Gallery has caught {{count}} spam for you since you installed spam filtering.",
+      <?= t2("Gallery has caught %count spam for you since you installed spam filtering.",
+             "Gallery has caught %count spam for you since you installed spam filtering.",
              $spam_caught) ?>
     </p>
     <? endif ?>
     <p>
       <? if ($spam->count()): ?>
       <?= t2("There is currently one comment in your spam queue.  You can delete it with a single click, but there is no undo operation so you may want to check the message first to make sure that it really is spam.",
-             "There are currently {{count}} comments in your spam queue.  You can delete them all with a single click, but there is no undo operation so you may want to check the messages first to make sure that they really are spam.  All spam messages will be deleted after 7 days automatically.",
+             "There are currently %count comments in your spam queue.  You can delete them all with a single click, but there is no undo operation so you may want to check the messages first to make sure that they really are spam.  All spam messages will be deleted after 7 days automatically.",
              $spam->count()) ?>
     </p>
     <p>
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" />
       </a>
-      <?= t("on {{date}} <a href=#>{{name}}</a> said",
+      <?= t("on %date <a href=#>%name</a> said",
             array("date" => date("Y-M-d H:i:s", $comment->created),
                   "name" => $comment->author_name())); ?>
     </p>