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:
Florian CUNY 2018-12-09 13:41:09 +01:00
parent 607db5b07f
commit b20ef00853
14 changed files with 43 additions and 43 deletions

View File

@ -42,9 +42,9 @@ public class AdminDeleteCommand extends ConfirmableCommand {
user.sendMessage("general.errors.player-has-no-island"); user.sendMessage("general.errors.player-has-no-island");
return false; 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)) { 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; return false;
} }
// Confirm // Confirm

View File

@ -43,7 +43,7 @@ public class AdminTeamAddCommand extends CompositeCommand {
return false; return false;
} }
if (getIslands().inTeam(getWorld(), ownerUUID) && !getIslands().getOwner(getWorld(), ownerUUID).equals(ownerUUID)) { 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()); getIslands().getIsland(getWorld(), ownerUUID).showMembers(getPlugin(), user, getWorld());
return false; return false;
} }

View File

@ -42,13 +42,13 @@ public class AdminTeamDisbandCommand extends CompositeCommand {
return false; return false;
} }
if (!getIslands().getOwner(getWorld(), targetUUID).equals(targetUUID)) { 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; return false;
} }
// Disband team // Disband team
getIslands().getMembers(getWorld(), targetUUID).forEach(m -> { getIslands().getMembers(getWorld(), targetUUID).forEach(m -> {
User.getInstance(m).sendMessage("commands.admin.team.disband.disbanded"); 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)) { if (!m.equals(targetUUID)) {
getIslands().setLeaveTeam(getWorld(), m); getIslands().setLeaveTeam(getWorld(), m);
} }

View File

@ -43,7 +43,7 @@ public class AdminTeamKickCommand extends CompositeCommand {
return false; return false;
} }
if (getIslands().getOwner(getWorld(), targetUUID).equals(targetUUID)) { 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()); getIslands().getIsland(getWorld(), targetUUID).showMembers(getPlugin(), user, getWorld());
return false; return false;
} }

View File

@ -63,7 +63,7 @@ public class IslandTeamKickCommand extends ConfirmableCommand {
private void kick(User user, UUID targetUUID) { private void kick(User user, UUID targetUUID) {
User target = User.getInstance(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); getIslands().removePlayer(getWorld(), targetUUID);
// Remove money inventory etc. // Remove money inventory etc.
if (getIWM().isOnLeaveResetEnderChest(getWorld())) { if (getIWM().isOnLeaveResetEnderChest(getWorld())) {

View File

@ -56,19 +56,19 @@ commands:
description: "clears all player reset counts for this world" description: "clears all player reset counts for this world"
team: team:
add: add:
parameters: "<leader> <player>" parameters: "<owner> <player>"
description: "add player to leader's team" description: "add player to owner's team"
name-not-leader: "&c[name] is not the leader" name-not-owner: "&c[name] is not the owner."
name-has-island: "&c[name] has an island. Unregister or delete them first!" name-has-island: "&c[name] has an island. Unregister or delete them first!"
disband: disband:
parameters: "<team leader>" parameters: "<owner>"
description: "disband team leader's team" description: "disband owner's team"
user-disband-leader: "&cNot leader! Use disband [leader]" use-disband-owner: "&cNot owner! Use disband [owner]"
disbanded: "&cAdmin disbanded your team!" disbanded: "&cAdmin disbanded your team!"
kick: kick:
parameters: "<team player>" parameters: "<team player>"
description: "kick a player from a team" 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." admin-kicked: "&cThe admin kicked you from the team."
setowner: setowner:
parameters: "<player>" parameters: "<player>"
@ -190,7 +190,7 @@ commands:
delete: delete:
parameters: "" parameters: ""
description: "deletes a player's island" 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." deleted-island: "&aIsland at &e[xyz] &ahas been successfully deleted."
why: why:
parameters: "<player>" parameters: "<player>"
@ -319,13 +319,13 @@ commands:
cancel: cancel:
description: "cancel the pending invite to join your island" description: "cancel the pending invite to join your island"
leave: 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" description: "leave your island"
left-your-island: "&c[name] &cleft your island" left-your-island: "&c[name] &cleft your island"
kick: kick:
description: "remove a member from your island" description: "remove a member from your island"
parameters: "<player>" 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!" cannot-kick: "&cYou cannot kick yourself!"
demote: demote:
description: "demote a player on your island down a rank" description: "demote a player on your island down a rank"
@ -340,7 +340,7 @@ commands:
setowner: setowner:
description: "transfer your island ownership to a member" description: "transfer your island ownership to a member"
errors: 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!" target-is-not-member: "&cThat player is not part of your island team!"
name-is-the-owner: "&a[name] is now the island owner!" name-is-the-owner: "&a[name] is now the island owner!"
parameters: "<player>" parameters: "<player>"

View File

@ -57,22 +57,22 @@ commands:
add: add:
parameters: "<リーダー> <プレーヤー>" parameters: "<リーダー> <プレーヤー>"
description: "リーダーのチームにプレイヤーを追加する" description: "リーダーのチームにプレイヤーを追加する"
name-not-leader: "&c[name]はリーダーではありません" name-not-owner: "&c[name]はリーダーではありません"
name-has-island: "&c[name]には島があります。登録を解除するか、最初に削除します。" name-has-island: "&c[name]には島があります。登録を解除するか、最初に削除します。"
disband: disband:
parameters: "<リーダー>" parameters: "<リーダー>"
description: "チームリーダーのチームを解散" description: "チームリーダーのチームを解散"
user-disband-leader: "リーダーじゃない!解散を使用 [leader]" use-disband-owner: "リーダーじゃない!解散を使用 [owner]"
disbanded: "管理者はあなたのチームを解散!" disbanded: "管理者はあなたのチームを解散!"
kick: kick:
parameters: "<プレーヤー>" parameters: "<プレーヤー>"
description: "チームからプレーヤーを蹴る" description: "チームからプレーヤーを蹴る"
cannot-kick-leader: "&cチームリーダーを蹴ることはできません。キックのメンバーは、まず" cannot-kick-owner: "&cチームリーダーを蹴ることはできません。キックのメンバーは、まず"
admin-kicked: "管理者は、チームからあなたを蹴った。" admin-kicked: "管理者は、チームからあなたを蹴った。"
makeleader: setowner:
parameters: "<プレーヤー>" parameters: "<プレーヤー>"
description: "プレーヤーをチームのリーダーにする" description: "プレーヤーをチームのリーダーにする"
already-leader: "&cプレイヤーはすでにリーダーです!" already-owner: "&cプレイヤーはすでにリーダーです!"
range: range:
description: "管理島の範囲コマンド" description: "管理島の範囲コマンド"
display: display:
@ -168,7 +168,7 @@ commands:
delete: delete:
parameters: "" parameters: ""
description: "プレイヤーの島を削除します。" description: "プレイヤーの島を削除します。"
cannot-delete-team-leader: "&cすべての島のメンバーは、それを削除する前に島から追い出される必要があります。" cannot-delete-owner: "&cすべての島のメンバーは、それを削除する前に島から追い出される必要があります。"
deleted-island: "&2[xyz] の島は正常に削除されました。" deleted-island: "&2[xyz] の島は正常に削除されました。"
bentobox: bentobox:
description: "BentoBox管理コマンド" description: "BentoBox管理コマンド"
@ -291,7 +291,7 @@ commands:
kick: kick:
description: "島からメンバーを削除する" description: "島からメンバーを削除する"
parameters: "<プレーヤー>" parameters: "<プレーヤー>"
leader-kicked: "リーダーが島からあなたを削除しました!" owner-kicked: "リーダーが島からあなたを削除しました!"
cannot-kick: "自分を削除することはできません!" cannot-kick: "自分を削除することはできません!"
demote: demote:
description: "ランクダウンあなたの島のプレーヤーを降格" description: "ランクダウンあなたの島のプレーヤーを降格"

View File

@ -55,22 +55,22 @@ commands:
add: add:
parameters: "<lider> <gracz>" parameters: "<lider> <gracz>"
description: "dodaj gracza do drużyny lidera" 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ąć." name-has-island: "&c[name] ma wyspę. Najpierw musi ją wyrejestrować lub usunąć."
disband: disband:
parameters: "<lider drużyny>" parameters: "<lider drużyny>"
description: "rozwiąż drużynę lidera wyspy" 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!" disbanded: "&cAdministrator rozwiązał Twoją drużyne!"
kick: kick:
parameters: "<gracz z drużyny>" parameters: "<gracz z drużyny>"
description: "wyrzuć gracza 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." admin-kicked: "&cAdministrator wyrzucił Cię z drużyny."
makeleader: setowner:
parameters: "<gracz>" parameters: "<gracz>"
description: "uczyń gracza liderem wyspy" description: "uczyń gracza liderem wyspy"
already-leader: "&cGracz jest już liderem!" already-owner: "&cGracz jest już liderem!"
register: register:
parameters: "<gracz>" parameters: "<gracz>"
description: "zarejestruj gracza na niezamieszkanej wyspie, na której jesteś" description: "zarejestruj gracza na niezamieszkanej wyspie, na której jesteś"
@ -215,7 +215,7 @@ commands:
kick: kick:
description: "wyrzuć gracza z swojej wyspy" description: "wyrzuć gracza z swojej wyspy"
parameters: "<gracz>" 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." cannot-kick: "&cNie możesz wyrzucić samego siebie."
demote: demote:
description: "degraduj gracza na swojej wyspie do roli" description: "degraduj gracza na swojej wyspie do roli"

View File

@ -129,7 +129,7 @@ commands:
description: "loại bỏ 1 người chơi khỏi đảo" description: "loại bỏ 1 người chơi khỏi đảo"
parameters: "<player>" parameters: "<player>"
type-again: "&cHãy đánh lệnh loại bỏ 1 lần nữa để xác nhận" 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: demote:
description: "hạ cấp bậc người chơi" description: "hạ cấp bậc người chơi"
parameters: "<player>" parameters: "<player>"

View File

@ -54,19 +54,19 @@ commands:
description: "清空所有玩家在这个世界的重制次数" description: "清空所有玩家在这个世界的重制次数"
team: team:
add: add:
parameters: "<leader> <player>" parameters: "<owner> <player>"
description: "将玩家添加到队长的队伍中" description: "将玩家添加到队长的队伍中"
name-not-leader: "&c[name] 不是队长" name-not-owner: "&c[name] 不是队长"
name-has-island: "&c[name] 已经有岛屿了。请先注销或删除它们!" name-has-island: "&c[name] 已经有岛屿了。请先注销或删除它们!"
disband: disband:
parameters: "<team leader>" parameters: "<owner>"
description: "解散队长的队伍" description: "解散队长的队伍"
user-disband-leader: "&c不是队长请用 disband [leader]" use-disband-owner: "&c不是队长请用 disband [owner]"
disbanded: "&c管理员解散了您的队伍" disbanded: "&c管理员解散了您的队伍"
kick: kick:
parameters: "<team player>" parameters: "<team player>"
description: "从队伍中踢走玩家" description: "从队伍中踢走玩家"
cannot-kick-leader: "&c您不能踢走队长。请先踢走成员" cannot-kick-owner: "&c您不能踢走队长。请先踢走成员"
admin-kicked: "&c管理员将您从队伍中踢了出来。" admin-kicked: "&c管理员将您从队伍中踢了出来。"
setowner: setowner:
parameters: "<player>" parameters: "<player>"
@ -188,7 +188,7 @@ commands:
delete: delete:
parameters: "" parameters: ""
description: "删除玩家的岛屿" description: "删除玩家的岛屿"
cannot-delete-team-leader: "&c删除之前必须将所有岛屿成员都踢出岛屿。" cannot-delete-owner: "&c删除之前必须将所有岛屿成员都踢出岛屿。"
deleted-island: "&a位于 &e[xyz] &a的岛屿已经被成功删除。" deleted-island: "&a位于 &e[xyz] &a的岛屿已经被成功删除。"
why: why:
parameters: "<player>" parameters: "<player>"
@ -323,7 +323,7 @@ commands:
kick: kick:
description: "从您的岛屿踢出成员" description: "从您的岛屿踢出成员"
parameters: "<player>" parameters: "<player>"
leader-kicked: "&c队长将您踢出岛屿" owner-kicked: "&c队长将您踢出岛屿"
cannot-kick: "&c您不能把自己踢出去" cannot-kick: "&c您不能把自己踢出去"
demote: demote:
description: "将您岛屿上的玩家降阶" description: "将您岛屿上的玩家降阶"

View File

@ -168,7 +168,7 @@ public class AdminDeleteCommandTest {
when(pm.getUUID(Mockito.any())).thenReturn(notUUID); when(pm.getUUID(Mockito.any())).thenReturn(notUUID);
AdminDeleteCommand itl = new AdminDeleteCommand(ac); AdminDeleteCommand itl = new AdminDeleteCommand(ac);
assertFalse(itl.execute(user, itl.getLabel(), Arrays.asList(name))); 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");
} }
/** /**

View File

@ -210,7 +210,7 @@ public class AdminTeamAddCommandTest {
when(im.getIsland(Mockito.any(), Mockito.eq(uuid))).thenReturn(island); when(im.getIsland(Mockito.any(), Mockito.eq(uuid))).thenReturn(island);
assertFalse(itl.execute(user, itl.getLabel(), Arrays.asList(name))); 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()); Mockito.verify(island).showMembers(Mockito.eq(plugin), Mockito.any(), Mockito.any());
} }

View File

@ -163,7 +163,7 @@ public class AdminTeamDisbandCommandTest {
AdminTeamDisbandCommand itl = new AdminTeamDisbandCommand(ac); AdminTeamDisbandCommand itl = new AdminTeamDisbandCommand(ac);
assertFalse(itl.execute(user, itl.getLabel(), Arrays.asList(name))); 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");
} }
/** /**

View File

@ -165,7 +165,7 @@ public class AdminTeamKickCommandTest {
AdminTeamKickCommand itl = new AdminTeamKickCommand(ac); AdminTeamKickCommand itl = new AdminTeamKickCommand(ac);
assertFalse(itl.execute(user, itl.getLabel(), Arrays.asList(name))); 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()); Mockito.verify(is).showMembers(Mockito.any(), Mockito.any(), Mockito.any());
} }