Mercurial > wow > mailopener

diff Modules/Collected.lua @ 54:5f0e174c8adc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Hopefully fixed the usage of "mails".
author Zerotorescue
date Sun, 12 Sep 2010 22:07:12 +0200
parents 81e7cfcc36b9
children 75c36b3d5443
line wrap: on
line diff
--- a/Modules/Collected.lua	Sun Sep 12 21:24:09 2010 +0200
+++ b/Modules/Collected.lua	Sun Sep 12 22:07:12 2010 +0200
@@ -254,21 +254,14 @@
 			printMessage = printMessage .. format("Spent %d seconds collecting mail. ", mailOpened, timeSpentSeconds);
 		end
 	end
-		
-	local mailsPrefix = "";
-	if mailOpened == 1 then
-		mailsPrefix = "From this mail";
-	else
-		mailsPrefix = "From these mails";
-	end
 	
 	-- Did we record any items or gold being looted?
 	if (itemsGained and itemsGained > 0) and (earned and earned > 0) then
-		printMessage = printMessage .. format("%s you gained %d items and %s.", mailsPrefix, itemsGained, MailOpener:FormatMoney(earned));
+		printMessage = printMessage .. format("You gained %d items and %s from this.", itemsGained, MailOpener:FormatMoney(earned));
 	elseif itemsGained and itemsGained > 0 then
-		printMessage = printMessage .. format("%s you gained %d items.", mailsPrefix, itemsGained);
+		printMessage = printMessage .. format("You gained %d items from this.", itemsGained);
 	elseif earned and earned > 0 then
-		printMessage = printMessage .. format("%s you gained %s.", mailsPrefix, MailOpener:FormatMoney(earned));
+		printMessage = printMessage .. format("You gained %s from this.", MailOpener:FormatMoney(earned));
 	end
 	
 	-- Did we record anything? print that!
@@ -304,20 +297,13 @@
 			end
 		end
 		
-		local mailsPrefix = "";
-		if sessionMailOpened == 1 then
-			mailsPrefix = "From this mail";
-		else
-			mailsPrefix = "From these mails";
-		end
-		
 		-- Did we record any items or gold being looted?
 		if (sessionItemsgained and sessionItemsgained > 0) and (sessionEarned and sessionEarned > 0) then
-			printMessage = printMessage .. format("%s you gained %d items and %s.", mailsPrefix, sessionItemsgained, MailOpener:FormatMoney(sessionEarned));
+			printMessage = printMessage .. format("You gained %d items and %s from this.", sessionItemsgained, MailOpener:FormatMoney(sessionEarned));
 		elseif sessionItemsgained and sessionItemsgained > 0 then
-			printMessage = printMessage .. format("%s you gained %d items.", mailsPrefix, sessionItemsgained);
+			printMessage = printMessage .. format("You gained %d items from this.", sessionItemsgained);
 		elseif sessionEarned and sessionEarned > 0 then
-			printMessage = printMessage .. format("%s you gained %s.", mailsPrefix, MailOpener:FormatMoney(sessionEarned));
+			printMessage = printMessage .. format("You gained %s from this.", MailOpener:FormatMoney(sessionEarned));
 		end
 	
 		-- Did we record anything? print that!