diff --git a/REFERENCES.md b/REFERENCES.md index 2a07a99c1..06f0ddda1 100644 --- a/REFERENCES.md +++ b/REFERENCES.md @@ -68,7 +68,7 @@ general.errors.no-island general.errors.no-permission general.errors.no-team general.errors.not-in-team -general.errors.not-leader +general.errors.not-owner general.errors.offline-player general.errors.player-has-island general.errors.player-has-no-island diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandResetCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandResetCommand.java index 3ab6a9733..22e61564f 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandResetCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandResetCommand.java @@ -39,7 +39,7 @@ public class IslandResetCommand extends ConfirmableCommand { return false; } if (!getIslands().isOwner(getWorld(), user.getUniqueId())) { - user.sendMessage("general.errors.not-leader"); + user.sendMessage("general.errors.not-owner"); return false; } if (getIslands().inTeam(getWorld(), user.getUniqueId())) { diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandResetnameCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandResetnameCommand.java index af1bb9354..2a8a81790 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandResetnameCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandResetnameCommand.java @@ -33,7 +33,7 @@ public class IslandResetnameCommand extends CompositeCommand { } if (!getIslands().isOwner(getWorld(), playerUUID)) { - user.sendMessage("general.errors.not-leader"); + user.sendMessage("general.errors.not-owner"); return false; } // Resets the island name diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandSetnameCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandSetnameCommand.java index fa7e6beef..68249d7ed 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandSetnameCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandSetnameCommand.java @@ -37,7 +37,7 @@ public class IslandSetnameCommand extends CompositeCommand { } if (!getIslands().isOwner(getWorld(), playerUUID)) { - user.sendMessage("general.errors.not-leader"); + user.sendMessage("general.errors.not-owner"); return false; } // Explain command diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommand.java index 8490b0a10..355a82e7c 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommand.java @@ -30,7 +30,7 @@ public class IslandTeamKickCommand extends ConfirmableCommand { return false; } if (!getOwner(getWorld(), user).equals(user.getUniqueId())) { - user.sendMessage("general.errors.not-leader"); + user.sendMessage("general.errors.not-owner"); return false; } // If args are not right, show help diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamSetownerCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamSetownerCommand.java index 56667a4d1..43c0e889c 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamSetownerCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamSetownerCommand.java @@ -33,7 +33,7 @@ public class IslandTeamSetownerCommand extends CompositeCommand { boolean inTeam = getPlugin().getIslands().inTeam(getWorld(), playerUUID); UUID ownerUUID = getOwner(getWorld(), user); if (!(inTeam && ownerUUID.equals(playerUUID))) { - user.sendMessage("general.errors.not-leader"); + user.sendMessage("general.errors.not-owner"); return false; } // If args are not right, show help diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml index ee29b6ab1..94432f07d 100644 --- a/src/main/resources/locales/en-US.yml +++ b/src/main/resources/locales/en-US.yml @@ -23,7 +23,7 @@ general: player-has-no-island: "&cThat player has no island!" already-have-island: "&cYou already have an island!" no-safe-location: "&cNo safe location found on island!" - not-leader: "&cYou are not the leader of your island!" + not-owner: "&cYou are not the owner of your island!" not-in-team: "&cThat player is not in your team!" offline-player: "&cThat player is offline or doesn't exist." unknown-player: "&c[name] is an unknown player!" diff --git a/src/main/resources/locales/jp-JP.yml b/src/main/resources/locales/jp-JP.yml index 530015a77..67451ea5f 100644 --- a/src/main/resources/locales/jp-JP.yml +++ b/src/main/resources/locales/jp-JP.yml @@ -22,7 +22,7 @@ general: player-has-no-island: "&cあの選手には島がない!" already-have-island: "&cあなたはすでに島を持っている!" no-safe-location: "&cスタッフの方がとても親切でした。" - not-leader: "&cあなたの島のリーダーではありません!" + not-owner: "&cあなたの島のリーダーではありません!" not-in-team: "&cあの選手はあなたのチームにはいない!" offline-player: "&cそのプレイヤーはオフラインまたは存在しません。" unknown-player: "&c不明なプレイヤー!" diff --git a/src/main/resources/locales/pl-PL.yml b/src/main/resources/locales/pl-PL.yml index cd9662710..3538f6489 100644 --- a/src/main/resources/locales/pl-PL.yml +++ b/src/main/resources/locales/pl-PL.yml @@ -26,7 +26,7 @@ general: player-has-no-island: "&cTen gracz nie ma wyspy!" already-have-island: "&cMasz już wyspę!" no-safe-location: "&cNa wyspie nie znaleziono bezpiecznej lokalizacji!" - not-leader: "&cNie jesteś liderem swojej wyspy!" + not-owner: "&cNie jesteś liderem swojej wyspy!" not-in-team: "&cTen gracz nie jest w twojej drużynie." offline-player: "&cTen gracz jest offline lub nie istnieje." unknown-player: "&cNieznany gracz!" diff --git a/src/main/resources/locales/vi-VN.yml b/src/main/resources/locales/vi-VN.yml index 95a5be326..fcfbce9fa 100644 --- a/src/main/resources/locales/vi-VN.yml +++ b/src/main/resources/locales/vi-VN.yml @@ -23,7 +23,7 @@ general: player-has-no-island: "&cNgười chơi đó không có đảo!" already-have-island: "&cBạn đã có đảo!" no-safe-location: "&cKhông có địa điểm an toàn nào trên đảo!" - not-leader: "&cBạn không phải đội trưởng!" + not-owner: "&cBạn không phải đội trưởng!" not-in-team: "&cNgười chơi không có trong đội!" offline-player: "&cNgười chơi đang offline hoặc không tồn tại." unknown-player: "&cNgười chơi không tìm thấy!" diff --git a/src/main/resources/locales/zh-CN.yml b/src/main/resources/locales/zh-CN.yml index 39b822119..3abf8a52f 100644 --- a/src/main/resources/locales/zh-CN.yml +++ b/src/main/resources/locales/zh-CN.yml @@ -21,7 +21,7 @@ general: player-has-no-island: "&c该玩家没有岛屿！" already-have-island: "&c您已经有岛屿了！" no-safe-location: "&c岛上没有安全位置！" - not-leader: "&c您不是您的岛上的队长！" + not-owner: "&c您不是您的岛上的队长！" not-in-team: "&c该玩家不是您的队员！" offline-player: "&c该玩家不在线或不存在。" unknown-player: "&c[name] 是未知玩家！" diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandResetCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandResetCommandTest.java index 766b61a86..b8993c2d5 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandResetCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandResetCommandTest.java @@ -139,7 +139,7 @@ public class IslandResetCommandTest { // Now has island, but is not the owner when(im.hasIsland(Mockito.any(), Mockito.eq(uuid))).thenReturn(true); assertFalse(irc.execute(user, irc.getLabel(), new ArrayList<>())); - Mockito.verify(user).sendMessage("general.errors.not-leader"); + Mockito.verify(user).sendMessage("general.errors.not-owner"); } @Test diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommandTest.java index b88536141..7237c978f 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommandTest.java @@ -142,7 +142,7 @@ public class IslandTeamKickCommandTest { when(im.getOwner(Mockito.any(), Mockito.any())).thenReturn(notUUID); IslandTeamKickCommand itl = new IslandTeamKickCommand(ic); assertFalse(itl.execute(user, itl.getLabel(), new ArrayList<>())); - Mockito.verify(user).sendMessage(Mockito.eq("general.errors.not-leader")); + Mockito.verify(user).sendMessage(Mockito.eq("general.errors.not-owner")); } /**