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

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>