i18n refactoring: Rename all _() (reserved by gettext) calls to t().

- And refactor printf to our string interpolation / pluralization syntax
- Also, a slight change to the translations_incomings table, using binary(16) instead of char(32) as message key.

3 files changed, 35 insertions, 35 deletions

diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index bd00d91e..41f19a7d 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -63,22 +63,22 @@ class group_Core {
 
   public static function get_edit_form_admin($group) {
     $form = new Forge("admin/groups/edit/$group->id");
-    $form_group = $form->group("edit_group")->label(_("Edit Group"));
-    $form_group->input("name")->label(_("Name"))->id("gName")->value($group->name);
+    $form_group = $form->group("edit_group")->label(t("Edit Group"));
+    $form_group->input("name")->label(t("Name"))->id("gName")->value($group->name);
     $form_group->inputs["name"]->error_messages(
-      "in_use", _("There is already a group with that name"));
-    $form_group->submit(_("Save"));
+      "in_use", t("There is already a group with that name"));
+    $form_group->submit(t("Save"));
     $form->add_rules_from($group);
     return $form;
   }
 
   public static function get_add_form_admin() {
     $form = new Forge("admin/groups/add");
-    $form_group = $form->group("add_group")->label(_("Add Group"));
-    $form_group->input("name")->label(_("Name"))->id("gName");
+    $form_group = $form->group("add_group")->label(t("Add Group"));
+    $form_group->input("name")->label(t("Name"))->id("gName");
     $form_group->inputs["name"]->error_messages(
-      "in_use", _("There is already a group with that name"));
-    $form_group->submit(_("Add Group"));
+      "in_use", t("There is already a group with that name"));
+    $form_group->submit(t("Add Group"));
     $group = ORM::factory("group");
     $form->add_rules_from($group);
     return $form;
@@ -87,8 +87,8 @@ class group_Core {
   public static function get_delete_form_admin($group) {
     $form = new Forge("admin/groups/delete/$group->id", "", "post");
     $form_group = $form->group("delete_group")->label(
-      sprintf(_("Are you sure you want to delete group %s?"), $group->name));
-    $form_group->submit(_("Delete"));
+      t("Are you sure you want to delete group {{group_name}}?", array("group_name" => $group->name)));
+    $form_group->submit(t("Delete"));
     return $form;
   }
 }
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 3d8816e7..cc70d874 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -26,40 +26,40 @@
 class user_Core {
   public static function get_edit_form($user, $action = NULL) {
     $form = new Forge("users/$user->id?_method=put", "", "post", array("id" => "gUserForm"));
-    $group = $form->group("edit_user")->label(_("Edit User"));
-    $group->input("name")->label(_("Name"))->id("gName")->value($user->name);
-    $group->input("full_name")->label(_("Full Name"))->id("gFullName")->value($user->full_name);
-    $group->password("password")->label(_("Password"))->id("gPassword");
-    $group->input("email")->label(_("Email"))->id("gEmail")->value($user->email);
-    $group->submit(_("Save"));
+    $group = $form->group("edit_user")->label(t("Edit User"));
+    $group->input("name")->label(t("Name"))->id("gName")->value($user->name);
+    $group->input("full_name")->label(t("Full Name"))->id("gFullName")->value($user->full_name);
+    $group->password("password")->label(t("Password"))->id("gPassword");
+    $group->input("email")->label(t("Email"))->id("gEmail")->value($user->email);
+    $group->submit(t("Save"));
     $form->add_rules_from($user);
     return $form;
   }
 
   public static function get_edit_form_admin($user) {
     $form = new Forge("admin/users/edit/$user->id");
-    $group = $form->group("edit_user")->label(_("Edit User"));
-    $group->input("name")->label(_("Name"))->id("gName")->value($user->name);
+    $group = $form->group("edit_user")->label(t("Edit User"));
+    $group->input("name")->label(t("Name"))->id("gName")->value($user->name);
     $group->inputs["name"]->error_messages(
-      "in_use", _("There is already a user with that name"));
-    $group->input("full_name")->label(_("Full Name"))->id("gFullName")->value($user->full_name);
-    $group->password("password")->label(_("Password"))->id("gPassword");
-    $group->input("email")->label(_("Email"))->id("gEmail")->value($user->email);
-    $group->submit(_("Modify User"));
+      "in_use", t("There is already a user with that name"));
+    $group->input("full_name")->label(t("Full Name"))->id("gFullName")->value($user->full_name);
+    $group->password("password")->label(t("Password"))->id("gPassword");
+    $group->input("email")->label(t("Email"))->id("gEmail")->value($user->email);
+    $group->submit(t("Modify User"));
     $form->add_rules_from($user);
     return $form;
   }
 
   public static function get_add_form_admin() {
     $form = new Forge("admin/users/add");
-    $group = $form->group("add_user")->label(_("Add User"));
-    $group->input("name")->label(_("Name"))->id("gName");
+    $group = $form->group("add_user")->label(t("Add User"));
+    $group->input("name")->label(t("Name"))->id("gName");
     $group->inputs["name"]->error_messages(
-      "in_use", _("There is already a user with that name"));
-    $group->input("full_name")->label(_("Full Name"))->id("gFullName");
-    $group->password("password")->label(_("Password"))->id("gPassword");
-    $group->input("email")->label(_("Email"))->id("gEmail");
-    $group->submit(_("Add User"));
+      "in_use", t("There is already a user with that name"));
+    $group->input("full_name")->label(t("Full Name"))->id("gFullName");
+    $group->password("password")->label(t("Password"))->id("gPassword");
+    $group->input("email")->label(t("Email"))->id("gEmail");
+    $group->submit(t("Add User"));
     $user = ORM::factory("user");
     $form->add_rules_from($user);
     return $form;
@@ -68,8 +68,8 @@ class user_Core {
   public static function get_delete_form_admin($user) {
     $form = new Forge("admin/users/delete/$user->id", "", "post");
     $group = $form->group("delete_user")->label(
-      sprintf(_("Are you sure you want to delete user %s?"), $user->name));
-    $group->submit(sprintf(_("Delete user %s"), $user->name));
+      t("Are you sure you want to delete user {{name}}?", array("name" => $user->name)));
+    $group->submit(t("Delete user {{name}}", array("name" => $user->name)));
     return $form;
   }
 
diff --git a/modules/user/helpers/user_menu.php b/modules/user/helpers/user_menu.php
index 713e47bb..bdbe411b 100644
--- a/modules/user/helpers/user_menu.php
+++ b/modules/user/helpers/user_menu.php
@@ -22,15 +22,15 @@ class user_menu_Core {
     $menu->get("users_groups_menu")
       ->append(Menu::factory("link")
                ->id("list_users")
-               ->label(_("Users"))
+               ->label(t("Users"))
                ->url(url::site("admin/users")))
       ->append(Menu::factory("link")
                ->id("list_groups")
-               ->label(_("Groups"))
+               ->label(t("Groups"))
                ->url(url::site("admin/groups")))
       ->append(Menu::factory("link")
                ->id("users_groups")
-               ->label(_("Users <-> Groups"))
+               ->label(t("Users <-> Groups"))
                ->url("#"));
   }
 }