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.

2 files changed, 6 insertions, 6 deletions

diff --git a/modules/akismet/helpers/akismet.php b/modules/akismet/helpers/akismet.php
index 12d7a106..df4e7cfe 100644
--- a/modules/akismet/helpers/akismet.php
+++ b/modules/akismet/helpers/akismet.php
@@ -30,10 +30,10 @@ class akismet_Core {
 
   public static function get_configure_form() {
     $form = new Forge("admin/akismet", "", "post");
-    $group = $form->group("configure_akismet")->label(_("Configure Akismet"));
-    $group->input("api_key")->label(_("API Key"))->value(module::get_var("akismet", "api_key"));
-    $group->api_key->error_messages("invalid", _("The API key you provided is invalid."));
-    $group->submit(_("Save"));
+    $group = $form->group("configure_akismet")->label(t("Configure Akismet"));
+    $group->input("api_key")->label(t("API Key"))->value(module::get_var("akismet", "api_key"));
+    $group->api_key->error_messages("invalid", t("The API key you provided is invalid."));
+    $group->submit(t("Save"));
     return $form;
   }
 
diff --git a/modules/akismet/helpers/akismet_menu.php b/modules/akismet/helpers/akismet_menu.php
index 4a0c9b11..00bea8ad 100644
--- a/modules/akismet/helpers/akismet_menu.php
+++ b/modules/akismet/helpers/akismet_menu.php
@@ -22,14 +22,14 @@ class akismet_menu_Core {
     $menu->get("settings_menu")
       ->append(Menu::factory("link")
                ->id("akismet")
-               ->label(_("Akismet"))
+               ->label(t("Akismet"))
                ->url(url::site("admin/akismet")));
 
     if (module::get_var("akismet", "api_key")) {
       $menu->get("statistics_menu")
         ->append(Menu::factory("link")
                  ->id("akismet")
-                 ->label(_("Akismet"))
+                 ->label(t("Akismet"))
                  ->url(url::site("admin/akismet/stats")));
     }
   }