From 43240897d3cd94320b0ee642b20cfa688aa51209 Mon Sep 17 00:00:00 2001
From: Manuel Simon Hirsig <simon.hirsig@gmail.com>
Date: Mon, 22 Feb 2016 09:18:29 +0100
Subject: [PATCH] refactorings

---
 Postal.lua            |  2 +-
 Postal.xml            |  8 ++------
 localization.cn.lua   | 26 --------------------------
 localization.fr.lua   | 27 ---------------------------
 localization.ge.lua   | 20 --------------------
 localization.lua      | 22 ----------------------
 localization.zhTW.lua | 33 ---------------------------------
 localization.zhcn.lua | 34 ----------------------------------
 8 files changed, 3 insertions(+), 169 deletions(-)
 delete mode 100644 localization.cn.lua
 delete mode 100644 localization.fr.lua
 delete mode 100644 localization.ge.lua
 delete mode 100644 localization.lua
 delete mode 100644 localization.zhTW.lua
 delete mode 100644 localization.zhcn.lua

diff --git a/Postal.lua b/Postal.lua
index f61a5ab..6b5b010 100644
--- a/Postal.lua
+++ b/Postal.lua
@@ -481,7 +481,7 @@ function Postal:SendMail()
 			local name, _, count = GetSendMailItem()
 
 			if not name then 
-				Postal:Print("Postal: " .. POSTAL_ERROR, 1, 0, 0)
+				Postal:Print("Postal: An error occured in POSTAL. This might be related to lag, trying to send items with an item placed in the normal send mail window, or trying to send items that cannot be sent.", 1, 0, 0)
 				PostalGlobalFrame:Hide()
 				return
 			end
diff --git a/Postal.xml b/Postal.xml
index d89ba5e..7cb34e4 100644
--- a/Postal.xml
+++ b/Postal.xml
@@ -1,9 +1,5 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
 C:\Projects\WoW\Bin\Interface\FrameXML\UI.xsd">
-	<Script file="localization.lua"/>
-	<Script file="localization.ge.lua"/>
-	<Script file="localization.fr.lua"/>
-	<Script file="localization.cn.lua"/>
 	<Script file="Postal.lua"/>
 	<frame>
 		<Scripts>
@@ -244,7 +240,7 @@ C:\Projects\WoW\Bin\Interface\FrameXML\UI.xsd">
 	<CheckButton name="PostalBoxItem5CB" id="5" hidden="true" parent="MailItem5" inherits="PostalBoxItemCBTemplate"/>
 	<CheckButton name="PostalBoxItem6CB" id="6" hidden="true" parent="MailItem6" inherits="PostalBoxItemCBTemplate"/>
 	<CheckButton name="PostalBoxItem7CB" id="7" hidden="true" parent="MailItem7" inherits="PostalBoxItemCBTemplate"/>
-	<Button name="PostalInboxOpenSelected" parent="InboxFrame" inherits="UIPanelButtonTemplate" text="POSTAL_INBOX_OPENSELECTED">
+	<Button name="PostalInboxOpenSelected" parent="InboxFrame" inherits="UIPanelButtonTemplate" text="Open Selected">
 		<Size>
 			<AbsDimension x="120" y="25"/>
 		</Size>
@@ -261,7 +257,7 @@ C:\Projects\WoW\Bin\Interface\FrameXML\UI.xsd">
 			</OnClick>
 		</Scripts>
 	</Button>
-	<Button name="PostalInboxOpenAllButton" parent="InboxFrame" inherits="UIPanelButtonTemplate" text="POSTAL_INBOX_OPENALL">
+	<Button name="PostalInboxOpenAllButton" parent="InboxFrame" inherits="UIPanelButtonTemplate" text="Open All">
 		<Size>
 			<AbsDimension x="120" y="25"/>
 		</Size>
diff --git a/localization.cn.lua b/localization.cn.lua
deleted file mode 100644
index 59557c2..0000000
--- a/localization.cn.lua
+++ /dev/null
@@ -1,26 +0,0 @@
--- zhCN localization  by hk2717
-
-if GetLocale() == "zhCN" then
-	POSTAL_HELP = "将物品拖入下面的空格中。每个物品都将以单独的邮件发送给收件人。邮件标题为你输入的标题后加物品名称数量(例如: <标题> [金锭 x10])。合计邮资显示于顶部右侧。你可以按住Alt键单击你背包中的物品，直接将其添加到邮件列表中。";
-
-	POSTAL_SEND = "发送邮件";
-	POSTAL_SENDBUTTON = "发送";
-	POSTAL_CANCELBUTTON = "取消";
-
-	POSTAL_SENDINFO = "你确定要发送这些邮件吗？合计邮资：";
-	POSTAL_SENDINFO2 = "正在发送：";
-	POSTAL_ITEMS = "物品";
-	POSTAL_ABORT = "中止";
-
-	POSTAL_ITEMNUM = "已发送%d个物品，总计%d个物品。";
-	POSTAL_SENDING = "发送邮件 |c00FFFFFF%d|r/|c00FFFFFF%d|r…";
-	POSTAL_DONESENDING = "邮寄完毕，总计|c00FFFFFF%d|r封邮件";
-	POSTAL_ABORTED = "中止邮寄,已寄出|c00FFFFFF%d|r/|c00FFFFFF%d|r封邮件。";
-	POSTAL_ERROR = "POSTAL出现了一个错误。可能是由网络延迟导致的，请尝试用普通邮件窗口邮寄一个物品。也可能是试图邮寄不能邮寄的物品而导致。";
-
-	POSTAL_INBOX_OPENSELECTED = "打开选择";
-	POSTAL_INBOX_OPENALL = "打开全部";
-	POSTAL_INBOX_OPENALLTITLE = "打开全部？";
-	POSTAL_INBOX_OPENALLCONFIRMATION = "确定要打开全部邮件吗？";
-	POSTAL_INBOX_DISPLAYPROCESSMESSAGES = "显示进程信息";
-end
diff --git a/localization.fr.lua b/localization.fr.lua
deleted file mode 100644
index 4741d2b..0000000
--- a/localization.fr.lua
+++ /dev/null
@@ -1,27 +0,0 @@
--- Version : French ( by Sasmira )
--- Last Update : 03/29/2005
-
-if GetLocale() == "frFR" then
-	POSTAL_HELP = "compl\195\169tez autant de cases que vous souhaitez. Chaque article sera envoy\195\169 s\195\169par\195\169ment dans un courrier au destinataire, avec le sujet que vous sp\195\169cifiez et qui sera attach\195\169 au nom de l\'objet plus un num\195\169ro, ( Pour exemple : <Sujet> [Barre d\'Or x10]). L\'affranchissement combin\195\169 est montr\195\169 dans le coin en haut \195\60 droite. Vous pouvez ALT-Clic Gauche sur les objets dans votre inventaire afin de les ajouter \195\60 la liste automatiquement.";
-
-	POSTAL_SEND = "Envoyer un Message";
-	POSTAL_SENDBUTTON = "Envoi";
-	POSTAL_CANCELBUTTON = "Annuler";
-
-	POSTAL_SENDINFO = "Etes vous sur de vouloir envoyer ce message ? La Somme Totale pour les messages post\195\169s sera de :";
-	POSTAL_SENDINFO2 = "Vous avez envoy\195\169 :";
-	POSTAL_ITEMS = "Objet(s)";
-	POSTAL_ABORT = "Abandonner";
-
-	POSTAL_ITEMNUM = "Objet %d hors de %d.";
-	POSTAL_SENDING = "Envoi de Messages |c00FFFFFF%d|r/|c00FFFFFF%d|r...";
-	POSTAL_DONESENDING = "Envoi de |c00FFFFFF%d|r message(s) termin\195\169(s) !";
-	POSTAL_ABORTED = "Abandonn\195\169. |c00FFFFFF%d|r/|c00FFFFFF%d|r de message(s) a \195\169t\195\169 envoy\195\169.";
-	POSTAL_ERROR = "Une Erreur c\'est produite dans Postal. Envoyez un rapport de bug \195\160 l\'url suivante : http://www.ctmod.net";
-
-	POSTAL_INBOX_OPENSELECTED = "Ouvrir la s\195\169lection";
-	POSTAL_INBOX_OPENALL = "Tous les Ouvrir";
-	POSTAL_INBOX_OPENALLTITLE = "Ouvrir les messages ?";
-	POSTAL_INBOX_OPENALLCONFIRMATION = "Etes vous sur de vouloir ouvrir tous les messages ?";
-	POSTAL_INBOX_DISPLAYPROCESSMESSAGES = "Afficher les processus";
-end
diff --git a/localization.ge.lua b/localization.ge.lua
deleted file mode 100644
index 489aced..0000000
--- a/localization.ge.lua
+++ /dev/null
@@ -1,20 +0,0 @@
-if GetLocale() == "deDE" then
-	-- Credits to Hj�rvar�r for these
-
-	POSTAL_HELP = "Belege soviele Pl\195\164tze wie du m\195\182chtest. Jeder Gegenstand wird seperat an den Empf\195\164nger gesendet, und zwar mit dem Betreff den du bestimmst gefolgt vom Namen des Gegenstands und dessen Anzahl (z.B. <Betreff> [Goldbarren x10]). Die zusammengefassten Versandkosten werden oben rechts angezeigt. Du kannst Gegenst\195\164nde in deinen Taschen durch Alt-Klick automatisch zur Liste hinzuf\195\188gen.";
-
-	POSTAL_SEND = "Post verschicken";
-	POSTAL_SENDBUTTON = "Verschicken";
-	POSTAL_CANCELBUTTON = "Abbrechen";
-
-	POSTAL_SENDINFO = "Bist du sicher das du die Post verschicken willst?  Die gesamten Versandkosten belaufen sich auf:";
-	POSTAL_SENDINFO2 = "Du verschickst:";
-	POSTAL_ITEMS = "Item(s)";
-	POSTAL_ABORT = "Abbrechen";
-
-	POSTAL_ITEMNUM = "Gegenstand %d von %d.";
-	POSTAL_SENDING = "Verschicke P\195\164ckchen |c00FFFFFF%d|r/|c00FFFFFF%d|r...";
-	POSTAL_DONESENDING = "Verschicken von |c00FFFFFF%d|r P\195\164ckchen erledigt!";
-	POSTAL_ABORTED = "Abgebrochen. |c00FFFFFF%d|r/|c00FFFFFF%d|r P\195\164ckchen wurde(n) verschickt.";
-	POSTAL_ERROR = "Ein Fehler in Postal ist aufgetreten. Bitte \195\188bermittle einen Fehlerbericht auf http://www.ctmod.net";
-end
diff --git a/localization.lua b/localization.lua
deleted file mode 100644
index f827ad6..0000000
--- a/localization.lua
+++ /dev/null
@@ -1,22 +0,0 @@
-POSTAL_HELP = "Fill in as many slots as you want. Each item will be sent in a separate mail to the recipient, with the subject you specify, followed by the item's name and count (for example: <Subject> [Gold Bar x10]). The combined postage is shown in the top right. You can alt-click on items in your bags to add them to the list automatically.";
-
-POSTAL_SEND = "Send Mail";
-POSTAL_SENDBUTTON = "Send";
-POSTAL_CANCELBUTTON = "Cancel";
-
-POSTAL_SENDINFO = "Are you sure you want to send the mail? Total postage will be:";
-POSTAL_SENDINFO2 = "You are sending:";
-POSTAL_ITEMS = "Item(s)";
-POSTAL_ABORT = "Abort";
-
-POSTAL_ITEMNUM = "Item %d out of %d.";
-POSTAL_SENDING = "Sending mail |c00FFFFFF%d|r/|c00FFFFFF%d|r...";
-POSTAL_DONESENDING = "Done sending |c00FFFFFF%d|r mail(s)!";
-POSTAL_ABORTED = "Aborted. |c00FFFFFF%d|r/|c00FFFFFF%d|r mail were sent.";
-POSTAL_ERROR = "An error occured in POSTAL. This might be related to lag, trying to send items with an item placed in the normal send mail window, or trying to send items that cannot be sent.";
-
-POSTAL_INBOX_OPENSELECTED = "Open Selected";
-POSTAL_INBOX_OPENALL = "Open All";
-POSTAL_INBOX_OPENALLTITLE = "Open All?";
-POSTAL_INBOX_OPENALLCONFIRMATION = "Are you sure you want to open all mail?";
-POSTAL_INBOX_DISPLAYPROCESSMESSAGES = "Display process messages";
diff --git a/localization.zhTW.lua b/localization.zhTW.lua
deleted file mode 100644
index 4f94cdb..0000000
--- a/localization.zhTW.lua
+++ /dev/null
@@ -1,33 +0,0 @@
-if GetLocale() == "zhTW" then
-	POSTAL_HELP = "將物品拖入下面空格中。每件物品都將以單獨的信件寄給收件者。郵件標題為你輸入的標題+物品名稱+數量(例: <標題> [夢葉草 x10])。郵資計算顯示於右上方。你可以使用Alt點選背包中的物品直接加入寄件清單中。";
-
-	POSTAL_SEND = "發送郵件";
-	POSTAL_SENDBUTTON = "發送";
-	POSTAL_CANCELBUTTON = "取消";
-
-	POSTAL_SENDINFO = "你確定要發送這些郵件嗎？合計郵資：";
-	POSTAL_SENDINFO2 = "正在發送：";
-	POSTAL_ITEMS = "物品";
-	POSTAL_ABORT = "中止";
-
-	POSTAL_ITEMNUM = "已發送%d件物品，總計%d件物品。";
-	POSTAL_SENDING = "發送郵件 |c00FFFFFF%d|r/|c00FFFFFF%d|r...";
-	POSTAL_DONESENDING = "寄件完畢，總計|c00FFFFFF%d|r封郵件";
-	POSTAL_ABORTED = "中止發送，已寄出|c00FFFFFF%d|r/|c00FFFFFF%d|r封郵件";
-	POSTAL_ERROR = "Gmail出現了一個錯誤，可能是網路延遲所導致，請嘗試用普通郵件寄出一件物品，也有可能是點選了不能郵寄的物品所導致。";
-
-	POSTAL_INBOX_OPENSELECTED = "打開選擇郵件";
-	POSTAL_INBOX_OPENALL = "打開全部郵件";
-	POSTAL_INBOX_OPENALLTITLE = "打開全部？";
-	POSTAL_INBOX_OPENALLCONFIRMATION = "確定要打開全部郵件嗎？";
-	POSTAL_INBOX_DISPLAYPROCESSMESSAGES = "顯示處理過程";
-
-	POSTAL_MASS_MAIL="群發郵件";
-	POSTAL_FORWARD="轉寄";
-
-	POSTAL_NOSUBJECT="<無標題>"
-	POSTAL_UNKNOWNSENDER="<未知寄件者>"
-	POSTAL_OPEN_FORMAT1="Postal: 郵件 |c00FFFFFF%d|r/|c00FFFFFF%d|r 是C.O.D郵件，忽略。"
-	POSTAL_OPEN_FORMAT2="Postal: 郵件 |c00FFFFFF%d|r/|c00FFFFFF%d|r 沒有附帶金錢或物品，忽略。"
-	POSTAL_OPEN_FORMAT3="Postal: 正在打開郵件 |c00FFFFFF%d|r/|c00FFFFFF%d|r: \"|c00FFFFFF%s|r\" 來自 |c00FFFFFF%s|r。"
-end
\ No newline at end of file
diff --git a/localization.zhcn.lua b/localization.zhcn.lua
deleted file mode 100644
index 3cb42ba..0000000
--- a/localization.zhcn.lua
+++ /dev/null
@@ -1,34 +0,0 @@
---[[ $Id: localization.zhcn.lua 13144 2006-10-06 01:35:52Z hshh $ ]]--
-if GetLocale() == "zhCN" then
-	POSTAL_HELP = "将你要发送的物品放入下面的格子,每样物品将自动通过分开的邮件发送出去.邮件标题将使用填写的主题加上物品描述.总的邮资显示在右上角.你也可以通过按住ALT键点击你的背包中的物品添加到邮件里.";
-
-	POSTAL_SEND = "发送批量邮件";
-	POSTAL_SENDBUTTON = "发送";
-	POSTAL_CANCELBUTTON = "取消";
-
-	POSTAL_SENDINFO = "你真的确定要发送这个批量邮件么? 总的邮资是:";
-	POSTAL_SENDINFO2 = "你将要发送:";
-	POSTAL_ITEMS = "个物品";
-	POSTAL_ABORT = "终止发送";
-
-	POSTAL_ITEMNUM = "这是批量发送邮件的第%d个物品, 共%d个.";
-	POSTAL_SENDING = "正在发送邮件 |c00FFFFFF%d|r/|c00FFFFFF%d|r...";
-	POSTAL_DONESENDING = "已发送 |c00FFFFFF%d|r 封邮件!";
-	POSTAL_ABORTED = "已终止. |c00FFFFFF%d|r/|c00FFFFFF%d|r 封邮件已发送.";
-	POSTAL_ERROR = "POSTAL 出错. 造成这个原因有可能是网络或服务器延迟, 或者你发送的物品是不能被邮件传递的, 请尝试使用正常途径发送邮件.";
-
-	POSTAL_INBOX_OPENSELECTED = "打开已选";
-	POSTAL_INBOX_OPENALL = "打开所有";
-	POSTAL_INBOX_OPENALLTITLE = "确定打开所有?";
-	POSTAL_INBOX_OPENALLCONFIRMATION = "你确定要打开所有邮件么?";
-	POSTAL_INBOX_DISPLAYPROCESSMESSAGES = "显示处理信息";
-
-	POSTAL_MASS_MAIL="批量邮件";
-	POSTAL_FORWARD="转发";
-
-	POSTAL_NOSUBJECT="<无标题>"
-	POSTAL_UNKNOWNSENDER="<未知发信者>"
-	POSTAL_OPEN_FORMAT1="Postal: 邮件 |c00FFFFFF%d|r/|c00FFFFFF%d|r 是付费邮件, 忽略."
-	POSTAL_OPEN_FORMAT2="Postal: 邮件 |c00FFFFFF%d|r/|c00FFFFFF%d|r 没有附带金钱或物品, 忽略."
-	POSTAL_OPEN_FORMAT3="Postal: 正在打开邮件 |c00FFFFFF%d|r/|c00FFFFFF%d|r: \"|c00FFFFFF%s|r\" 来自 |c00FFFFFF%s|r."
-end
\ No newline at end of file