summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-06-16 17:10:47 +0100
committerKHobbits <rob@khobbits.co.uk>2012-06-16 17:10:47 +0100
commitc4642fde1956bd184e07ee688ddc9de5e8c50fd1 (patch)
treea3798af802181433f0e6c82125d07b63e37c2e9c
parent220a6c88b760936fe0d9a555b4173dd5ed17538c (diff)
downloadEssentials-c4642fde1956bd184e07ee688ddc9de5e8c50fd1.tar
Essentials-c4642fde1956bd184e07ee688ddc9de5e8c50fd1.tar.gz
Essentials-c4642fde1956bd184e07ee688ddc9de5e8c50fd1.tar.lz
Essentials-c4642fde1956bd184e07ee688ddc9de5e8c50fd1.tar.xz
Essentials-c4642fde1956bd184e07ee688ddc9de5e8c50fd1.zip
Added TL key for ban syntax,
Default message: "Banned: <reason>" Default reason: The Ban Hammer has spoken! Optional 2nd param to banReason, {1}, will contain user who made the ban. Example use: "banReason=Banned for {0} by {1}"
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandban.java7
-rw-r--r--Essentials/src/messages.properties1
-rw-r--r--Essentials/src/messages_cs.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_it.properties1
-rw-r--r--Essentials/src/messages_nl.properties1
-rw-r--r--Essentials/src/messages_pl.properties1
-rw-r--r--Essentials/src/messages_pt.properties1
12 files changed, 14 insertions, 4 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandban.java b/Essentials/src/com/earth2me/essentials/commands/Commandban.java
index ca6707088..0094e063e 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandban.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandban.java
@@ -44,15 +44,14 @@ public class Commandban extends EssentialsCommand
String banReason;
if (args.length > 1)
{
- banReason = getFinalArg(args, 1);
- user.setBanReason(banReason);
+ banReason = _("banFormat", getFinalArg(args, 1), sender.getName());
}
else
{
- banReason = _("defaultBanReason");
- user.setBanReason("");
+ banReason = _("banFormat", _("defaultBanReason"), sender.getName());
}
+ user.setBanReason(banReason);
user.setBanned(true);
user.kickPlayer(banReason);
final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index 01523de2a..6f0d47990 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -441,3 +441,4 @@ years=years
youAreHealed=\u00a77You have been healed.
youHaveNewMail=\u00a7cYou have {0} messages!\u00a7f Type \u00a77/mail read\u00a7f to view your mail.
hatRemoved=\u00a7eYour hat has been removed.
+banFormat=Banned: {0}
diff --git a/Essentials/src/messages_cs.properties b/Essentials/src/messages_cs.properties
index 02c0ccd9d..2e5968b40 100644
--- a/Essentials/src/messages_cs.properties
+++ b/Essentials/src/messages_cs.properties
@@ -444,3 +444,4 @@ years=roky
youAreHealed=\u00a77Byl jsi uzdraven.
youHaveNewMail=\u00a7cMas {0} zprav!\u00a7f Napis \u00a77/mail read\u00a7f aby jsi si precetl sve zpravy.
hatRemoved=\u00a7eYour hat has been removed.
+banFormat=Banned: {0}
diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties
index aeb669239..731679961 100644
--- a/Essentials/src/messages_da.properties
+++ b/Essentials/src/messages_da.properties
@@ -441,3 +441,4 @@ years=\u00e5r
youAreHealed=\u00a77Du er blevet healed. Halleluja!
youHaveNewMail=\u00a7cDu har {0} flaskeposter!\u00a7f Type \u00a77/mail read for at se din flaskepost.
hatRemoved=\u00a7eYour hat has been removed.
+banFormat=Banned: {0}
diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties
index 34714bd5f..b6e84fb66 100644
--- a/Essentials/src/messages_de.properties
+++ b/Essentials/src/messages_de.properties
@@ -441,3 +441,4 @@ years=Jahre
youAreHealed=\u00a77Du wurdest geheilt.
youHaveNewMail=\u00a7cDu hast {0} Nachrichten!\u00a7f Schreibe \u00a77/mail read\u00a7f um deine Nachrichten anzuzeigen.
hatRemoved=\u00a7eYour hat has been removed.
+banFormat=Banned: {0}
diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
index 01523de2a..6f0d47990 100644
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@@ -441,3 +441,4 @@ years=years
youAreHealed=\u00a77You have been healed.
youHaveNewMail=\u00a7cYou have {0} messages!\u00a7f Type \u00a77/mail read\u00a7f to view your mail.
hatRemoved=\u00a7eYour hat has been removed.
+banFormat=Banned: {0}
diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties
index d7f90b2a0..0e3bbd9bb 100644
--- a/Essentials/src/messages_es.properties
+++ b/Essentials/src/messages_es.properties
@@ -441,3 +441,4 @@ years=a&ntilde;os
youAreHealed=\u00a77Has sido curado.
youHaveNewMail=\u00a7cTienes {0} mensajes!\u00a7f Pon \u00a77/mail read\u00a7f para ver tus emails no leidos!.
hatRemoved=\u00a7eYour hat has been removed.
+banFormat=Banned: {0}
diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties
index 45681a6fc..c74f68b3a 100644
--- a/Essentials/src/messages_fr.properties
+++ b/Essentials/src/messages_fr.properties
@@ -441,3 +441,4 @@ years=ann\u00e9es
youAreHealed=\u00a77Vous avez \u00e9t\u00e9 soign\u00e9.
youHaveNewMail=\u00a7cVous avez {0} messages ! \u00a7fEntrez \u00a77/mail read\u00a7f pour voir votre courrier.
hatRemoved=\u00a7eYour hat has been removed.
+banFormat=Banned: {0}
diff --git a/Essentials/src/messages_it.properties b/Essentials/src/messages_it.properties
index 563ba5852..16c419bf4 100644
--- a/Essentials/src/messages_it.properties
+++ b/Essentials/src/messages_it.properties
@@ -441,3 +441,4 @@ years=anni
youAreHealed=\u00a77Sei stato curato.
youHaveNewMail=\u00a7cHai {0} messaggi!\u00a7f digita \u00a77/mail read\u00a7f per consultare la tua mail.
hatRemoved=\u00a7eYour hat has been removed.
+banFormat=Banned: {0}
diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties
index cb2d5e443..1937db5a2 100644
--- a/Essentials/src/messages_nl.properties
+++ b/Essentials/src/messages_nl.properties
@@ -441,3 +441,4 @@ years=jaren
youAreHealed=\u00a77Je bent genezen.
youHaveNewMail=\u00a7cJe hebt {0} berichten!\u00a7f Type \u00a77/mail read\u00a7f om je berichten te bekijken.
hatRemoved=\u00a7eYour hat has been removed.
+banFormat=Banned: {0}
diff --git a/Essentials/src/messages_pl.properties b/Essentials/src/messages_pl.properties
index 06800cb1c..f263a8ae9 100644
--- a/Essentials/src/messages_pl.properties
+++ b/Essentials/src/messages_pl.properties
@@ -441,3 +441,4 @@ years=lat
youAreHealed=\u00a77Zostales/as uleczony/na.
youHaveNewMail=\u00a7cMasz {0} wiadomosci!\u00a7f napisz \u00a77/mail read\u00a7f aby je przeczytac.
hatRemoved=\u00a7eYour hat has been removed.
+banFormat=Banned: {0}
diff --git a/Essentials/src/messages_pt.properties b/Essentials/src/messages_pt.properties
index 4c5e2a951..332395ed2 100644
--- a/Essentials/src/messages_pt.properties
+++ b/Essentials/src/messages_pt.properties
@@ -441,3 +441,4 @@ years=anos
youAreHealed=\u00a77Voc\u00ea foi curado.
youHaveNewMail=\u00a7cVoc\u00ea tem {0} mensagens!\u00a7f Digite \u00a77/mail read\u00a7f para ver seu email.
hatRemoved=\u00a7eYour hat has been removed.
+banFormat=Banned: {0}