changeset 54:5f0e174c8adc

Hopefully fixed the usage of "mails".
author Zerotorescue
date Sun, 12 Sep 2010 22:07:12 +0200
parents 6b3d894b20f5
children 75c36b3d5443
files Changelog.txt Modules/Collected.lua Modules/Config.lua Modules/OpenAll.lua
diffstat 4 files changed, 19 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/Changelog.txt	Sun Sep 12 21:24:09 2010 +0200
+++ b/Changelog.txt	Sun Sep 12 22:07:12 2010 +0200
@@ -2,6 +2,10 @@
 A Added
 M Modified
 
+v1.1.3		Zerotorescue		?		rev ?
+
+	M Hopefully fixed the usage of "mails".
+
 v1.1.2		Zerotorescue		Sun, 12 Sep 2010 21:30:00 +0200		rev 52
 	
 	A Holding shift while clicking the open all button will now temporarily change the mail opening filters to auto loot every single mail with attachments (no exceptions).
--- 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!
--- a/Modules/Config.lua	Sun Sep 12 21:24:09 2010 +0200
+++ b/Modules/Config.lua	Sun Sep 12 22:07:12 2010 +0200
@@ -306,7 +306,7 @@
 						order = 15,
 						type = "toggle",
 						name = "Continue trying to open mail after your bags are full",
-						desc = "If there are a lot of stackable items in your mailbox (e.g. glyphs) you may want to toggle this option on.\n\nThis will cause your Blizzard error frame to get extremely spammy if there are many mails remaining. With this disabled, Mail Opener will completely stop opening mail while your inventory is full.",
+						desc = "If there are a lot of stackable items in your mailbox (e.g. glyphs) you may want to toggle this option on.\n\nThis will cause your Blizzard error frame to get extremely spammy if there's a lot of mail remaining. With this disabled, Mail Opener will completely stop opening mail while your inventory is full.",
 						width = "full",
 						get =  function() return MailOpener.db.profile.general.continueOpeningStackableItems; end,
 						set = function(i, v) MailOpener.db.profile.general.continueOpeningStackableItems = v; end,
@@ -440,7 +440,7 @@
 						order = 22,
 						type = "toggle",
 						name = "Announce when |cfffed000finished opening the current batch|r",
-						desc = "Announce when opening of the current batch of mails has been completed.",
+						desc = "Announce when opening of the current batch of mail has been completed.",
 						set = function(i, v) MailOpener.db.profile.notifications.finishedCurrentBatch = v; end,
 						get = function() return MailOpener.db.profile.notifications.finishedCurrentBatch; end,
 						width = "double",
--- a/Modules/OpenAll.lua	Sun Sep 12 21:24:09 2010 +0200
+++ b/Modules/OpenAll.lua	Sun Sep 12 22:07:12 2010 +0200
@@ -772,7 +772,7 @@
 						order = 20,
 						type = "toggle",
 						name = "Open all |cfffed000auction canceled|r mail",
-						desc = "Automatically loot all auction canceled mails from the auction house.",
+						desc = "Automatically loot all auction canceled mail from the auction house.",
 						set = function(i, v) self.db.profile.filter.AH.canceled = v; end,
 						get = function() return self.db.profile.filter.AH.canceled; end,
 						width = "double",
@@ -781,7 +781,7 @@
 						order = 21,
 						type = "toggle",
 						name = "Open all |cfffed000auction expired|r mail",
-						desc = "Automatically loot all auction canceled mails from the auction house.",
+						desc = "Automatically loot all auction canceled mail from the auction house.",
 						set = function(i, v) self.db.profile.filter.AH.expired = v; end,
 						get = function() return self.db.profile.filter.AH.expired; end,
 						width = "double",
@@ -790,7 +790,7 @@
 						order = 22,
 						type = "toggle",
 						name = "Open all |cfffed000outbid on|r mail",
-						desc = "Automatically loot all auction outbid mails from the auction house.",
+						desc = "Automatically loot all auction outbid mail from the auction house.",
 						set = function(i, v) self.db.profile.filter.AH.outbid = v; end,
 						get = function() return self.db.profile.filter.AH.outbid; end,
 						width = "double",
@@ -799,7 +799,7 @@
 						order = 23,
 						type = "toggle",
 						name = "Open all |cfffed000auction successful|r mail",
-						desc = "Automatically loot all auction successful mails from the auction house.",
+						desc = "Automatically loot all auction successful mail from the auction house.",
 						set = function(i, v) self.db.profile.filter.AH.success = v; end,
 						get = function() return self.db.profile.filter.AH.success; end,
 						width = "double",
@@ -808,7 +808,7 @@
 						order = 24,
 						type = "toggle",
 						name = "Open all |cfffed000auction won|r mail",
-						desc = "Automatically loot all auction won mails from the auction house.",
+						desc = "Automatically loot all auction won mail from the auction house.",
 						set = function(i, v) self.db.profile.filter.AH.won = v; end,
 						get = function() return self.db.profile.filter.AH.won; end,
 						width = "double",
@@ -822,7 +822,7 @@
 						order = 40,
 						type = "toggle",
 						name = "Other mail with |cfffed000attachments|r",
-						desc = "Automatically loot all mails with attachments not sent by any of the above sources.",
+						desc = "Automatically loot all mail with attachments not sent by any of the above sources.",
 						set = function(i, v) self.db.profile.filter.normalAttachments = v; end,
 						get = function() return self.db.profile.filter.normalAttachments; end,
 						width = "double",
@@ -831,7 +831,7 @@
 						order = 50,
 						type = "toggle",
 						name = "Other mail with |cfffed000gold|r",
-						desc = "Automatically loot all mails with gold not sent by any of the above sources.",
+						desc = "Automatically loot all mail with gold not sent by any of the above sources.",
 						set = function(i, v) self.db.profile.filter.normalMoney = v; end,
 						get = function() return self.db.profile.filter.normalMoney; end,
 						width = "double",