From 397833561edd08eb6d72a420e318e414e561af91 Mon Sep 17 00:00:00 2001
From: "morse%netscape.com"
 <morse%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 30 Jul 2000 20:07:43 +0000
Subject: [PATCH] fix bug 46947, localization of strings in wallet interview
 form, r=dp

git-svn-id: svn://10.0.0.236/trunk@75212 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/extensions/wallet/editor/interview.html   | 15 ++-------------
 mozilla/extensions/wallet/src/wallet.cpp          | 14 +++++++++++---
 .../resources/content/tasksOverlay.js             |  7 -------
 3 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/mozilla/extensions/wallet/editor/interview.html b/mozilla/extensions/wallet/editor/interview.html
index abc316ff44d..2725ca089e2 100644
--- a/mozilla/extensions/wallet/editor/interview.html
+++ b/mozilla/extensions/wallet/editor/interview.html
@@ -37,22 +37,11 @@ your Form Manager Information here</font></font></font></h3></center>
 <script>
 
   function Save() {
-   appCore = Components
+    appCore = Components
                 .classes["component://netscape/appshell/component/browser/instance"]
                 .createInstance(Components.interfaces.nsIBrowserInstance);
-   if (appCore) {
+    if (appCore) {
       status = appCore.walletRequestToCapture(window._content);
-
-      /* need to localize the following strings */
-      if (status == -1) { /* UnableToCapture */
-        alert("UnableToCapture");
-      } else if (status == 0) { /* Captured */
-        alert("Your interview information has been saved");
-      } else if (status == +1) { /* NotCaptured */
-        alert("There is no information to save.");
-      }
-    } else {
-      alert("Error occured when trying to save data");
     }
   }
 
diff --git a/mozilla/extensions/wallet/src/wallet.cpp b/mozilla/extensions/wallet/src/wallet.cpp
index dfec82be1a4..73d9526f44b 100644
--- a/mozilla/extensions/wallet/src/wallet.cpp
+++ b/mozilla/extensions/wallet/src/wallet.cpp
@@ -3379,15 +3379,23 @@ WLLT_RequestToCapture(nsIPresShell* shell, nsIDOMWindow* win, PRUint32* status)
       }
     }
   }
+
+  PRUnichar * message;
+
   if (gEncryptionFailure) {
-    *status = -1; /* UnableToCapture */
+    message = Wallet_Localize("UnableToCapture");
+    *status = -1;
   } else if (captureCount) {
     /* give caveat if this is the first time data is being captured */
     Wallet_GiveCaveat(win, nsnull);
-    *status = 0; /* Captured */
+    message = Wallet_Localize("Captured");
+    *status = 0;
   } else {
-    *status = +1; /* NotCaptured */
+    message = Wallet_Localize("NotCaptured");
+    *status = +1;
   }
+  wallet_Alert(message, win);
+  Recycle(message);
 }
 
 /* should move this to an include file */
diff --git a/mozilla/xpfe/communicator/resources/content/tasksOverlay.js b/mozilla/xpfe/communicator/resources/content/tasksOverlay.js
index 807905fc3c1..7b8db24c951 100644
--- a/mozilla/xpfe/communicator/resources/content/tasksOverlay.js
+++ b/mozilla/xpfe/communicator/resources/content/tasksOverlay.js
@@ -359,13 +359,6 @@ function WalletAction( action )
       case "capture":
       default:
         status = appCore.walletRequestToCapture(window._content);
-        if (status == -1) { /* UnableToCapture */
-          window.alert(strings.getAttribute("UnableToCapture"));
-        } else if (status == 0) { /* Captured */
-          window.alert(strings.getAttribute("Captured"));
-        } else if (status == +1) { /* NotCaptured */
-          window.alert(strings.getAttribute("NotCaptured"));
-        }
         break;
     }
   }