summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-03-12 01:15:10 +0000
committerKHobbits <rob@khobbits.co.uk>2012-03-12 01:15:10 +0000
commitadffbab6783aa016a7402ae20c922232389f18e1 (patch)
tree782dc247d54fd191b3acf2e0dca8e08e345c46bf
parente11525ab64fb1044a4e7d2c5e2aa4654699b3c34 (diff)
downloadEssentials-adffbab6783aa016a7402ae20c922232389f18e1.tar
Essentials-adffbab6783aa016a7402ae20c922232389f18e1.tar.gz
Essentials-adffbab6783aa016a7402ae20c922232389f18e1.tar.lz
Essentials-adffbab6783aa016a7402ae20c922232389f18e1.tar.xz
Essentials-adffbab6783aa016a7402ae20c922232389f18e1.zip
Adding jail time to /whois.
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandwhois.java5
-rw-r--r--Essentials/src/messages.properties1
-rw-r--r--Essentials/src/messages_da.properties1
-rw-r--r--Essentials/src/messages_de.properties1
-rw-r--r--Essentials/src/messages_en.properties1
-rw-r--r--Essentials/src/messages_es.properties1
-rw-r--r--Essentials/src/messages_fr.properties1
-rw-r--r--Essentials/src/messages_nl.properties1
8 files changed, 12 insertions, 0 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java b/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java
index d068aac9a..f9955cfb4 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java
@@ -62,6 +62,11 @@ public class Commandwhois extends EssentialsCommand
{
sender.sendMessage(_("whoisMoney", Util.displayCurrency(user.getMoney(), ess)));
}
+ sender.sendMessage(_("whoisJail", (user.isJailed()
+ ? user.getJailTimeout() > 0
+ ? Util.formatDateDiff(user.getJailTimeout())
+ : _("true")
+ : _("false"))));
sender.sendMessage(user.isAfk()
? _("whoisStatusAway")
: _("whoisStatusAvailable"));
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index 60b09b734..390cd3564 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -397,6 +397,7 @@ whoisGod=\u00a79 - God mode: {0}
whoisHealth=\u00a79 - Health: {0}/20
whoisIPAddress=\u00a79 - IP Address: {0}
whoisIs={0} is {1}
+whoisJail=\u00a79 - Jail: {0}
whoisLocation=\u00a79 - Location: ({0}, {1}, {2}, {3})
whoisMoney=\u00a79 - Money: {0}
whoisOP=\u00a79 - OP: {0}
diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties
index 0b8671379..23a8cd46f 100644
--- a/Essentials/src/messages_da.properties
+++ b/Essentials/src/messages_da.properties
@@ -397,6 +397,7 @@ whoisGod=\u00a79 - God mode: {0}
whoisHealth=\u00a79 - Health: {0}/20
whoisIPAddress=\u00a79 - IP-Adresse: {0}
whoisIs={0} er {1}
+whoisJail=\u00a79 - Jail: {0}
whoisLocation=\u00a79 - Placering: ({0}, {1}, {2}, {3})
whoisMoney=\u00a79 - Saldo: {0}
whoisOP=\u00a79 - OP: {0}
diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties
index fac736f2b..3365afd38 100644
--- a/Essentials/src/messages_de.properties
+++ b/Essentials/src/messages_de.properties
@@ -397,6 +397,7 @@ whoisGod=\u00a79 - God mode: {0}
whoisHealth=\u00a79 - Gesundheit: {0}/20
whoisIPAddress=\u00a79 - IP-Adresse: {0}
whoisIs={0} ist {1}
+whoisJail=\u00a79 - Jail: {0}
whoisLocation=\u00a79 - Position: ({0}, {1}, {2}, {3})
whoisMoney=\u00a79 - Geldb\u00f6rse: {0}
whoisOP=\u00a79 - OP: {0}
diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
index d1499aad8..171e022a0 100644
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@@ -397,6 +397,7 @@ whoisGod=\u00a79 - God mode: {0}
whoisHealth=\u00a79 - Health: {0}/20
whoisIPAddress=\u00a79 - IP Address: {0}
whoisIs={0} is {1}
+whoisJail=\u00a79 - Jail: {0}
whoisLocation=\u00a79 - Location: ({0}, {1}, {2}, {3})
whoisMoney=\u00a79 - Money: {0}
whoisOP=\u00a79 - OP: {0}
diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties
index fbaba1cac..f33ca8b07 100644
--- a/Essentials/src/messages_es.properties
+++ b/Essentials/src/messages_es.properties
@@ -397,6 +397,7 @@ whoisGod=\u00a79 - God mode: {0}
whoisHealth=\u00a79 - Salud: {0}/20
whoisIPAddress=\u00a79 - Direccion IP: {0}
whoisIs={0} es {1}
+whoisJail=\u00a79 - Jail: {0}
whoisLocation=\u00a79 - Localizacion: ({0}, {1}, {2}, {3})
whoisMoney=\u00a79 - Dinero: {0}
whoisOP=\u00a79 - OP: {0}
diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties
index 0473b3ce4..420f40f46 100644
--- a/Essentials/src/messages_fr.properties
+++ b/Essentials/src/messages_fr.properties
@@ -397,6 +397,7 @@ whoisGod=\u00a79 - Mode Dieu : {0}
whoisHealth=\u00a79 - Sant\u00e9 : {0} / 20
whoisIPAddress=\u00a79 - Adresse IP : {0}
whoisIs={0} est {1}
+whoisJail=\u00a79 - Jail: {0}
whoisLocation=\u00a79 - Emplacement : ({0}, {1}, {2}, {3})
whoisMoney=\u00a79 - Argent : {0}
whoisOP=\u00a79 - OP : {0}
diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties
index 05a735949..60d1caaea 100644
--- a/Essentials/src/messages_nl.properties
+++ b/Essentials/src/messages_nl.properties
@@ -397,6 +397,7 @@ whoisGod=\u00a79 - God mode: {0}
whoisHealth=\u00a79 - Levens: {0}/20
whoisIPAddress=\u00a79 - IP Adres: {0}
whoisIs={0} is {1}
+whoisJail=\u00a79 - Jail: {0}
whoisLocation=\u00a79 - Locatie: ({0}, {1}, {2}, {3})
whoisMoney=\u00a79 - Geld: {0}
whoisOP=\u00a79 - OP: {0}