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

18 files changed, 40 insertions, 40 deletions

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 <a href=\"{{url}}\">API Key</a>",
+        t("Akismet is not quite ready!  Please provide an <a href=\"%url\">API Key</a>",
           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" />
     <?= 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>
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 .= "<li>";
-      $results .= t("Views: {{view_count}}", array("view_count" => $item->view_count));
+      $results .= t("Views: %view_count", array("view_count" => $item->view_count));
       $results .= "</li>";
     }
     if ($item->owner) {
       $results .= "<li>";
-      $results .= t("By: {{owner_name}}", array("owner_name" => "<a href=\"#\">{$item->owner->name}</a>"));
+      $results .= t("By: %owner_name", array("owner_name" => "<a href=\"#\">{$item->owner->name}</a>"));
       $results .= "</li>";
     }
     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 @@
       <ul>
         <li>
           <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>" class="gDialogLink"
-            title="<?= t("Delete tag {{tag_name}}", array("tag_name" => $tag->name)) ?>">
+            title="<?= t("Delete tag %tag_name", array("tag_name" => $tag->name)) ?>">
             <?= t("delete") ?>
           </a>
         </li>
         <li>
           <a href="<?= url::site("admin/tags/form_rename/$tag->id") ?>" class="gDialogLink"
-            title="<?= t("Rename tag {{tag_name}}", array("tag_name" => $tag->name)) ?>">
+            title="<?= t("Rename tag %tag_name", array("tag_name" => $tag->name)) ?>">
             <?= t("rename") ?>
           </a>
         </li>
diff --git a/modules/user/controllers/admin_groups.php b/modules/user/controllers/admin_groups.php
index d05558a9..bba104f0 100644
--- a/modules/user/controllers/admin_groups.php
+++ b/modules/user/controllers/admin_groups.php
@@ -40,7 +40,7 @@ class Admin_Groups_Controller extends Controller {
     if ($valid) {
       $group = group::create($new_name);
       $group->save();
-      message::success(t("Created group {{group_name}}", array("group_name" => $group->name)));
+      message::success(t("Created group %group_name", array("group_name" => $group->name)));
       print json_encode(array("result" => "success"));
     } else {
       message::error(t("Failed to create group"));
@@ -69,7 +69,7 @@ class Admin_Groups_Controller extends Controller {
                               "form" => $form->__toString()));
     }
 
-    $message = t("Deleted group {{group_name}}", array("group_name" => $name));
+    $message = t("Deleted group %group_name", array("group_name" => $name));
     log::success("group", $message);
     message::success($message);
     print json_encode(array("result" => "success"));
@@ -104,10 +104,10 @@ class Admin_Groups_Controller extends Controller {
     if ($valid) {
       $group->name = $form->edit_group->inputs["name"]->value;
       $group->save();
-      message::success(t("Changed group {{group_name}}", array("group_name" => $group->name)));
+      message::success(t("Changed group %group_name", array("group_name" => $group->name)));
       print json_encode(array("result" => "success"));
     } else {
-      message::error(t("Failed to change group {{group_name}}", array("group_name" => $group->name)));
+      message::error(t("Failed to change group %group_name", array("group_name" => $group->name)));
       print json_encode(array("result" => "error",
                               "form" => $form->__toString()));
     }
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index e936cb8a..dff56870 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -41,7 +41,7 @@ class Admin_Users_Controller extends Controller {
         $name, $form->add_user->full_name->value, $form->add_user->password->value);
       $user->email = $form->add_user->email->value;
       $user->save();
-      message::success(t("Created user {{user_name}}", array("user_name" => $user->name)));
+      message::success(t("Created user %user_name", array("user_name" => $user->name)));
       print json_encode(array("result" => "success"));
     } else {
       message::error(t("Failed to create user"));
@@ -70,7 +70,7 @@ class Admin_Users_Controller extends Controller {
                               "form" => $form->__toString()));
     }
 
-    $message = t("Deleted user {{user_name}}", array("user_name" => $name));
+    $message = t("Deleted user %user_name", array("user_name" => $name));
     log::success("user", $message);
     message::success($message);
     print json_encode(array("result" => "success"));
@@ -108,10 +108,10 @@ class Admin_Users_Controller extends Controller {
       $user->password = $form->edit_user->password->value;
       $user->email = $form->edit_user->email->value;
       $user->save();
-      message::success(t("Changed user {{user_name}}", array("user_name" => $user->name)));
+      message::success(t("Changed user %user_name", array("user_name" => $user->name)));
       print json_encode(array("result" => "success"));
     } else {
-      message::error(t("Failed to change user {{user_name}}", array("user_name" => $user->name)));
+      message::error(t("Failed to change user %user_name", array("user_name" => $user->name)));
       print json_encode(array("result" => "error",
                               "form" => $form->__toString()));
     }
diff --git a/modules/user/controllers/login.php b/modules/user/controllers/login.php
index 66ea55e6..c9a32546 100644
--- a/modules/user/controllers/login.php
+++ b/modules/user/controllers/login.php
@@ -34,7 +34,7 @@ class Login_Controller extends Controller {
       $user = ORM::factory("user")->where("name", $form->login->inputs["name"]->value)->find();
       if (!$user->loaded || !user::is_correct_password($user, $form->login->password->value)) {
         log::warning(
-          "user", t("Failed login for {{name}}", array("username" => $form->login->inputs["name"]->value)));
+          "user", t("Failed login for %name", array("name" => $form->login->inputs["name"]->value)));
         $form->login->inputs["name"]->add_error("invalid_login", 1);
         $valid = false;
       }
@@ -42,7 +42,7 @@ class Login_Controller extends Controller {
 
     if ($valid) {
       user::login($user);
-      log::info("user", t("User {{name}} logged in", array("name" => $user->name)));
+      log::info("user", t("User %name logged in", array("name" => $user->name)));
       print json_encode(
         array("result" => "success"));
     } else {
diff --git a/modules/user/controllers/logout.php b/modules/user/controllers/logout.php
index 06b869be..84b1fdc5 100644
--- a/modules/user/controllers/logout.php
+++ b/modules/user/controllers/logout.php
@@ -21,7 +21,7 @@ class Logout_Controller extends Controller {
   public function index() {
     $user = user::active();
     user::logout();
-    log::info("user", t("User {{name}} logged out", array("name" => $user->name)),
+    log::info("user", t("User %name logged out", array("name" => $user->name)),
               html::anchor("user/$user->id", $user->name));
     if ($this->input->get("continue")) {
       url::redirect($this->input->get("continue"));
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index 682ef5ef..b49b6888 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -87,7 +87,7 @@ class group_Core {
   static function get_delete_form_admin($group) {
     $form = new Forge("admin/groups/delete/$group->id", "", "post");
     $form_group = $form->group("delete_group")->label(
-      t("Are you sure you want to delete group {{group_name}}?", array("group_name" => $group->name)));
+      t("Are you sure you want to delete group %group_name?", array("group_name" => $group->name)));
     $form_group->submit("")->value(t("Delete"));
     return $form;
   }
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index c1e1abba..0a023159 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -71,8 +71,8 @@ class user_Core {
   static function get_delete_form_admin($user) {
     $form = new Forge("admin/users/delete/$user->id", "", "post");
     $group = $form->group("delete_user")->label(
-      t("Are you sure you want to delete user {{name}}?", array("name" => $user->name)));
-    $group->submit("")->value(t("Delete user {{name}}", array("name" => $user->name)));
+      t("Are you sure you want to delete user %name?", array("name" => $user->name)));
+    $group->submit("")->value(t("Delete user %name", array("name" => $user->name)));
     return $form;
   }
 
diff --git a/modules/user/views/admin_groups.html.php b/modules/user/views/admin_groups.html.php
index 9547e121..a2ad652f 100644
--- a/modules/user/views/admin_groups.html.php
+++ b/modules/user/views/admin_groups.html.php
@@ -12,7 +12,7 @@
         title="<?= t("Edit group") ?>"><?= t("edit") ?></a>
       <? if (!$group->special): ?>
         <a href="groups/delete_form/<?= $group->id ?>" class="gDialogLink"
-          title="<?= t("Do you really want to delete {{group_name}}", array("group_name" => $group->name)) ?>">
+          title="<?= t("Do you really want to delete %group_name", array("group_name" => $group->name)) ?>">
         <?= t("delete") ?></a>
       <? endif ?>
     </li>
diff --git a/modules/watermark/views/admin_watermarks.html.php b/modules/watermark/views/admin_watermarks.html.php
index 106d05ce..8210f95e 100644
--- a/modules/watermark/views/admin_watermarks.html.php
+++ b/modules/watermark/views/admin_watermarks.html.php
@@ -18,10 +18,10 @@
     <div class="image">
       <img width="<?= $width ?>" height="<?= $height ?>" src="<?= $url ?>"/>
       <p>
-        <?= t("Position: {{position}}", array("position" => watermark::position($position))) ?>
+        <?= t("Position: %position", array("position" => watermark::position($position))) ?>
       </p>
       <p>
-        <?= t("Transparency: {{transparency}}%", array("transparency" => module::get_var("watermark", "transparency"))) ?>
+        <?= t("Transparency: %transparency%", array("transparency" => module::get_var("watermark", "transparency"))) ?>
       </p>
     </div>
     <div class="controls">