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.

10 files changed, 86 insertions, 79 deletions

diff --git a/core/views/admin_block_platform.html.php b/core/views/admin_block_platform.html.php
index 958097a1..2f13d5d9 100644
--- a/core/views/admin_block_platform.html.php
+++ b/core/views/admin_block_platform.html.php
@@ -1,15 +1,15 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <ul>
   <li>
-    <? printf(_("Operating System: %s"), PHP_OS) ?>
+    <?= t("Operating System: {{operating_system}}", array("operating_system" => PHP_OS)) ?>
   </li>
   <li>
-    <? printf(_("Apache: %s"), function_exists("apache_get_version") ? apache_get_version() : _("Unknown")) ?>
+    <?= t("Apache: {{apache_version}}", array("apache_version" => function_exists("apache_get_version") ? apache_get_version() : t("Unknown"))) ?>
   </li>
   <li>
-    <? printf(_("PHP: %s"), phpversion()) ?>
+    <?= t("PHP: {{php_version}}", array("php_version" => phpversion())) ?>
   </li>
   <li>
-    <? printf(_("MySQL: %s"), mysql_get_server_info()) ?>
+    <?= t("MySQL: {{mysql_version}}", array("mysql_version" => mysql_get_server_info())) ?>
   </li>
 </ul>
diff --git a/core/views/admin_block_stats.html.php b/core/views/admin_block_stats.html.php
index b83add10..c3b9ee98 100644
--- a/core/views/admin_block_stats.html.php
+++ b/core/views/admin_block_stats.html.php
@@ -1,12 +1,12 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <ul>
   <li>
-    <? printf(_("Version: %s"), "3.0") ?>
+    <?= t("Version: {{version}}", array("version" => "3.0")) ?>
   </li>
   <li>
-    <? printf(_("Albums: %d"), $album_count) ?>
+    <?= t("Albums: {{count}}", array("count" => $album_count)) ?>
   </li>
   <li>
-    <? printf(_("Photos: %d"), $photo_count) ?>
+    <?= t("Photos: {{count}}", array("count" => $photo_count)) ?>
   </li>
 </ul>
diff --git a/core/views/admin_block_welcome.html.php b/core/views/admin_block_welcome.html.php
index a221c9bd..35501ffc 100644
--- a/core/views/admin_block_welcome.html.php
+++ b/core/views/admin_block_welcome.html.php
@@ -1,15 +1,18 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <p>
-  <?= _("This is your administration dashboard and it provides a quick overview of status messages, recent updates, and frequently used options. Add or remove blocks and rearrange them to tailor to your needs. The admin menu provides quick access to all of Gallery 3's options and settings. Here are a few of the most used options to get you started.") ?>
+  <?= t("This is your administration dashboard and it provides a quick overview of status messages, recent updates, and frequently used options. Add or remove blocks and rearrange them to tailor to your needs. The admin menu provides quick access to all of Gallery 3's options and settings. Here are a few of the most used options to get you started.") ?>
 </p>
 <ul>
   <li>
-    <?= sprintf(_("%sGeneral Settings%s - General configuation options for your Gallery."), "<a href=\"#\">", "</a>") ?>
+    <?= t("{{link_start}}General Settings{{link_end}} - General configuation options for your Gallery.",
+          array("link_start" => "<a href=\"#\">", "link_end" => "</a>")) ?>
   </li>
   <li>
-    <?= sprintf(_("%sModules%s - Manage available and installed modules."), "<a href=\"" . url::site("admin/modules") . "\">", "</a>") ?>
+    <?= t("{{link_start}}Modules{{link_end}} - Manage available and installed modules.",
+          array("link_start" => "<a href=\"" . url::site("admin/modules") . "\">", "link_end" => "</a>")) ?>
   </li>
   <li>
-    <?= sprintf(_("%sPresentation%s - Choose a theme, set image sizes."), "<a href=\"#\">", "</a>") ?>
+    <?= t("{{link_start}}Presentation{{link_end}} - Choose a theme, set image sizes.",
+          array("link_start" => "<a href=\"#\">", "link_end" => "</a>")) ?>
   </li>
 </ul>
diff --git a/core/views/admin_graphics.html.php b/core/views/admin_graphics.html.php
index 19f80cba..7d57ec6f 100644
--- a/core/views/admin_graphics.html.php
+++ b/core/views/admin_graphics.html.php
@@ -1,13 +1,13 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div id="gGraphics">
-  <h1> <?= _("Graphics Settings") ?> </h1>
+  <h1> <?= t("Graphics Settings") ?> </h1>
   <p>
-    <?= _("Gallery needs a graphics toolkit in order to manipulate your photos.  Please choose one from the list below.") ?>
+    <?= t("Gallery needs a graphics toolkit in order to manipulate your photos.  Please choose one from the list below.") ?>
   </p>
 
   <form method="post" action="<?= url::site("admin/graphics/save") ?>">
     <?= access::csrf_form_field() ?>
-    <h2> <?= _("Graphics Toolkits") ?> </h2>
+    <h2> <?= t("Graphics Toolkits") ?> </h2>
     <table>
       <tr>
         <td valign="top" style="width: 100px">
@@ -19,21 +19,23 @@
           </center>
         </td>
         <td>
-          <h3> <?= _("GD") ?> </h3>
+          <h3> <?= t("GD") ?> </h3>
           <p>
-            <? printf(_("The GD graphics library is an extension to PHP commonly installed most webservers.  Please refer to the %sGD website%s for more information."), "<a href=\"http://www.boutell.com/gd/\">", "</a>") ?>
+            <?= t("The GD graphics library is an extension to PHP commonly installed most webservers.  Please refer to the {{link_start}}GD website{{link_end}} for more information.",
+                  array("link_start" => "<a href=\"http://www.boutell.com/gd/\">", "link_end" => "</a>")) ?>
           </p>
           <? if ($tk->gd["GD Version"] && function_exists('imagerotate')): ?>
           <p class="gSuccess">
-            <? printf(_("You have GD version %s."), $tk->gd["GD Version"]) ?>
+            <?= t("You have GD version {{version}}.", array("version" => $tk->gd["GD Version"])) ?>
           </p>
           <? elseif ($tk->gd["GD Version"]): ?>
           <p class="gWarning">
-            <? printf(_("You have GD version %s, but it lacks image rotation."), $tk->gd["GD Version"]) ?>
+            <?= t("You have GD version {{version}}, but it lacks image rotation.",
+                  array("version" => $tk->gd["GD Version"])) ?>
           </p>
           <? else: ?>
           <p class="gInfo">
-            <?= _("You do not have GD installed.") ?>
+            <?= t("You do not have GD installed.") ?>
           </p>
           <? endif ?>
         </td>
@@ -49,17 +51,18 @@
           </center>
         </td>
         <td>
-          <h3> <?= _("ImageMagick") ?> </h3>
+          <h3> <?= t("ImageMagick") ?> </h3>
           <p>
-            <? printf(_("ImageMagick is a standalone graphics program available on most Linux systems.  Please refer to the %sImageMagick website%s for more information."), "<a href=\"http://www.imagemagick.org/\">", "</a>") ?>
+            <?= t("ImageMagick is a standalone graphics program available on most Linux systems.  Please refer to the {{link_start}}ImageMagick website{{link_end}} for more information.",
+                  array("link_start" => "<a href=\"http://www.imagemagick.org/\">", "link_end" => "</a>")) ?>
           </p>
           <? if ($tk->imagemagick): ?>
           <p class="gSuccess">
-            <? printf(_("You have ImageMagick installed in %s"), $tk->imagemagick) ?>
+            <?= t("You have ImageMagick installed in {{path}}", array("path" => $tk->imagemagick)) ?>
           </p>
           <? else: ?>
           <p class="gInfo">
-            <?= _("ImageMagick is not available on your system.") ?>
+            <?= t("ImageMagick is not available on your system.") ?>
           </p>
           <? endif ?>
         </td>
@@ -75,22 +78,23 @@
           </center>
         </td>
         <td>
-          <h3> <?= _("GraphicsMagick") ?> </h3>
+          <h3> <?= t("GraphicsMagick") ?> </h3>
           <p>
-            <? printf(_("GraphicsMagick is a standalone graphics program available on most Linux systems.  Please refer to the %sGraphicsMagick website%s for more information."), "<a href=\"http://www.graphicsmagick.org/\">", "</a>") ?>
+            <?= t("GraphicsMagick is a standalone graphics program available on most Linux systems.  Please refer to the {{link_start}}GraphicsMagick website{{link_end}} for more information.",
+                  array("link_start" => "<a href=\"http://www.graphicsmagick.org/\">", "link_end" => "</a>")) ?>
           </p>
           <? if ($tk->graphicsmagick): ?>
           <p class="gSuccess">
-            <? printf(_("You have GraphicsMagick installed in %s"), $tk->graphicsmagick) ?>
+            <?= t("You have GraphicsMagick installed in {{path}}", array("path" => $tk->graphicsmagick)) ?>
           </p>
           <? else: ?>
           <p class="gInfo">
-            <?= _("GraphicsMagick is not available on your system.") ?>
+            <?= t("GraphicsMagick is not available on your system.") ?>
           </p>
           <? endif ?>
         </td>
       </tr>
     </table>
-    <input type="submit" value="<?= _("Save") ?>"/>
+    <input type="submit" value="<?= t("Save") ?>"/>
   </form>
 </div>
diff --git a/core/views/admin_maintenance.html.php b/core/views/admin_maintenance.html.php
index 1f9809ac..49a2f364 100644
--- a/core/views/admin_maintenance.html.php
+++ b/core/views/admin_maintenance.html.php
@@ -1,22 +1,22 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div id="gMaintenance">
-  <h1> <?= _("Maintenance Tasks") ?> </h1>
+  <h1> <?= t("Maintenance Tasks") ?> </h1>
   <p>
-    <?= _("Occasionally your Gallery will require some maintenance.  Here are some tasks you can use to keep it running smoothly.") ?>
+    <?= t("Occasionally your Gallery will require some maintenance.  Here are some tasks you can use to keep it running smoothly.") ?>
   </p>
 
   <div id="gAvailableTasks">
-    <h2> <?= _("Available Tasks") ?> </h2>
+    <h2> <?= t("Available Tasks") ?> </h2>
     <table style="width: 680px" border="1">
       <tr>
         <th>
-          <?= _("Name") ?>
+          <?= t("Name") ?>
         </th>
         <th>
-          <?= _("Description") ?>
+          <?= t("Description") ?>
         </th>
         <th>
-          <?= _("Action") ?>
+          <?= t("Action") ?>
         </th>
       </tr>
       <? foreach ($task_definitions as $task) ?>
@@ -30,7 +30,7 @@
         <td>
           <a href="<?= url::site("admin/maintenance/start/$task->callback?csrf=$csrf") ?>"
             class="gDialogLink">
-            <?= _("run") ?>
+            <?= t("run") ?>
           </a>
         </td>
       </tr>
@@ -38,24 +38,24 @@
   </div>
 
   <div id="gRunningTasks">
-    <h2> <?= _("Running Tasks") ?> </h2>
+    <h2> <?= t("Running Tasks") ?> </h2>
 
     <table style="width: 680px" border="1">
       <tr>
         <th>
-          <?= _("Last Updated") ?>
+          <?= t("Last Updated") ?>
         </th>
         <th>
-          <?= _("Name") ?>
+          <?= t("Name") ?>
         </th>
         <th>
-          <?= _("Status") ?>
+          <?= t("Status") ?>
         </th>
         <th>
-          <?= _("Info") ?>
+          <?= t("Info") ?>
         </th>
         <th>
-          <?= _("Action") ?>
+          <?= t("Action") ?>
         </th>
       </tr>
       <? foreach ($running_tasks as $task): ?>
@@ -69,13 +69,13 @@
         <td>
           <? if ($task->done): ?>
           <? if ($task->state == "cancelled"): ?>
-          <?= _("Cancelled") ?>
+          <?= t("Cancelled") ?>
           <? endif ?>
-          <?= _("Done") ?>
+          <?= t("Done") ?>
           <? elseif ($task->state == "stalled"): ?>
-          <?= _("Stalled") ?>
+          <?= t("Stalled") ?>
           <? else: ?>
-          <?= sprintf(_("%d%% Complete"), $task->percent_complete) ?>
+          <?= t("{{percent_complete}}% Complete", array("percent_complete" => $task->percent_complete)) ?>
           <? endif ?>
         </td>
         <td>
@@ -84,11 +84,11 @@
         <td>
           <? if ($task->state == "stalled"): ?>
           <a href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>" class="gDialogLink">
-            <?= _("resume") ?>
+            <?= t("resume") ?>
           </a>
           <? endif ?>
           <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>">
-            <?= _("cancel") ?>
+            <?= t("cancel") ?>
           </a>
         </td>
       </tr>
@@ -97,24 +97,24 @@
   </div>
 
   <div id="gFinishedTasks">
-    <h2> <?= _("Finished Tasks") ?> </h2>
+    <h2> <?= t("Finished Tasks") ?> </h2>
 
     <table style="width: 680px" border="1">
       <tr>
         <th>
-          <?= _("Last Updated") ?>
+          <?= t("Last Updated") ?>
         </th>
         <th>
-          <?= _("Name") ?>
+          <?= t("Name") ?>
         </th>
         <th>
-          <?= _("Status") ?>
+          <?= t("Status") ?>
         </th>
         <th>
-          <?= _("Info") ?>
+          <?= t("Info") ?>
         </th>
         <th>
-          <?= _("Action") ?>
+          <?= t("Action") ?>
         </th>
       </tr>
       <? foreach ($finished_tasks as $task): ?>
@@ -127,11 +127,11 @@
         </td>
         <td>
           <? if ($task->state == "success"): ?>
-          <?= _("Success") ?>
+          <?= t("Success") ?>
           <? elseif ($task->state == "error"): ?>
-          <?= _("Failed") ?>
+          <?= t("Failed") ?>
           <? elseif ($task->state == "cancelled"): ?>
-          <?= _("Cancelled") ?>
+          <?= t("Cancelled") ?>
           <? endif ?>
         </td>
         <td>
@@ -140,14 +140,14 @@
         <td>
           <? if ($task->done): ?>
           <a href="<?= url::site("admin/maintenance/remove/$task->id?csrf=$csrf") ?>">
-            <?= _("remove") ?>
+            <?= t("remove") ?>
           </a>
           <? else: ?>
           <a href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>">
-            <?= _("resume") ?>
+            <?= t("resume") ?>
           </a>
           <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>">
-            <?= _("cancel") ?>
+            <?= t("cancel") ?>
           </a>
           <? endif ?>
         </td>
diff --git a/core/views/admin_maintenance_task.html.php b/core/views/admin_maintenance_task.html.php
index bcbdba0d..52e1f00d 100644
--- a/core/views/admin_maintenance_task.html.php
+++ b/core/views/admin_maintenance_task.html.php
@@ -26,7 +26,7 @@
   <br/>
   percent_complete: <span id="gPercentComplete"></span>
   <div>
-    <button id="gPauseButton" onclick="dismiss()"><?= _("Pause") ?></button>
-    <button id="gDoneButton" style="display: none" onclick="dismiss()"><?= _("Done") ?></button>
+    <button id="gPauseButton" onclick="dismiss()"><?= t("Pause") ?></button>
+    <button id="gDoneButton" style="display: none" onclick="dismiss()"><?= t("Done") ?></button>
   </div>
 </div>
diff --git a/core/views/admin_modules.html.php b/core/views/admin_modules.html.php
index 4aa36a96..67fdfa32 100644
--- a/core/views/admin_modules.html.php
+++ b/core/views/admin_modules.html.php
@@ -1,30 +1,30 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div id="gModules">
-  <h1> <?= _("Gallery Modules") ?> </h1>
+  <h1> <?= t("Gallery Modules") ?> </h1>
   <p>
-    <?= _("Power up your Gallery by adding more modules!   Each module provides new cool features.") ?>
+    <?= t("Power up your Gallery by adding more modules!   Each module provides new cool features.") ?>
   </p>
 
   <form method="post" action="<?= url::site("admin/modules/save") ?>">
     <?= access::csrf_form_field() ?>
     <table>
       <tr>
-        <th> <?= _("Installed") ?> </th>
-        <th> <?= _("Name") ?> </th>
-        <th> <?= _("Version") ?> </th>
-        <th> <?= _("Description") ?> </th>
+        <th> <?= t("Installed") ?> </th>
+        <th> <?= t("Name") ?> </th>
+        <th> <?= t("Version") ?> </th>
+        <th> <?= t("Description") ?> </th>
       </tr>
       <? foreach ($available as $module_name => $module_info):  ?>
       <tr>
         <? $data = array("name" => $module_name); ?>
         <? if ($module_info->locked) $data["disabled"] = 1; ?>
         <td> <?= form::checkbox($data, '1', module::is_installed($module_name)) ?> </td>
-        <td> <?= _($module_info->name) ?> </td>
+        <td> <?= t($module_info->name) ?> </td>
         <td> <?= $module_info->version ?> </td>
-        <td> <?= _($module_info->description) ?> </td>
+        <td> <?= t($module_info->description) ?> </td>
       </tr>
       <? endforeach ?>
     </table>
-    <input type="submit" value="<?= _("Update") ?>"/>
+    <input type="submit" value="<?= t("Update") ?>"/>
   </form>
 </div>
diff --git a/core/views/admin_themes.html.php b/core/views/admin_themes.html.php
index cff6de7d..1064ae5e 100644
--- a/core/views/admin_themes.html.php
+++ b/core/views/admin_themes.html.php
@@ -1,8 +1,8 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div id="gThemes">
-  <h1><?= _("Theme Administration") ?></h1>
+  <h1><?= t("Theme Administration") ?></h1>
     <p>
-      <?= _("These are the themes in your system") ?>
+      <?= t("These are the themes in your system") ?>
     </p>
     <form method="post" action="<?= url::site("admin/themes/save") ?>">
       <?= access::csrf_form_field() ?>
@@ -12,6 +12,6 @@
              />
       <?= $theme ?>
       <? endforeach ?>
-      <input type="submit" value="<?= _("Save") ?>"/>
+      <input type="submit" value="<?= t("Save") ?>"/>
     </form>
 </div>
diff --git a/core/views/permissions_form.html.php b/core/views/permissions_form.html.php
index 94a3bead..ba3191e1 100644
--- a/core/views/permissions_form.html.php
+++ b/core/views/permissions_form.html.php
@@ -2,7 +2,7 @@
 <form method="post" action="<?= url::site("permissions/edit/$item->id") ?>">
   <?= access::csrf_form_field() ?>
   <fieldset>
-    <legend><?= _("Edit Permissions") ?> </legend>
+    <legend><?= t("Edit Permissions") ?> </legend>
 
     <table>
       <tr>
@@ -14,7 +14,7 @@
 
       <? foreach ($permissions as $permission): ?>
       <tr>
-        <td> <?= _($permission->display_name) ?> </td>
+        <td> <?= t($permission->display_name) ?> </td>
         <? foreach ($groups as $group): ?>
         <td>
           <? $intent = access::group_intent($group, $permission->name, $item) ?>
@@ -22,7 +22,7 @@
           <? $lock = access::locked_by($group, $permission->name, $item) ?>
 
           <? if ($lock): ?>
-            <?= _("denied and locked by") ?> <a href="javascript:show(<?= $lock->id ?>)"><?= _("parent") ?></a>
+            <?= t("denied and locked by") ?> <a href="javascript:show(<?= $lock->id ?>)"><?= t("parent") ?></a>
           <? else: ?>
             <? if ($intent === null): ?>
               <? if ($allowed): ?>
diff --git a/core/views/quick_pane.html.php b/core/views/quick_pane.html.php
index 7ae0a856..9a0e56d5 100644
--- a/core/views/quick_pane.html.php
+++ b/core/views/quick_pane.html.php
@@ -4,7 +4,7 @@
 <div class="rotate-counter-clockwise"
      href="<?= url::site("quick/rotate/$item->id/ccw?csrf=" . access::csrf_token()) ?>">
   <span>
-    <?= _("Rotate CCW") ?>
+    <?= t("Rotate CCW") ?>
   </span>
 </div>
 <? endif ?>
@@ -12,7 +12,7 @@
 <div class="edit gDialogLink"
      href="<?= url::site("quick/form_edit/$item->id") ?>">
   <span>
-    <?= _("Edit") ?>
+    <?= t("Edit") ?>
   </span>
 </div>
 
@@ -20,7 +20,7 @@
 <div class="rotate-clockwise"
      href="<?= url::site("quick/rotate/$item->id/cw?csrf=" . access::csrf_token()) ?>">
   <span>
-    <?= _("Rotate CCW") ?>
+    <?= t("Rotate CCW") ?>
   </span>
 </div>
 <? endif ?>