Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#423 Make seeownaccounts / seeotheraccounts messages translatable

Browse Source
This commit is contained in:
ljacqu
2016-06-13 21:45:21 +02:00
parent b7015f56c2
commit 043ee90254
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/fr/xephi/authme/output/MessageKey.java
+5 -1
View File
@@ -139,7 +139,11 @@ public enum MessageKey {
INVALID_NAME_CASE("invalid_name_case", "%valid", "%invalid"),
TEMPBAN_MAX_LOGINS("tempban_max_logins");
TEMPBAN_MAX_LOGINS("tempban_max_logins"),
ACCOUNTS_OWNED_SELF("accounts_owned_self", "%count"),
ACCOUNTS_OWNED_OTHER("accounts_owned_other", "%name", "%count");
private String key;
private String[] tags;
src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java
+7 -8
View File
@@ -252,7 +252,6 @@ public class AsynchronousLogin implements AsynchronousProcess {
}
}
// TODO #423: allow translation!
private void displayOtherAccounts(PlayerAuth auth, Player player) {
if (!service.getProperty(RestrictionSettings.DISPLAY_OTHER_ACCOUNTS) || auth == null) {
return;
@@ -263,18 +262,17 @@ public class AsynchronousLogin implements AsynchronousProcess {
return;
}
List<String> tmp = new ArrayList<String>();
List<String> formattedNames = new ArrayList<>(auths.size());
for (String currentName : auths) {
Player currentPlayer = bukkitService.getPlayerExact(currentName);
if (currentPlayer != null && currentPlayer.isOnline()) {
tmp.add(ChatColor.GREEN + currentName);
formattedNames.add(ChatColor.GREEN + currentName);
} else {
tmp.add(currentName);
formattedNames.add(currentName);
}
}
auths = tmp;
String message = ChatColor.GRAY + StringUtils.join(ChatColor.GRAY + ", ", auths) + ".";
String message = ChatColor.GRAY + StringUtils.join(ChatColor.GRAY + ", ", formattedNames) + ".";
if (!service.getProperty(SecuritySettings.REMOVE_SPAM_FROM_CONSOLE)) {
ConsoleLogger.info("The user " + player.getName() + " has " + auths.size() + " accounts:");
@@ -284,10 +282,11 @@ public class AsynchronousLogin implements AsynchronousProcess {
for (Player onlinePlayer : bukkitService.getOnlinePlayers()) {
if (onlinePlayer.getName().equalsIgnoreCase(player.getName())
&& permissionsManager.hasPermission(onlinePlayer, PlayerPermission.SEE_OWN_ACCOUNTS)) {
onlinePlayer.sendMessage("You own " + auths.size() + " accounts:");
service.send(onlinePlayer, MessageKey.ACCOUNTS_OWNED_SELF, Integer.toString(auths.size()));
onlinePlayer.sendMessage(message);
} else if (permissionsManager.hasPermission(onlinePlayer, AdminPermission.SEE_OTHER_ACCOUNTS)) {
onlinePlayer.sendMessage("The user " + player.getName() + " has " + auths.size() + " accounts:");
service.send(onlinePlayer, MessageKey.ACCOUNTS_OWNED_OTHER,
player.getName(), Integer.toString(auths.size()));
onlinePlayer.sendMessage(message);
}
}