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

7 files changed, 15 insertions, 15 deletions

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>