Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix grammar in bid place delegate errors messages. #11822

Merged
merged 1 commit into from
Jul 26, 2023
Merged

Fix grammar in bid place delegate errors messages. #11822

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions game-app/game-core/src/main/java/games/strategy/triplea/delegate/BidPlaceDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,19 @@ protected String canProduce(
// we can place if no enemy units and its water
if (to.isWater()) {
if (units.stream().anyMatch(Matches.unitIsLand())) {
return "Cant place land units at sea";
return "Can't place land units at sea";
} else if (to.anyUnitsMatch(Matches.enemyUnit(player))) {
return "Cant place in sea zone containing enemy units";
return "Can't place in sea zone containing enemy units";
} else if (!to.anyUnitsMatch(Matches.unitIsOwnedBy(player))) {
return "Cant place in sea zone that does not contain a unit owned by you";
return "Can't place in sea zone that does not contain a unit owned by you";
} else {
return null;
}
}

// we can place on territories we own
if (units.stream().anyMatch(Matches.unitIsSea())) {
return "Cant place sea units on land";
return "Can't place sea units on land";
} else if (!to.isOwnedBy(player)) {
final PlayerAttachment pa = PlayerAttachment.get(to.getOwner());
if (pa != null
Expand All @@ -61,7 +61,7 @@ protected String canProduce(
} else if (to.anyUnitsMatch(Matches.unitIsOwnedBy(player))) {
return null;
}
return "You dont own " + to.getName();
return "You don't own " + to.getName();
} else {
return null;
}
Expand Down