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.

1 files changed, 12 insertions, 12 deletions

diff --git a/modules/watermark/views/admin_watermarks.html.php b/modules/watermark/views/admin_watermarks.html.php
index a41d4d3e..106d05ce 100644
--- a/modules/watermark/views/admin_watermarks.html.php
+++ b/modules/watermark/views/admin_watermarks.html.php
@@ -1,36 +1,36 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div id="#gWatermarks">
-  <h1> <?= _("Watermarks") ?> </h1>
+  <h1> <?= t("Watermarks") ?> </h1>
   <p>
-    <?= _("You can have one watermark for your Gallery.  This watermark will be applied to all thumbnails and resized images, but it will not be applied to your full size images.  To make sure that your guests can only see watermarked images, you should restrict access to your full size images.") ?>
+    <?= t("You can have one watermark for your Gallery.  This watermark will be applied to all thumbnails and resized images, but it will not be applied to your full size images.  To make sure that your guests can only see watermarked images, you should restrict access to your full size images.") ?>
   </p>
 
   <? if (empty($name)): ?>
   <a href="<?= url::site("admin/watermarks/form_add") ?>"
-     title="<?= _("Upload a watermark") ?>"
-     class="gDialogLink"><?= _("Upload a watermark") ?></a>
+     title="<?= t("Upload a watermark") ?>"
+     class="gDialogLink"><?= t("Upload a watermark") ?></a>
   <? else: ?>
-  <h2> <?= _("Active Watermark") ?> </h2>
+  <h2> <?= t("Active Watermark") ?> </h2>
   <p>
-    <?= _("Note that changing this watermark will require you to rebuild all of your thumbnails and resized images.") ?>
+    <?= t("Note that changing this watermark will require you to rebuild all of your thumbnails and resized images.") ?>
   </p>
   <div>
     <div class="image">
       <img width="<?= $width ?>" height="<?= $height ?>" src="<?= $url ?>"/>
       <p>
-        <?= sprintf(_("Position: %s"), watermark::position($position)) ?>
+        <?= t("Position: {{position}}", array("position" => watermark::position($position))) ?>
       </p>
       <p>
-        <?= sprintf(_("Transparency: %s%%"), module::get_var("watermark", "transparency")) ?>
+        <?= t("Transparency: {{transparency}}%", array("transparency" => module::get_var("watermark", "transparency"))) ?>
       </p>
     </div>
     <div class="controls">
       <a href="<?= url::site("admin/watermarks/form_edit") ?>"
-         title="<?= _("Edit Watermark") ?>"
-         class="gDialogLink"><?= _("edit") ?></a>
+         title="<?= t("Edit Watermark") ?>"
+         class="gDialogLink"><?= t("edit") ?></a>
       <a href="<?= url::site("admin/watermarks/form_delete") ?>"
-         title="<?= _("Delete Watermark") ?>"
-         class="gDialogLink"><?= _("delete") ?></a>
+         title="<?= t("Delete Watermark") ?>"
+         class="gDialogLink"><?= t("delete") ?></a>
     </div>
   </div>
   <? endif ?>