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, 17 insertions, 17 deletions

diff --git a/modules/user/views/admin_groups.html.php b/modules/user/views/admin_groups.html.php
index 5b5066dc..9547e121 100644
--- a/modules/user/views/admin_groups.html.php
+++ b/modules/user/views/admin_groups.html.php
@@ -1,24 +1,24 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div class="gBlock">
-  <h2><?= _("Group Administration") ?></h2>
+  <h2><?= t("Group Administration") ?></h2>
   <div class="gBlockContent">
-    <p><?= _("These are the groups in your system") ?></p>
+    <p><?= t("These are the groups in your system") ?></p>
   </div>
   <ul>
     <? foreach ($groups as $i => $group): ?>
     <li>
       <?= $group->name ?>
       <a href="groups/edit_form/<?= $group->id ?>" class="gDialogLink"
-        title="<?= _("Edit group") ?>"><?= _("edit") ?></a>
+        title="<?= t("Edit group") ?>"><?= t("edit") ?></a>
       <? if (!$group->special): ?>
         <a href="groups/delete_form/<?= $group->id ?>" class="gDialogLink"
-          title="<?= sprintf(_("Do you really want to delete %s"), $group->name) ?>">
-        <?= _("delete") ?></a>
+          title="<?= t("Do you really want to delete {{group_name}}", array("group_name" => $group->name)) ?>">
+        <?= t("delete") ?></a>
       <? endif ?>
     </li>
     <? endforeach ?>
     <li><a href="groups/add_form" class="gDialogLink"
-      title="<?= _("Add group") ?>"><?= _("Add group") ?></a></li>
+      title="<?= t("Add group") ?>"><?= t("Add group") ?></a></li>
   </ul>
 </div>
 
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index c31588d9..3d1c311f 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -1,22 +1,22 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div class="gBlock">
-  <h2><?= _("User Administration") ?></h2>
+  <h2><?= t("User Administration") ?></h2>
   <div class="gBlockContent">
-    <p><?= _("These are the users in your system") ?></p>
+    <p><?= t("These are the users in your system") ?></p>
     <ul>
       <? foreach ($users as $i => $user): ?>
       <li>
         <?= $user->name ?>
         <?= ($user->last_login == 0) ? "" : "(" . date("M j, Y", $user->last_login) . ")" ?>
-        <a href="users/edit_form/<?= $user->id ?>" class="gDialogLink"><?= _("edit") ?></a>
+        <a href="users/edit_form/<?= $user->id ?>" class="gDialogLink"><?= t("edit") ?></a>
         <? if (!(user::active()->id == $user->id || user::guest()->id == $user->id)): ?>
         <a href="users/delete_form/<?= $user->id ?>" class="gDialogLink">
-          <?= _("delete") ?></a>
+          <?= t("delete") ?></a>
         <? endif ?>
       </li>
       <? endforeach ?>
-      <li><a href="users/add_form" class="gDialogLink" title="<?= _("Add user") ?>">
-        <?= _("Add user") ?></a></li>
+      <li><a href="users/add_form" class="gDialogLink" title="<?= t("Add user") ?>">
+        <?= t("Add user") ?></a></li>
     </ul>
   </div>
 </div>
diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php
index b73bea07..fd9bd773 100644
--- a/modules/user/views/login.html.php
+++ b/modules/user/views/login.html.php
@@ -2,13 +2,13 @@
 <ul id="gLoginMenu">
   <? if ($user->guest): ?>
   <li class="first"><a href="<?= url::site("login") ?>"
-         title="<?= _("Login to Gallery") ?>"
-         id="gLoginLink"><?= _("Login") ?></a></li>
+         title="<?= t("Login to Gallery") ?>"
+         id="gLoginLink"><?= t("Login") ?></a></li>
   <? else: ?>
   <li class="first"><a href="<?= url::site("form/edit/users/{$user->id}") ?>"
-      title="<?= _("Edit Your Profile") ?>"
-      id="gUserProfileLink" class="gDialogLink"><?= _("Modify Profile") ?></a></li>
+      title="<?= t("Edit Your Profile") ?>"
+      id="gUserProfileLink" class="gDialogLink"><?= t("Modify Profile") ?></a></li>
   <li><a href="<?= url::site("logout?continue=" . url::current(true)) ?>"
-         id="gLogoutLink"><?= _("Logout") ?></a></li>
+         id="gLogoutLink"><?= t("Logout") ?></a></li>
   <? endif; ?>
 </ul>