Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-13 06:15:08 +01:00
Code Issues Projects Releases Wiki Activity

Changed muteFormat to muteReason.

Browse Source 
Removed space at beginning of muteReason.
This commit is contained in:
delbertina 2017-11-26 01:32:22 -06:00
parent 6f7af90488
commit 43cbab37f0
32 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
View File

@ -85,7 +85,7 @@ public class EssentialsPlayerListener implements Listener {
user.sendMessage(tl("voiceSilenced"));
}
else {
user.sendMessage(tl("voiceSilenced") + tl("muteFormat", user.getMuteReason ()));
user.sendMessage(tl("voiceSilenced") + tl("muteReason", user.getMuteReason ()));
}
LOGGER.info(tl("mutedUserSpeaks", user.getName(), event.getMessage()));

2
Essentials/src/com/earth2me/essentials/commands/Commandafk.java
View File

@ -55,7 +55,7 @@ public class Commandafk extends EssentialsCommand {
throw new Exception(tl("voiceSilenced"));
}
else {
throw new Exception(tl("voiceSilenced") + tl("muteFormat", sender.getMuteReason ()));
throw new Exception(tl("voiceSilenced") + tl("muteReason", sender.getMuteReason ()));
}
}
if (!sender.isAuthorized("essentials.afk.message")) {

2
Essentials/src/com/earth2me/essentials/commands/Commandmail.java
View File

@ -52,7 +52,7 @@ public class Commandmail extends EssentialsCommand {
throw new Exception(tl("voiceSilenced"));
}
else {
throw new Exception(tl("voiceSilenced") + tl("muteFormat", user.getMuteReason ()));
throw new Exception(tl("voiceSilenced") + tl("muteReason", user.getMuteReason ()));
}
}

2
Essentials/src/com/earth2me/essentials/commands/Commandme.java
View File

@ -28,7 +28,7 @@ public class Commandme extends EssentialsCommand {
throw new Exception(tl("voiceSilenced"));
}
else {
throw new Exception(tl("voiceSilenced") + tl("muteFormat", user.getMuteReason ()));
throw new Exception(tl("voiceSilenced") + tl("muteReason", user.getMuteReason ()));
}
}

12
Essentials/src/com/earth2me/essentials/commands/Commandmute.java
View File

@ -83,8 +83,8 @@ public class Commandmute extends EssentialsCommand {
sender.sendMessage(tl("mutedPlayerFor", user.getDisplayName(), muteTime));
user.sendMessage(tl("playerMutedFor", muteTime));
} else {
sender.sendMessage(tl("mutedPlayerFor", user.getDisplayName(), muteTime) + tl("muteFormat",user.getMuteReason()));
user.sendMessage(tl("playerMutedFor", muteTime) + tl("muteFormat",user.getMuteReason()));
sender.sendMessage(tl("mutedPlayerFor", user.getDisplayName(), muteTime) + tl("muteReason",user.getMuteReason()));
user.sendMessage(tl("playerMutedFor", muteTime) + tl("muteReason",user.getMuteReason()));
}
} else {
if (user.getMuteReason ().equals ("")) {
@ -93,9 +93,9 @@ public class Commandmute extends EssentialsCommand {
user.sendMessage(tl("playerMuted"));
}
else {
sender.sendMessage(tl("mutedPlayer", user.getDisplayName()) + tl("muteFormat",user.getMuteReason()));
sender.sendMessage(tl("mutedPlayer", user.getDisplayName()) + tl("muteReason",user.getMuteReason()));
/** Send the player a message, why they were muted **/
user.sendMessage(tl("playerMuted")+ tl("muteFormat",user.getMuteReason()));
user.sendMessage(tl("playerMuted")+ tl("muteReason",user.getMuteReason()));
}
}
final String message;
@ -104,14 +104,14 @@ public class Commandmute extends EssentialsCommand {
message = tl("muteNotifyFor", sender.getSender().getName(), user.getName(), muteTime);
}
else {
message = (tl("muteNotifyFor", sender.getSender().getName(), user.getName(), muteTime) + tl("muteFormat",user.getMuteReason()));
message = (tl("muteNotifyFor", sender.getSender().getName(), user.getName(), muteTime) + tl("muteReason",user.getMuteReason()));
}
} else {
if (user.getMuteReason ().equals ("")) {
message = tl("muteNotify", sender.getSender().getName(), user.getName());
}
else {
message = (tl("muteNotify", sender.getSender().getName(), user.getName()) + tl("muteFormat",user.getMuteReason()));
message = (tl("muteNotify", sender.getSender().getName(), user.getName()) + tl("muteReason",user.getMuteReason()));
}
}
server.getLogger().log(Level.INFO, message);

2
Essentials/src/com/earth2me/essentials/commands/Commandr.java
View File

@ -32,7 +32,7 @@ public class Commandr extends EssentialsCommand {
throw new Exception(tl("voiceSilenced"));
}
else {
throw new Exception(tl("voiceSilenced") + tl("muteFormat", user.getMuteReason ()));
throw new Exception(tl("voiceSilenced") + tl("muteReason", user.getMuteReason ()));
}
}

2
Essentials/src/com/earth2me/essentials/commands/Commandseen.java
View File

@ -121,7 +121,7 @@ public class Commandseen extends EssentialsCommand {
sender.sendMessage(tl("whoisMuted", (user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true"))));
}
else {
sender.sendMessage(tl("whoisMuted", (user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true"))) + tl("muteFormat", user.getMuteReason ()));
sender.sendMessage(tl("whoisMuted", (user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true"))) + tl("muteReason", user.getMuteReason ()));
}
}
final String location = user.getGeoLocation();

2
Essentials/src/com/earth2me/essentials/commands/Commandwhois.java
View File

@ -60,7 +60,7 @@ public class Commandwhois extends EssentialsCommand {
sender.sendMessage(tl("whoisMuted", (user.isMuted() ? user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true") : tl("false"))));
}
else {
sender.sendMessage(tl("whoisMuted", (user.isMuted() ? user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true") : tl("false"))+ tl("muteFormat", user.getMuteReason ())));
sender.sendMessage(tl("whoisMuted", (user.isMuted() ? user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true") : tl("false"))+ tl("muteReason", user.getMuteReason ())));
}
}

3
Essentials/src/messages.properties
View File

@ -494,7 +494,6 @@ vanished=\u00a76You are now completely invisible to normal users, and hidden fro
versionMismatch=\u00a74Version mismatch\! Please update {0} to the same version.
versionMismatchAll=\u00a74Version mismatch\! Please update all Essentials jars to the same version.
voiceSilenced=\u00a76Your voice has been silenced\!
muteFormat=\u00a74 Reason: {0}
walking=walking
warpDeleteError=\u00a74Problem deleting the warp file.
warpList={0}
@ -598,4 +597,4 @@ createKitFailed=\u00a74Error occurred whilst creating kit {0}.
createKitSeparator=\u00a7m-----------------------
createKitSuccess=\u00a76Created Kit: \u00a7f{0}\n\u00a76Delay: \u00a7f{1}\n\u00a76Link: \u00a7f{2}\n\u00a76Copy contents in the link above into your config.yml.
whoisUuid=\u00a76 - UUID\:\u00a7r {0}
muteFormat=\u00a76 Reason: \u00a7c{0}
muteReason=\u00a76Reason: \u00a7c{0}

2
Essentials/src/messages_cs.properties
View File

@ -584,4 +584,4 @@ createKitFailed=\u00a74Error occurred whilst creating kit {0}.
createKitSeparator=\u00a7m-----------------------
createKitSuccess=\u00a76Created Kit: \u00a7f{0}\n\u00a76Delay: \u00a7f{1}\n\u00a76Link: \u00a7f{2}\n\u00a76Copy contents in the link above into your config.yml.
whoisUuid=\u00a76 - UUID\:\u00a7r {0}
muteFormat=\u00a76 Reason: \u00a7c{0}
muteReason=\u00a76Reason: \u00a7c{0}

2
Essentials/src/messages_da.properties
View File

@ -584,4 +584,4 @@ createKitFailed=\u00a74Error occurred whilst creating kit {0}.
createKitSeparator=\u00a7m-----------------------
createKitSuccess=\u00a76Created Kit: \u00a7f{0}\n\u00a76Delay: \u00a7f{1}\n\u00a76Link: \u00a7f{2}\n\u00a76Copy contents in the link above into your config.yml.
whoisUuid=\u00a76 - UUID\:\u00a7r {0}
muteFormat=\u00a76 Reason: \u00a7c{0}
muteReason=\u00a76Reason: \u00a7c{0}

2
Essentials/src/messages_de.properties
View File

@ -587,4 +587,4 @@ createKitFailed=\u00a74Beim Erstellen des Kits ist ein Fehler aufgetreten {0}.
createKitSeparator=\u00a7m-----------------------
createKitSuccess=\u00a76Erstelltes Kit: \u00a7f{0}\n\u00a76Verz\u00F6gerung: \u00a7f{1}\n\u00a76Link: \u00a7f{2}\n\u00a76Kopiere Inhalte aus dem oben stehenden Link in deine config.yml.
whoisUuid=\u00a76 - UUID\:\u00a7r {0}
muteFormat=\u00a76 Reason: \u00a7c{0}
muteReason=\u00a76Reason: \u00a7c{0}

2
Essentials/src/messages_en.properties
View File

@ -588,4 +588,4 @@ createKitFailed=\u00a74Error occurred whilst creating kit {0}.
createKitSeparator=\u00a7m-----------------------
createKitSuccess=\u00a76Created Kit: \u00a7f{0}\n\u00a76Delay: \u00a7f{1}\n\u00a76Link: \u00a7f{2}\n\u00a76Copy contents in the link above into your config.yml.
whoisUuid=\u00a76 - UUID\:\u00a7r {0}
muteFormat=\u00a76 Reason: \u00a7c{0}
muteReason=\u00a76Reason: \u00a7c{0}

2
Essentials/src/messages_es.properties
View File

@ -584,4 +584,4 @@ createKitFailed=\u00a74Ocurrio un error durante la creacion del kit {0}.
createKitSeparator=\u00a7m-----------------------
createKitSuccess=\u00a76Kit creado: \u00a7f{0}\n\u00a76Tiempo de espera: \u00a7f{1}\n\u00a76Link: \u00a7f{2}\n\u00a76Copia el contenido del link de arriba en tu archivo config.yml.
whoisUuid=\u00a76 - UUID\:\u00a7r {0}
muteFormat=\u00a76 Reason: \u00a7c{0}
muteReason=\u00a76Reason: \u00a7c{0}

2
Essentials/src/messages_et.properties
View File

@ -584,4 +584,4 @@ createKitFailed=\u00a74Error occurred whilst creating kit {0}.
createKitSeparator=\u00a7m-----------------------
createKitSuccess=\u00a76Created Kit: \u00a7f{0}\n\u00a76Delay: \u00a7f{1}\n\u00a76Link: \u00a7f{2}\n\u00a76Copy contents in the link above into your config.yml.
whoisUuid=\u00a76 - UUID\:\u00a7r {0}
muteFormat=\u00a76 Reason: \u00a7c{0}
muteReason=\u00a76Reason: \u00a7c{0}

2
Essentials/src/messages_fi.properties
View File

@ -584,4 +584,4 @@ createKitFailed=\u00a74Error occurred whilst creating kit {0}.
createKitSeparator=\u00a7m-----------------------
createKitSuccess=\u00a76Created Kit: \u00a7f{0}\n\u00a76Delay: \u00a7f{1}\n\u00a76Link: \u00a7f{2}\n\u00a76Copy contents in the link above into your config.yml.
whoisUuid=\u00a76 - UUID\:\u00a7r {0}
muteFormat=\u00a76 Reason: \u00a7c{0}
muteReason=\u00a76Reason: \u00a7c{0}

2
Essentials/src/messages_fr.properties
View File

@ -597,4 +597,4 @@ createKitFailed=\u00a74Error occurred whilst creating kit {0}.
createKitSeparator=\u00a7m-----------------------
createKitSuccess=\u00a76Created Kit: \u00a7f{0}\n\u00a76Delay: \u00a7f{1}\n\u00a76Link: \u00a7f{2}\n\u00a76Copy contents in the link above into your config.yml.
whoisUuid=\u00a76 - UUID\:\u00a7r {0}
muteFormat=\u00a76 Reason: \u00a7c{0}
muteReason=\u00a76Reason: \u00a7c{0}

2
Essentials/src/messages_hu.properties
View File

@ -584,4 +584,4 @@ createKitFailed=\u00a74Error occurred whilst creating kit {0}.
createKitSeparator=\u00a7m-----------------------
createKitSuccess=\u00a76Created Kit: \u00a7f{0}\n\u00a76Delay: \u00a7f{1}\n\u00a76Link: \u00a7f{2}\n\u00a76Copy contents in the link above into your config.yml.
whoisUuid=\u00a76 - UUID\:\u00a7r {0}
muteFormat=\u00a76 Reason: \u00a7c{0}
muteReason=\u00a76Reason: \u00a7c{0}

2
Essentials/src/messages_it.properties
View File

@ -596,4 +596,4 @@ createKitFailed=\u00a74Si \u00E8 verificato un errore creando il kit {0}.
createKitSeparator=\u00a7m-----------------------
createKitSuccess=\u00a76Kit Creato: \u00a7f{0}\n\u00a76Attesa: \u00a7f{1}\n\u00a76Link: \u00a7f{2}\n\u00a76Copia i contenuti nel link sopra nella tua config.yml.
whoisUuid=\u00a76 - UUID\:\u00a7r {0}
muteFormat=\u00a76 Reason: \u00a7c{0}
muteReason=\u00a76Reason: \u00a7c{0}

2
Essentials/src/messages_ko.properties
View File

@ -584,4 +584,4 @@ createKitFailed=\u00a74Error occurred whilst creating kit {0}.
createKitSeparator=\u00a7m-----------------------
createKitSuccess=\u00a76Created Kit: \u00a7f{0}\n\u00a76Delay: \u00a7f{1}\n\u00a76Link: \u00a7f{2}\n\u00a76Copy contents in the link above into your config.yml.
whoisUuid=\u00a76 - UUID\:\u00a7r {0}
muteFormat=\u00a76 Reason: \u00a7c{0}
muteReason=\u00a76Reason: \u00a7c{0}

2
Essentials/src/messages_lt.properties
View File

@ -584,4 +584,4 @@ createKitFailed=\u00a74Error occurred whilst creating kit {0}.
createKitSeparator=\u00a7m-----------------------
createKitSuccess=\u00a76Created Kit: \u00a7f{0}\n\u00a76Delay: \u00a7f{1}\n\u00a76Link: \u00a7f{2}\n\u00a76Copy contents in the link above into your config.yml.
whoisUuid=\u00a76 - UUID\:\u00a7r {0}
muteFormat=\u00a76 Reason: \u00a7c{0}
muteReason=\u00a76Reason: \u00a7c{0}

2
Essentials/src/messages_nl.properties
View File

@ -584,4 +584,4 @@ createKitFailed=\u00a74Error occurred whilst creating kit {0}.
createKitSeparator=\u00a7m-----------------------
createKitSuccess=\u00a76Created Kit: \u00a7f{0}\n\u00a76Delay: \u00a7f{1}\n\u00a76Link: \u00a7f{2}\n\u00a76Copy contents in the link above into your config.yml.
whoisUuid=\u00a76 - UUID\:\u00a7r {0}
muteFormat=\u00a76 Reason: \u00a7c{0}
muteReason=\u00a76Reason: \u00a7c{0}

2
Essentials/src/messages_pl.properties
View File

@ -584,4 +584,4 @@ createKitFailed=\u00a74Error occurred whilst creating kit {0}.
createKitSeparator=\u00a7m-----------------------
createKitSuccess=\u00a76Created Kit: \u00a7f{0}\n\u00a76Delay: \u00a7f{1}\n\u00a76Link: \u00a7f{2}\n\u00a76Copy contents in the link above into your config.yml.
whoisUuid=\u00a76 - UUID\:\u00a7r {0}
muteFormat=\u00a76 Reason: \u00a7c{0}
muteReason=\u00a76Reason: \u00a7c{0}

2
Essentials/src/messages_pt.properties
View File

@ -581,4 +581,4 @@ createKitFailed=\u00a74Error occurred whilst creating kit {0}.
createKitSeparator=\u00a7m-----------------------
createKitSuccess=\u00a76Created Kit: \u00a7f{0}\n\u00a76Delay: \u00a7f{1}\n\u00a76Link: \u00a7f{2}\n\u00a76Copy contents in the link above into your config.yml.
whoisUuid=\u00a76 - UUID\:\u00a7r {0}
muteFormat=\u00a76 Reason: \u00a7c{0}
muteReason=\u00a76Reason: \u00a7c{0}

2
Essentials/src/messages_pt_BR.properties
View File

@ -581,4 +581,4 @@ createKitFailed=\u00a74Um erro ocorreu ao criar o kit {0}.
createKitSeparator=\u00a7m-----------------------
createKitSuccess=\u00a76Kit criado: \u00a7f{0}\n\u00a76Tempo: \u00a7f{1}\n\u00a76Link: \u00a7f{2}\n\u00a76Copie o conte\u00FAdo do link acima para a config.yml.
whoisUuid=\u00a76 - UUID\:\u00a7r {0}
muteFormat=\u00a76 Reason: \u00a7c{0}
muteReason=\u00a76Reason: \u00a7c{0}

2
Essentials/src/messages_ro.properties
View File

@ -584,4 +584,4 @@ createKitFailed=\u00a74Error occurred whilst creating kit {0}.
createKitSeparator=\u00a7m-----------------------
createKitSuccess=\u00a76Created Kit: \u00a7f{0}\n\u00a76Delay: \u00a7f{1}\n\u00a76Link: \u00a7f{2}\n\u00a76Copy contents in the link above into your config.yml.
whoisUuid=\u00a76 - UUID\:\u00a7r {0}
muteFormat=\u00a76 Reason: \u00a7c{0}
muteReason=\u00a76Reason: \u00a7c{0}

2
Essentials/src/messages_ru.properties
View File

@ -584,4 +584,4 @@ createKitFailed=\u00a74Error occurred whilst creating kit {0}.
createKitSeparator=\u00a7m-----------------------
createKitSuccess=\u00a76Created Kit: \u00a7f{0}\n\u00a76Delay: \u00a7f{1}\n\u00a76Link: \u00a7f{2}\n\u00a76Copy contents in the link above into your config.yml.
whoisUuid=\u00a76 - UUID\:\u00a7r {0}
muteFormat=\u00a76 Reason: \u00a7c{0}
muteReason=\u00a76Reason: \u00a7c{0}

2
Essentials/src/messages_sv.properties
View File

@ -584,4 +584,4 @@ createKitFailed=\u00a74Error occurred whilst creating kit {0}.
createKitSeparator=\u00a7m-----------------------
createKitSuccess=\u00a76Created Kit: \u00a7f{0}\n\u00a76Delay: \u00a7f{1}\n\u00a76Link: \u00a7f{2}\n\u00a76Copy contents in the link above into your config.yml.
whoisUuid=\u00a76 - UUID\:\u00a7r {0}
muteFormat=\u00a76 Reason: \u00a7c{0}
muteReason=\u00a76Reason: \u00a7c{0}

2
Essentials/src/messages_tr.properties
View File

@ -584,4 +584,4 @@ createKitFailed=\u00a74Error occurred whilst creating kit {0}.
createKitSeparator=\u00a7m-----------------------
createKitSuccess=\u00a76Created Kit: \u00a7f{0}\n\u00a76Delay: \u00a7f{1}\n\u00a76Link: \u00a7f{2}\n\u00a76Copy contents in the link above into your config.yml.
whoisUuid=\u00a76 - UUID\:\u00a7r {0}
muteFormat=\u00a76 Reason: \u00a7c{0}
muteReason=\u00a76Reason: \u00a7c{0}

2
Essentials/src/messages_zh.properties
View File

@ -596,4 +596,4 @@ createKitFailed=\u00a74\u521b\u5efa\u793c\u5305\u51fa\u9519 {0}.
createKitSeparator=\u00a7m-----------------------
createKitSuccess=\u00a76\u521b\u5efa\u793c\u5305: \u00a7f{0}\n\u00a76\u4f7f\u7528\u6b21\u6570: \u00a7f{1}\n\u00a76\u4fe1\u606f: \u00a7f{2}\n\u00a76\u590d\u5236\u4e0b\u9762\u7684\u4fe1\u606f\u5230config\u91cc\u9762.
whoisUuid=\u00a76 - UUID\:\u00a7r {0}
muteFormat=\u00a76 Reason: \u00a7c{0}
muteReason=\u00a76Reason: \u00a7c{0}

2
Essentials/src/messages_zh_HK.properties
View File

@ -584,4 +584,4 @@ createKitFailed=\u00a74Error occurred whilst creating kit {0}.
createKitSeparator=\u00a7m-----------------------
createKitSuccess=\u00a76Created Kit: \u00a7f{0}\n\u00a76Delay: \u00a7f{1}\n\u00a76Link: \u00a7f{2}\n\u00a76Copy contents in the link above into your config.yml.
whoisUuid=\u00a76 - UUID\:\u00a7r {0}
muteFormat=\u00a76 Reason: \u00a7c{0}
muteReason=\u00a76Reason: \u00a7c{0}

2
Essentials/src/messages_zh_TW.properties
View File

@ -584,4 +584,4 @@ createKitFailed=\u00a74Error occurred whilst creating kit {0}.
createKitSeparator=\u00a7m-----------------------
createKitSuccess=\u00a76Created Kit: \u00a7f{0}\n\u00a76Delay: \u00a7f{1}\n\u00a76Link: \u00a7f{2}\n\u00a76Copy contents in the link above into your config.yml.
whoisUuid=\u00a76 - UUID\:\u00a7r {0}
muteFormat=\u00a76 Reason: \u00a7c{0}
muteReason=\u00a76Reason: \u00a7c{0}