mirror of
https://github.com/BentoBoxWorld/BentoBox.git
synced 2024-12-25 10:37:59 +01:00
Updated locales to replace all references of "leader" to "owner"
The island owner is no longer both known as "owner" or "team leader" depending on the methods you're using : it's "owner" everywhere now. Period. 🎉
This commit is contained in:
parent
607db5b07f
commit
b20ef00853
@ -42,9 +42,9 @@ public class AdminDeleteCommand extends ConfirmableCommand {
|
||||
user.sendMessage("general.errors.player-has-no-island");
|
||||
return false;
|
||||
}
|
||||
// Team leaders should be kicked before deleting otherwise the whole team will become weird
|
||||
// Owners should be kicked before deleting otherwise the whole team will become weird
|
||||
if (getIslands().inTeam(getWorld(), targetUUID) && getIslands().getOwner(getWorld(), targetUUID).equals(targetUUID)) {
|
||||
user.sendMessage("commands.admin.delete.cannot-delete-team-leader");
|
||||
user.sendMessage("commands.admin.delete.cannot-delete-owner");
|
||||
return false;
|
||||
}
|
||||
// Confirm
|
||||
|
@ -43,7 +43,7 @@ public class AdminTeamAddCommand extends CompositeCommand {
|
||||
return false;
|
||||
}
|
||||
if (getIslands().inTeam(getWorld(), ownerUUID) && !getIslands().getOwner(getWorld(), ownerUUID).equals(ownerUUID)) {
|
||||
user.sendMessage("commands.admin.team.add.name-not-leader", TextVariables.NAME, args.get(0));
|
||||
user.sendMessage("commands.admin.team.add.name-not-owner", TextVariables.NAME, args.get(0));
|
||||
getIslands().getIsland(getWorld(), ownerUUID).showMembers(getPlugin(), user, getWorld());
|
||||
return false;
|
||||
}
|
||||
|
@ -42,13 +42,13 @@ public class AdminTeamDisbandCommand extends CompositeCommand {
|
||||
return false;
|
||||
}
|
||||
if (!getIslands().getOwner(getWorld(), targetUUID).equals(targetUUID)) {
|
||||
user.sendMessage("commands.admin.team.disband.use-disband-leader", "[leader]", getPlayers().getName(getIslands().getOwner(getWorld(), targetUUID)));
|
||||
user.sendMessage("commands.admin.team.disband.use-disband-owner", "[owner]", getPlayers().getName(getIslands().getOwner(getWorld(), targetUUID)));
|
||||
return false;
|
||||
}
|
||||
// Disband team
|
||||
getIslands().getMembers(getWorld(), targetUUID).forEach(m -> {
|
||||
User.getInstance(m).sendMessage("commands.admin.team.disband.disbanded");
|
||||
// The leader gets to keep the island
|
||||
// The owner gets to keep the island
|
||||
if (!m.equals(targetUUID)) {
|
||||
getIslands().setLeaveTeam(getWorld(), m);
|
||||
}
|
||||
|
@ -43,7 +43,7 @@ public class AdminTeamKickCommand extends CompositeCommand {
|
||||
return false;
|
||||
}
|
||||
if (getIslands().getOwner(getWorld(), targetUUID).equals(targetUUID)) {
|
||||
user.sendMessage("commands.admin.team.kick.cannot-kick-leader");
|
||||
user.sendMessage("commands.admin.team.kick.cannot-kick-owner");
|
||||
getIslands().getIsland(getWorld(), targetUUID).showMembers(getPlugin(), user, getWorld());
|
||||
return false;
|
||||
}
|
||||
|
@ -63,7 +63,7 @@ public class IslandTeamKickCommand extends ConfirmableCommand {
|
||||
|
||||
private void kick(User user, UUID targetUUID) {
|
||||
User target = User.getInstance(targetUUID);
|
||||
target.sendMessage("commands.island.team.kick.leader-kicked");
|
||||
target.sendMessage("commands.island.team.kick.owner-kicked");
|
||||
getIslands().removePlayer(getWorld(), targetUUID);
|
||||
// Remove money inventory etc.
|
||||
if (getIWM().isOnLeaveResetEnderChest(getWorld())) {
|
||||
|
@ -56,19 +56,19 @@ commands:
|
||||
description: "clears all player reset counts for this world"
|
||||
team:
|
||||
add:
|
||||
parameters: "<leader> <player>"
|
||||
description: "add player to leader's team"
|
||||
name-not-leader: "&c[name] is not the leader"
|
||||
parameters: "<owner> <player>"
|
||||
description: "add player to owner's team"
|
||||
name-not-owner: "&c[name] is not the owner."
|
||||
name-has-island: "&c[name] has an island. Unregister or delete them first!"
|
||||
disband:
|
||||
parameters: "<team leader>"
|
||||
description: "disband team leader's team"
|
||||
user-disband-leader: "&cNot leader! Use disband [leader]"
|
||||
parameters: "<owner>"
|
||||
description: "disband owner's team"
|
||||
use-disband-owner: "&cNot owner! Use disband [owner]"
|
||||
disbanded: "&cAdmin disbanded your team!"
|
||||
kick:
|
||||
parameters: "<team player>"
|
||||
description: "kick a player from a team"
|
||||
cannot-kick-leader: "&cYou cannot kick the team leader. Kick members first"
|
||||
cannot-kick-owner: "&cYou cannot kick the owner. Kick members first"
|
||||
admin-kicked: "&cThe admin kicked you from the team."
|
||||
setowner:
|
||||
parameters: "<player>"
|
||||
@ -190,7 +190,7 @@ commands:
|
||||
delete:
|
||||
parameters: ""
|
||||
description: "deletes a player's island"
|
||||
cannot-delete-team-leader: "&cAll island members have to be kicked from the island before deleting it."
|
||||
cannot-delete-owner: "&cAll island members have to be kicked from the island before deleting it."
|
||||
deleted-island: "&aIsland at &e[xyz] &ahas been successfully deleted."
|
||||
why:
|
||||
parameters: "<player>"
|
||||
@ -319,13 +319,13 @@ commands:
|
||||
cancel:
|
||||
description: "cancel the pending invite to join your island"
|
||||
leave:
|
||||
cannot-leave: "&cTeam leaders cannot leave! Become a member first, or kick all members."
|
||||
cannot-leave: "&cOwners cannot leave! Become a member first, or kick all members."
|
||||
description: "leave your island"
|
||||
left-your-island: "&c[name] &cleft your island"
|
||||
kick:
|
||||
description: "remove a member from your island"
|
||||
parameters: "<player>"
|
||||
leader-kicked: "&cThe leader kicked you from the island!"
|
||||
owner-kicked: "&cThe owner kicked you from the island!"
|
||||
cannot-kick: "&cYou cannot kick yourself!"
|
||||
demote:
|
||||
description: "demote a player on your island down a rank"
|
||||
@ -340,7 +340,7 @@ commands:
|
||||
setowner:
|
||||
description: "transfer your island ownership to a member"
|
||||
errors:
|
||||
cant-transfer-to-yourself: "&cYou can't transfer ownership to yourself! Well, infact, you could... But we don't want you to. 'Cause it's bad."
|
||||
cant-transfer-to-yourself: "&cYou can't transfer ownership to yourself! &7(&oWell, in fact, you could... But we don't want you to. Because it's useless.&r&7)"
|
||||
target-is-not-member: "&cThat player is not part of your island team!"
|
||||
name-is-the-owner: "&a[name] is now the island owner!"
|
||||
parameters: "<player>"
|
||||
|
@ -57,22 +57,22 @@ commands:
|
||||
add:
|
||||
parameters: "<リーダー> <プレーヤー>"
|
||||
description: "リーダーのチームにプレイヤーを追加する"
|
||||
name-not-leader: "&c[name]はリーダーではありません"
|
||||
name-not-owner: "&c[name]はリーダーではありません"
|
||||
name-has-island: "&c[name]には島があります。登録を解除するか、最初に削除します。"
|
||||
disband:
|
||||
parameters: "<リーダー>"
|
||||
description: "チームリーダーのチームを解散"
|
||||
user-disband-leader: "リーダーじゃない!解散を使用 [leader]"
|
||||
use-disband-owner: "リーダーじゃない!解散を使用 [owner]"
|
||||
disbanded: "管理者はあなたのチームを解散!"
|
||||
kick:
|
||||
parameters: "<プレーヤー>"
|
||||
description: "チームからプレーヤーを蹴る"
|
||||
cannot-kick-leader: "&cチームリーダーを蹴ることはできません。キックのメンバーは、まず"
|
||||
cannot-kick-owner: "&cチームリーダーを蹴ることはできません。キックのメンバーは、まず"
|
||||
admin-kicked: "管理者は、チームからあなたを蹴った。"
|
||||
makeleader:
|
||||
setowner:
|
||||
parameters: "<プレーヤー>"
|
||||
description: "プレーヤーをチームのリーダーにする"
|
||||
already-leader: "&cプレイヤーはすでにリーダーです!"
|
||||
already-owner: "&cプレイヤーはすでにリーダーです!"
|
||||
range:
|
||||
description: "管理島の範囲コマンド"
|
||||
display:
|
||||
@ -168,7 +168,7 @@ commands:
|
||||
delete:
|
||||
parameters: ""
|
||||
description: "プレイヤーの島を削除します。"
|
||||
cannot-delete-team-leader: "&cすべての島のメンバーは、それを削除する前に島から追い出される必要があります。"
|
||||
cannot-delete-owner: "&cすべての島のメンバーは、それを削除する前に島から追い出される必要があります。"
|
||||
deleted-island: "&2[xyz] の島は正常に削除されました。"
|
||||
bentobox:
|
||||
description: "BentoBox管理コマンド"
|
||||
@ -291,7 +291,7 @@ commands:
|
||||
kick:
|
||||
description: "島からメンバーを削除する"
|
||||
parameters: "<プレーヤー>"
|
||||
leader-kicked: "リーダーが島からあなたを削除しました!"
|
||||
owner-kicked: "リーダーが島からあなたを削除しました!"
|
||||
cannot-kick: "自分を削除することはできません!"
|
||||
demote:
|
||||
description: "ランクダウンあなたの島のプレーヤーを降格"
|
||||
|
@ -55,22 +55,22 @@ commands:
|
||||
add:
|
||||
parameters: "<lider> <gracz>"
|
||||
description: "dodaj gracza do drużyny lidera"
|
||||
name-not-leader: "&c[name] nie jest liderem"
|
||||
name-not-owner: "&c[name] nie jest liderem"
|
||||
name-has-island: "&c[name] ma wyspę. Najpierw musi ją wyrejestrować lub usunąć."
|
||||
disband:
|
||||
parameters: "<lider drużyny>"
|
||||
description: "rozwiąż drużynę lidera wyspy"
|
||||
user-disband-leader: "&cNie jesteś liderem! Użyj disband [leader]"
|
||||
use-disband-owner: "&cNie jesteś liderem! Użyj disband [owner]"
|
||||
disbanded: "&cAdministrator rozwiązał Twoją drużyne!"
|
||||
kick:
|
||||
parameters: "<gracz z drużyny>"
|
||||
description: "wyrzuć gracza z drużyny"
|
||||
cannot-kick-leader: "&cNie możesz wyrzucić lidera drużyny. Najpierw wyrzuć członków."
|
||||
cannot-kick-owner: "&cNie możesz wyrzucić lidera drużyny. Najpierw wyrzuć członków."
|
||||
admin-kicked: "&cAdministrator wyrzucił Cię z drużyny."
|
||||
makeleader:
|
||||
setowner:
|
||||
parameters: "<gracz>"
|
||||
description: "uczyń gracza liderem wyspy"
|
||||
already-leader: "&cGracz jest już liderem!"
|
||||
already-owner: "&cGracz jest już liderem!"
|
||||
register:
|
||||
parameters: "<gracz>"
|
||||
description: "zarejestruj gracza na niezamieszkanej wyspie, na której jesteś"
|
||||
@ -215,7 +215,7 @@ commands:
|
||||
kick:
|
||||
description: "wyrzuć gracza z swojej wyspy"
|
||||
parameters: "<gracz>"
|
||||
leader-kicked: "&cLider wyrzucił Cię z jego wyspy."
|
||||
owner-kicked: "&cLider wyrzucił Cię z jego wyspy."
|
||||
cannot-kick: "&cNie możesz wyrzucić samego siebie."
|
||||
demote:
|
||||
description: "degraduj gracza na swojej wyspie do roli"
|
||||
|
@ -129,7 +129,7 @@ commands:
|
||||
description: "loại bỏ 1 người chơi khỏi đảo"
|
||||
parameters: "<player>"
|
||||
type-again: "&cHãy đánh lệnh loại bỏ 1 lần nữa để xác nhận"
|
||||
leader-kicked: "&cĐội trưởng đã đuổi bạn ra khỏi đội!"
|
||||
owner-kicked: "&cĐội trưởng đã đuổi bạn ra khỏi đội!"
|
||||
demote:
|
||||
description: "hạ cấp bậc người chơi"
|
||||
parameters: "<player>"
|
||||
|
@ -54,19 +54,19 @@ commands:
|
||||
description: "清空所有玩家在这个世界的重制次数"
|
||||
team:
|
||||
add:
|
||||
parameters: "<leader> <player>"
|
||||
parameters: "<owner> <player>"
|
||||
description: "将玩家添加到队长的队伍中"
|
||||
name-not-leader: "&c[name] 不是队长"
|
||||
name-not-owner: "&c[name] 不是队长"
|
||||
name-has-island: "&c[name] 已经有岛屿了。请先注销或删除它们!"
|
||||
disband:
|
||||
parameters: "<team leader>"
|
||||
parameters: "<owner>"
|
||||
description: "解散队长的队伍"
|
||||
user-disband-leader: "&c不是队长!请用 disband [leader]"
|
||||
use-disband-owner: "&c不是队长!请用 disband [owner]"
|
||||
disbanded: "&c管理员解散了您的队伍!"
|
||||
kick:
|
||||
parameters: "<team player>"
|
||||
description: "从队伍中踢走玩家"
|
||||
cannot-kick-leader: "&c您不能踢走队长。请先踢走成员"
|
||||
cannot-kick-owner: "&c您不能踢走队长。请先踢走成员"
|
||||
admin-kicked: "&c管理员将您从队伍中踢了出来。"
|
||||
setowner:
|
||||
parameters: "<player>"
|
||||
@ -188,7 +188,7 @@ commands:
|
||||
delete:
|
||||
parameters: ""
|
||||
description: "删除玩家的岛屿"
|
||||
cannot-delete-team-leader: "&c删除之前必须将所有岛屿成员都踢出岛屿。"
|
||||
cannot-delete-owner: "&c删除之前必须将所有岛屿成员都踢出岛屿。"
|
||||
deleted-island: "&a位于 &e[xyz] &a的岛屿已经被成功删除。"
|
||||
why:
|
||||
parameters: "<player>"
|
||||
@ -323,7 +323,7 @@ commands:
|
||||
kick:
|
||||
description: "从您的岛屿踢出成员"
|
||||
parameters: "<player>"
|
||||
leader-kicked: "&c队长将您踢出岛屿!"
|
||||
owner-kicked: "&c队长将您踢出岛屿!"
|
||||
cannot-kick: "&c您不能把自己踢出去!"
|
||||
demote:
|
||||
description: "将您岛屿上的玩家降阶"
|
||||
|
@ -168,7 +168,7 @@ public class AdminDeleteCommandTest {
|
||||
when(pm.getUUID(Mockito.any())).thenReturn(notUUID);
|
||||
AdminDeleteCommand itl = new AdminDeleteCommand(ac);
|
||||
assertFalse(itl.execute(user, itl.getLabel(), Arrays.asList(name)));
|
||||
Mockito.verify(user).sendMessage("commands.admin.delete.cannot-delete-team-leader");
|
||||
Mockito.verify(user).sendMessage("commands.admin.delete.cannot-delete-owner");
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -210,7 +210,7 @@ public class AdminTeamAddCommandTest {
|
||||
when(im.getIsland(Mockito.any(), Mockito.eq(uuid))).thenReturn(island);
|
||||
|
||||
assertFalse(itl.execute(user, itl.getLabel(), Arrays.asList(name)));
|
||||
Mockito.verify(user).sendMessage("commands.admin.team.add.name-not-leader", "[name]", "tastybento");
|
||||
Mockito.verify(user).sendMessage("commands.admin.team.add.name-not-owner", "[name]", "tastybento");
|
||||
Mockito.verify(island).showMembers(Mockito.eq(plugin), Mockito.any(), Mockito.any());
|
||||
}
|
||||
|
||||
|
@ -163,7 +163,7 @@ public class AdminTeamDisbandCommandTest {
|
||||
|
||||
AdminTeamDisbandCommand itl = new AdminTeamDisbandCommand(ac);
|
||||
assertFalse(itl.execute(user, itl.getLabel(), Arrays.asList(name)));
|
||||
Mockito.verify(user).sendMessage("commands.admin.team.disband.use-disband-leader", "[leader]", "owner");
|
||||
Mockito.verify(user).sendMessage("commands.admin.team.disband.use-disband-owner", "[owner]", "owner");
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -165,7 +165,7 @@ public class AdminTeamKickCommandTest {
|
||||
|
||||
AdminTeamKickCommand itl = new AdminTeamKickCommand(ac);
|
||||
assertFalse(itl.execute(user, itl.getLabel(), Arrays.asList(name)));
|
||||
Mockito.verify(user).sendMessage(Mockito.eq("commands.admin.team.kick.cannot-kick-leader"));
|
||||
Mockito.verify(user).sendMessage(Mockito.eq("commands.admin.team.kick.cannot-kick-owner"));
|
||||
Mockito.verify(is).showMembers(Mockito.any(), Mockito.any(), Mockito.any());
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user