From 72281d2b448d77afde709929abaf3ab92883ccce Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Thu, 2 Jul 2009 20:50:29 -0700
Subject: Fix for ticket 470. Replace ReCaptcha with reCAPTCHA in user visible
 strings.

---
 modules/recaptcha/controllers/admin_recaptcha.php | 8 ++++----
 modules/recaptcha/helpers/recaptcha.php           | 4 ++--
 modules/recaptcha/helpers/recaptcha_menu.php      | 2 +-
 modules/recaptcha/module.info                     | 4 ++--
 modules/recaptcha/views/admin_recaptcha.html.php  | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'modules/recaptcha')

diff --git a/modules/recaptcha/controllers/admin_recaptcha.php b/modules/recaptcha/controllers/admin_recaptcha.php
index 5813df8b..6874fce9 100644
--- a/modules/recaptcha/controllers/admin_recaptcha.php
+++ b/modules/recaptcha/controllers/admin_recaptcha.php
@@ -32,8 +32,8 @@ class Admin_Recaptcha_Controller extends Admin_Controller {
         if ($public_key && $private_key) {
           module::set_var("recaptcha", "public_key", $public_key);
           module::set_var("recaptcha", "private_key", $private_key);
-          message::success(t("Recaptcha configured!"));
-          log::success("recaptcha", t("Recaptcha public and private keys set"));
+          message::success(t("reCAPTCHA configured!"));
+          log::success("recaptcha", t("reCAPTCHA public and private keys set"));
           url::redirect("admin/recaptcha");
         } else if ($public_key && !$private_key) {
           $form->configure_recaptcha->private_key->add_error("invalid");
@@ -42,8 +42,8 @@ class Admin_Recaptcha_Controller extends Admin_Controller {
         } else {
           module::set_var("recaptcha", "public_key", "");
           module::set_var("recaptcha", "private_key", "");
-          message::success(t("Recaptcha disabled!"));
-          log::success("recaptcha", t("Recaptcha public and private keys cleared"));
+          message::success(t("reCAPTCHA disabled!"));
+          log::success("recaptcha", t("reCAPTCHA public and private keys cleared"));
           url::redirect("admin/recaptcha");
         }
       }
diff --git a/modules/recaptcha/helpers/recaptcha.php b/modules/recaptcha/helpers/recaptcha.php
index f0bf2aef..501dd972 100644
--- a/modules/recaptcha/helpers/recaptcha.php
+++ b/modules/recaptcha/helpers/recaptcha.php
@@ -21,7 +21,7 @@ class recaptcha_Core {
   static function get_configure_form() {
     $form = new Forge("admin/recaptcha", "", "post", array("id" => "gConfigureRecaptchaForm"));
     $group = $form->group("configure_recaptcha")
-      ->label(t("Configure Recaptcha"));
+      ->label(t("Configure reCAPTCHA"));
     $group->input("public_key")
       ->label(t("Public Key"))
       ->value(module::get_var("recaptcha", "public_key"));
@@ -42,7 +42,7 @@ class recaptcha_Core {
     $private_key = module::get_var("recaptcha", "private_key");
     if (empty($public_key) || empty($private_key)) {
       site_status::warning(
-        t("Recaptcha is not quite ready!  Please configure the <a href=\"%url\">Recaptcha Keys</a>",
+        t("reCAPTCHA is not quite ready!  Please configure the <a href=\"%url\">reCAPTCHA Keys</a>",
           array("url" => url::site("admin/recaptcha"))),
         "recaptcha_config");
     } else {
diff --git a/modules/recaptcha/helpers/recaptcha_menu.php b/modules/recaptcha/helpers/recaptcha_menu.php
index ba3c8b78..047abf8f 100644
--- a/modules/recaptcha/helpers/recaptcha_menu.php
+++ b/modules/recaptcha/helpers/recaptcha_menu.php
@@ -22,7 +22,7 @@ class recaptcha_menu_Core {
     $menu->get("settings_menu")
       ->append(Menu::factory("link")
                ->id("recaptcha")
-               ->label(t("Recaptcha"))
+               ->label(t("reCAPTCHA"))
                ->url(url::site("admin/recaptcha")));
   }
 }
diff --git a/modules/recaptcha/module.info b/modules/recaptcha/module.info
index f2cc50cf..9f44648a 100644
--- a/modules/recaptcha/module.info
+++ b/modules/recaptcha/module.info
@@ -1,3 +1,3 @@
-name = Recaptcha
-description = "Recaptcha displays a graphical verification that protects the input form from abuse from 'bots,' or automated programs usually written to generate spam (http://recaptcha.net)."
+name = reCAPTCHA
+description = "reCAPTCHA displays a graphical verification that protects the input form from abuse from 'bots,' or automated programs usually written to generate spam (http://recaptcha.net)."
 version = 1
diff --git a/modules/recaptcha/views/admin_recaptcha.html.php b/modules/recaptcha/views/admin_recaptcha.html.php
index 4c041ba2..9c2911ef 100644
--- a/modules/recaptcha/views/admin_recaptcha.html.php
+++ b/modules/recaptcha/views/admin_recaptcha.html.php
@@ -1,8 +1,8 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div id="gAdminRecaptcha">
-  <h1> <?= t("ReCaptcha Challenge Filtering") ?> </h1>
+  <h1> <?= t("reCAPTCHA Challenge Filtering") ?> </h1>
   <p>
-    <?= t("Recaptcha is a free anti-bot service that helps digitize books.  In order to use it, you need to sign up for a <a href=\"%domain_url\">ReCaptcha Public/Private Key pair</a>, which is also free.  Once registered, the challenge and response strings are evaluated at <a href=\"%recaptcha_url\">recaptcha.net</a> to determine if the form content has been entered by a bot.",
+    <?= t("reCAPTCHA is a free CAPTCHA service that helps to digitize books, newspapers and old time radio shows.  In order to use it, you need to sign up for a <a href=\"%domain_url\">reCAPTCHA Public/Private Key pair</a>, which is also free.  Once registered, the challenge and response strings are evaluated at <a href=\"%recaptcha_url\">recaptcha.net</a> to determine if the form content has been entered by a bot.",
           array("domain_url" => $form->get_key_url,
                 "recaptcha_url" => "http://recaptcha.net")) ?>
   </p>
@@ -12,9 +12,9 @@
 
 <? if ($public_key && $private_key): ?>
 <div id="gAdminRecaptchaTest" class="gBlock">
-  <h2> <?= t("Recaptcha Test") ?> </h2>
+  <h2> <?= t("reCAPTCHA Test") ?> </h2>
   <p>
-    <?= t("If you see a captcha form below, then Recaptcha is functioning properly.") ?>
+    <?= t("If you see a captcha form below, then reCAPTCHA is functioning properly.") ?>
   </p>
 
   <div id="gRecaptcha"/>
-- 
cgit v1.2.3