From f6a5ad64dbbca50f34640107c86bab47496ce369 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Fri, 11 Jul 2008 18:14:17 +0000
Subject: [PATCH] Remove more echo calls from ITransact driver. Add an i18n
 ITransact label to the ITransact i18n. Add a PayDriver i18n label called
 Credit Card to be used by any credit card processing pay driver. Change the
 ITransact getButton method to use that label. Updated the PayDriver label
 hover help to say the label is only used in the Payment method screen and not
 anywhere else.

---
 docs/changelog/7.x.x.txt                       |  1 +
 lib/WebGUI/Shop/PayDriver/ITransact.pm         |  8 ++++----
 lib/WebGUI/i18n/English/PayDriver.pm           | 10 ++++++++--
 lib/WebGUI/i18n/English/PayDriver_ITransact.pm |  5 +++++
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 9c245e289..4c76a7315 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,5 +1,6 @@
 7.5.17
  - fixed: Payment Methods Hover Help Incomplete
+ - fixed: Payment Method Titles Don't Match Buttons
 
 7.5.16
  - Created a migration from 7.4.40 directly to 7.5.16.
diff --git a/lib/WebGUI/Shop/PayDriver/ITransact.pm b/lib/WebGUI/Shop/PayDriver/ITransact.pm
index 26a65e2ed..4198f5b18 100644
--- a/lib/WebGUI/Shop/PayDriver/ITransact.pm
+++ b/lib/WebGUI/Shop/PayDriver/ITransact.pm
@@ -376,7 +376,7 @@ sub definition {
     );
  
     push @{ $definition }, {
-        name        => $i18n->echo('Itransact'),
+        name        => $i18n->get('Itransact'),
         properties  => \%fields,
     };
 
@@ -430,11 +430,11 @@ sub doXmlRequest {
 sub getButton {
     my $self    = shift;
     my $session = $self->session;
-    my $i18n    = WebGUI::International->new($session, 'PayDriver_ITansact');
+    my $i18n    = WebGUI::International->new($session, 'PayDriver');
 
     my $payForm = WebGUI::Form::formHeader($session)
         . $self->getDoFormTags('getCredentials')
-        . WebGUI::Form::submit($session, {value => $i18n->echo('ITransact') })
+        . WebGUI::Form::submit($session, {value => $i18n->get('credit card') })
         . WebGUI::Form::formFooter($session);
 
     return $payForm;
@@ -619,7 +619,7 @@ sub www_getCredentials {
     # Process form errors
     if ( $errors ) {
     #### TODO: i18n
-        $output .= $i18n->echo('The following errors occurred:')
+        $output .= $i18n->get('error occurred message')
             . '<ul><li>' . join( '</li><li>', @{ $errors } ) . '</li></ul>';
     }
     
diff --git a/lib/WebGUI/i18n/English/PayDriver.pm b/lib/WebGUI/i18n/English/PayDriver.pm
index c6e03947e..527f4feef 100644
--- a/lib/WebGUI/i18n/English/PayDriver.pm
+++ b/lib/WebGUI/i18n/English/PayDriver.pm
@@ -58,8 +58,8 @@ our $I18N = {
 	},
 
 	'label help' => {
-		message => q|The name by which this payment gateway is displayed.|,
-		lastUpdated => 1213891193,
+		message => q|The name by which this payment gateway is displayed in the Payment methods screen.|,
+		lastUpdated => 1215799966,
 		context => q|Hover help for the label option.|
 	},
 
@@ -106,6 +106,12 @@ our $I18N = {
         context => q|Help body for the email receipt template|,
     },
 
+    'credit card' => {
+        message => q|Credit Card|,
+        lastUpdated => 1215799807,
+        context => q|Generic label for credit cards to be used through the pay drivers|,
+    },
+
 };
 
 1;
diff --git a/lib/WebGUI/i18n/English/PayDriver_ITransact.pm b/lib/WebGUI/i18n/English/PayDriver_ITransact.pm
index 2d651bb05..be8ac1afd 100755
--- a/lib/WebGUI/i18n/English/PayDriver_ITransact.pm
+++ b/lib/WebGUI/i18n/English/PayDriver_ITransact.pm
@@ -174,6 +174,11 @@ our $I18N = {
 		lastUpdated => 0,
 		context => q|An error indicating that an invalid expiration date has been entered.|
 	},
+	'Itransact' => {
+		message => q|Credit Card (ITransact).|,
+		lastUpdated => 0,
+		context => q|Name of the gateway from the definition|
+	},
 	'expired expiration date' => {
 		message => q|The expiration date on your card has already passed.|,
 		lastUpdated => 0,