From 3dfb23cf55796cc9700f1d379c205b999d5d61da Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Thu, 11 Jun 2009 19:08:24 +0000
Subject: [PATCH] Forward porting Account/Inbox i18n fixes.

---
 lib/WebGUI/Account/Inbox.pm              |  2 +-
 lib/WebGUI/i18n/English/Account_Inbox.pm | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/lib/WebGUI/Account/Inbox.pm b/lib/WebGUI/Account/Inbox.pm
index 6aa43a243..865d06a69 100644
--- a/lib/WebGUI/Account/Inbox.pm
+++ b/lib/WebGUI/Account/Inbox.pm
@@ -873,7 +873,7 @@ sub www_inviteUserSave {
     my @toList = split /[;,]/, $to;
     for my $inviteeEmail (@toList) {
         unless ( $inviteeEmail =~ WebGUI::Utility::emailRegex ) {
-            return $self->www_inviteUser( $i18n->get('invalid email') );
+            return $self->www_inviteUser( sprintf $i18n->get('invalid email'), $inviteeEmail );
         }
 
         # User existance check.
diff --git a/lib/WebGUI/i18n/English/Account_Inbox.pm b/lib/WebGUI/i18n/English/Account_Inbox.pm
index 7bbb855c8..002f26b65 100644
--- a/lib/WebGUI/i18n/English/Account_Inbox.pm
+++ b/lib/WebGUI/i18n/English/Account_Inbox.pm
@@ -475,10 +475,15 @@ our $I18N = {
         lastUpdated => 1181409056,
     },
 
-    'missing message' => {
-        message     => q|Your invitation must have a message.|,
-        lastUpdated => 1181409432,
-    },
+    'invalid email' => {
+		message => q|Invalid email address entered: %s.|,
+		lastUpdated => 1181409056,
+	},
+
+	'missing message' => {
+		message     => q|Your invitiation must have a message.|,
+		lastUpdated => 1181409432,
+	},
 
     'missing subject' => {
         message     => q|Your invitation must have a subject.|,
@@ -490,6 +495,11 @@ our $I18N = {
         lastUpdated => 1227715272,
     },
 
+    'currently invited' => {
+		message     => q|The email address you entered, %s, has an outstanding invitation on this site.|,
+		lastUpdated => 1227715272,
+	},
+
     'no email' => {
         message     => q{The invitation cannot be sent because you do not have an email address set in your profile.},
         lastUpdated => 1119068809,