fix messages when /eco'ing others

7 files changed, 20 insertions, 7 deletions

diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java
index 3e54c0943..2c6e998b3 100644
--- a/Essentials/src/com/earth2me/essentials/User.java
+++ b/Essentials/src/com/earth2me/essentials/User.java
@@ -90,7 +90,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		sendMessage(Util.format("addedToAccount", Util.formatCurrency(value)));
 		if (initiator != null)
 		{
-			initiator.sendMessage((Util.format("addedToAccount", Util.formatCurrency(value))));
+			initiator.sendMessage((Util.format("addedToOthersAccount", Util.formatCurrency(value), this.getDisplayName())));
 		}
 	}
 	
@@ -127,7 +127,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		sendMessage(Util.format("takenFromAccount", Util.formatCurrency(value)));
 		if (initiator != null)
 		{
-			initiator.sendMessage((Util.format("takenFromAccount", Util.formatCurrency(value))));
+			initiator.sendMessage((Util.format("takenFromOthersAccount", Util.formatCurrency(value), this.getDisplayName())));
 		}
 	}
 	
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index b3f83916a..a6c7363a6 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -2,6 +2,7 @@
 # Single quotes have to be doubled: ''
 # Translations start here
 addedToAccount = \u00a7a{0} has been added to your account.
+addedToOthersAccount = \u00a7a{0} has been added to {1} account.
 alertBroke = broke:
 alertFormat = \u00a73[{0}] \u00a7f {1} \u00a76 {2} at: {3}
 alertPlaced = placed:
@@ -106,6 +107,7 @@ invBigger = The other users inventory is bigger than yours.
 invRestored = Your inventory has been restored.
 invSee = You see the inventory of {0}.
 invSeeHelp = Use /invsee to restore your inventory.
+invalidCharge = \u00a7cInvalid charge.
 invalidMob = Invalid mob type.
 invalidServer = Invalid server!
 invalidSignLine = Line {0} on sign is invalid.
@@ -236,6 +238,7 @@ spawned = spawned
 suicideMessage = \u00a77Goodbye Cruel World...
 suicideSuccess =  \u00a77{0} took their own life
 takenFromAccount = \u00a7c{0} has been taken from your account.
+takenFromOthersAccount = \u00a7c{0} has been taken from {1} account.
 teleportAll = \u00a77Teleporting all players...
 teleportAtoB = \u00a77{0}\u00a77 teleported you to {1}\u00a77.
 teleportDisabled = {0} has teleportation disabled.
@@ -312,4 +315,3 @@ year = year
 years = years
 youAreHealed = \u00a77You have been healed.
 youHaveNewMail = \u00a7cYou have {0} messages!\u00a7f Type \u00a77/mail read\u00a7f to view your mail.
-invalidCharge = \u00a7cInvalid charge.
\ No newline at end of file
diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties
index cf73e303f..c7a69c9c6 100644
--- a/Essentials/src/messages_da.properties
+++ b/Essentials/src/messages_da.properties
@@ -4,6 +4,7 @@
 #Danish Translation by papand13, papand13@gmail.com
 #Danish Translation Version: 1.0
 addedToAccount = \u00a7a{0} er tilf\u00f8jet til din konto.
+addedToOthersAccount = \u00a7a{0} er blevet tilf\u00f8jet til {1} konto.
 alertBroke = \u00f8delagde:
 alertFormat = \u00a73[{0}] \u00a7f {1} \u00a76 {2} ved: {3}
 alertPlaced = placerede:
@@ -108,6 +109,7 @@ invBigger = Den anden brugers inventory er st\u00f8rre end din.
 invRestored = Din inventory er blevet genoprettet.
 invSee = Du ser inventoryen af {0}.
 invSeeHelp = Brug /invsee for at genoprette din inventory.
+invalidCharge = \u00a7cUgyldig opladning.
 invalidMob = Ugyldig mob type.
 invalidServer = Ugyldig server!
 invalidSignLine = Linje {0} p\u00e5 skilt er ugyldig.
@@ -238,6 +240,7 @@ spawned = spawnet
 suicideMessage = \u00a77Farvel grusomme verden...
 suicideSuccess =  \u00a77{0} tog sit eget liv
 takenFromAccount = \u00a7c{0} er taget fra din konto.
+takenFromOthersAccount = \u00a7c{0} er blevet taget fra {1} konto.
 teleportAll = \u00a77Teleportere alle spillere...
 teleportAtoB = \u00a77{0}\u00a77 teleporterede dig til {1}\u00a77.
 teleportDisabled = {0} har teleportation deaktiveret.
@@ -314,4 +317,3 @@ year = \u00e5r
 years = \u00e5r
 youAreHealed = \u00a77Du er blevet helbredt.
 youHaveNewMail = \u00a7cDu har {0} beskeder!\u00a7f Type \u00a77/post l\u00e6s\u00a7f for at se din post.
-invalidCharge = \u00a7cUgyldig opladning.
\ No newline at end of file
diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties
index a17e5c736..f409cda60 100644
--- a/Essentials/src/messages_de.properties
+++ b/Essentials/src/messages_de.properties
@@ -2,6 +2,7 @@
 # Single quotes have to be doubled: ''
 # Translations start here
 addedToAccount = \u00a7a{0} wurden zu deiner Geldb\u00f6rse hinzugef\u00fcgt.
+addedToOthersAccount = \u00a7a{0} muss {1} Konto hinzugef\u00fcgt.
 alertBroke = zerst\u00f6rt:
 alertFormat = \u00a73[{0}] \u00a7f {1} \u00a76 {2} bei: {3}
 alertPlaced = plaziert:
@@ -106,6 +107,7 @@ invBigger = Das andere Inventar ist gr\u00f6sser als deins.
 invRestored = Dein Inventar wurde wieder hergestellt.
 invSee = Du siehst das Inventar von {0}.
 invSeeHelp = Benutze /invsee um dein Inventar wiederherzustellen.
+invalidCharge = \u00a7cUng\u00fcltige Verf\u00fcgung.
 invalidMob = Ung\u00fcltiger Monstername.
 invalidServer = Ung\u00fcltiger Server!
 invalidSignLine = Die Zeile {0} auf dem Schild ist falsch.
@@ -236,6 +238,7 @@ spawned = erzeugt
 suicideMessage = \u00a77Lebewohl grausame Welt...
 suicideSuccess =  \u00a77{0} hat sich das Leben genommen.
 takenFromAccount = \u00a7c{0} wurden aus deiner Geldb\u00f6rse genommen.
+takenFromOthersAccount = \u00a7c{0} wurde von {1} wurde Rechnung getragen.
 teleportAll = \u00a77Teleportiere alle Spieler...
 teleportAtoB = \u00a77{0}\u00a77 teleportiert dich zu {1}\u00a77.
 teleportDisabled = {0} verweigert die Teleportierung.
diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
index b3f83916a..a6c7363a6 100644
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@@ -2,6 +2,7 @@
 # Single quotes have to be doubled: ''
 # Translations start here
 addedToAccount = \u00a7a{0} has been added to your account.
+addedToOthersAccount = \u00a7a{0} has been added to {1} account.
 alertBroke = broke:
 alertFormat = \u00a73[{0}] \u00a7f {1} \u00a76 {2} at: {3}
 alertPlaced = placed:
@@ -106,6 +107,7 @@ invBigger = The other users inventory is bigger than yours.
 invRestored = Your inventory has been restored.
 invSee = You see the inventory of {0}.
 invSeeHelp = Use /invsee to restore your inventory.
+invalidCharge = \u00a7cInvalid charge.
 invalidMob = Invalid mob type.
 invalidServer = Invalid server!
 invalidSignLine = Line {0} on sign is invalid.
@@ -236,6 +238,7 @@ spawned = spawned
 suicideMessage = \u00a77Goodbye Cruel World...
 suicideSuccess =  \u00a77{0} took their own life
 takenFromAccount = \u00a7c{0} has been taken from your account.
+takenFromOthersAccount = \u00a7c{0} has been taken from {1} account.
 teleportAll = \u00a77Teleporting all players...
 teleportAtoB = \u00a77{0}\u00a77 teleported you to {1}\u00a77.
 teleportDisabled = {0} has teleportation disabled.
@@ -312,4 +315,3 @@ year = year
 years = years
 youAreHealed = \u00a77You have been healed.
 youHaveNewMail = \u00a7cYou have {0} messages!\u00a7f Type \u00a77/mail read\u00a7f to view your mail.
-invalidCharge = \u00a7cInvalid charge.
\ No newline at end of file
diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties
index 28c70ad0a..174fc528a 100644
--- a/Essentials/src/messages_fr.properties
+++ b/Essentials/src/messages_fr.properties
@@ -2,6 +2,7 @@
 # Single quotes have to be doubled: ''
 # Translations start here
 addedToAccount = \u00a7a{0} a \u00e9t\u00e9 rajout\u00e9 a votre compte.
+addedToOthersAccount = \u00a7a{0} a \u00e9t\u00e9 ajout\u00e9 \u00e0 {1} compte.
 alertBroke = a cass\u00e9: 
 alertFormat = \u00a73[{0}] \u00a7f {1} \u00a76 {2} \u00e0:{3}
 alertPlaced = a plac\u00e9: 
@@ -106,6 +107,7 @@ invBigger = Les inventaires des autres joueurs sont plus gros que le v\u00f4tre.
 invRestored = Votre inventaire vous a \u00e9t\u00e9 rendu.
 invSee = Vous voyez l''inventaire de {0}.
 invSeeHelp = Utilisez /invsee pour voir l''inventaire de quelqu''un.
+invalidCharge = \u00a7cInvalide charge.
 invalidMob = Mauvias type de monstre.
 invalidServer = Serveur non valide.
 invalidSignLine = La ligne {0} du panneau est invalide.
@@ -236,6 +238,7 @@ spawned = spawn\u00e9
 suicideMessage = \u00a77Au revoir monde cruel...
 suicideSuccess = \u00a77{0} a pris sa propre vie.
 takenFromAccount = \u00a7c{0} ont \u00e9t\u00e9 pris de votre compte.
+takenFromOthersAccount = \u00a7c{0} a \u00e9t\u00e9 prise de {1} compte.
 teleportAll = \u00a77T\u00e9l\u00e9poration de tous les joueurs.
 teleportAtoB = \u00a77{0}\u00a77 vous a t\u00e9l\u00e9port\u00e9 \u00e0 {1}\u00a77.
 teleportDisabled = {0} a la t\u00e9l\u00e9portation d\u00e9sactiv\u00e9.
@@ -311,4 +314,3 @@ year = ann\u00e9e
 years = ann\u00e9es
 youAreHealed = \u00a77Vous avez \u00e9t\u00e9 soign\u00e9.
 youHaveNewMail = \u00a7cVous avez {0} messages! \u00a7fEntrez \u00a77/mail read\u00a7f pour voir votre courrier.
-invalidCharge = \u00a7cInvalide charge.
\ No newline at end of file
diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties
index 69cd8bd28..6dab37806 100644
--- a/Essentials/src/messages_nl.properties
+++ b/Essentials/src/messages_nl.properties
@@ -3,6 +3,7 @@
 # Translations start here
 # by Geertje123
 addedToAccount = \u00a7a{0} is aan je bankrekening toegevoegd.
+addedToOthersAccount = \u00a7a{0} is toegevoegd aan {1} rekening
 alertBroke = gebroken:
 alertFormat = \u00a73[{0}] \u00a7f {1} \u00a76 {2} bij: {3}
 alertPlaced = geplaatst:
@@ -107,6 +108,7 @@ invBigger = De inventory van de andere speler is groter dan die van jou.
 invRestored = Je inventory is hersteld.
 invSee = Je kijkt naar de inventory van {0}.
 invSeeHelp = Type /invsee om je inventory te herstellen.
+invalidCharge = \u00a7cOngeldig te laden.
 invalidMob = Ongeldig mob type.
 invalidServer = Ongeldige server!
 invalidSignLine = Regel {0} op het bordje is ongeldig.
@@ -237,6 +239,7 @@ spawned = gespawned
 suicideMessage = \u00a77Vaarwel vreedzame wereld...
 suicideSuccess =  \u00a77{0} pleegde zelfmoord
 takenFromAccount = \u00a7c{0} is van je bank rekening afgehaald.
+takenFromOthersAccount = \u00a7c{0} is overgenomen uit {1} account.
 teleportAll = \u00a77Bezig met teleporteren van alle spelers...
 teleportAtoB = \u00a77{0}\u00a77 is naar {1}\u00a77 geteleporteerd.
 teleportDisabled = {0} heeft teleporteren uit gezet.
@@ -313,4 +316,3 @@ year = jaar
 years = jaren
 youAreHealed = \u00a77Je bent gehealed.
 youHaveNewMail = \u00a7cJe hebt {0} berichten!\u00a7f Type \u00a77/mail read\u00a7f om je berichten te bekijken.
-invalidCharge = \u00a7cOngeldig te laden.
\ No newline at end of file