Mail search matching (69418). r=gayatrib sr=sspitzer

mailnews/base/search/resources/content/SearchDialog.js

@@ -106,9 +106,12 @@ var gSearchNotificationListener =
         if (gNumOfSearchHits == 0) {
             statusMsg = gSearchBundle.getString("searchFailureMessage");
         }
+        else if (gNumOfSearchHits == 1) {
+            statusMsg = gSearchBundle.getString("searchSuccessMessage");
+        }         
         else
         {
-            statusMsg = gNumOfSearchHits + " " + gSearchBundle.getString("searchSuccessMessage");
+            statusMsg = gSearchBundle.getFormattedString("searchSuccessMessages", [gNumOfSearchHits]);
             gNumOfSearchHits = 0;
         }
 

mailnews/base/search/resources/locale/en-US/search.properties

@@ -20,7 +20,8 @@ searchOr0=or the
 # filter stuff
 
 searchingMessage=Searching....
-searchSuccessMessage=matches found
+searchSuccessMessage=1 match found
+searchSuccessMessages=%S matches found
 searchFailureMessage=No matches found
 labelForStopButton=Stop
 labelForSearchButton=Search