external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

translate enum ZoneType

Browse Source
This commit is contained in:
CCTV-1
2019-12-30 10:35:16 +08:00
parent cea6d3a9df
commit c9f33415e1
6 changed files with 46 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui/src/main/java/forge/player/HumanPlay.java
View File

@@ -504,7 +504,7 @@ public class HumanPlay {
// replace this with input
CardCollection newList = new CardCollection();
for (int i = 0; i < nNeeded; i++) {
final Card c = p.getGame().getCard(SGuiChoose.oneOrNone(Localizer.getInstance().getMessage("lblExileFromZone", from.toString()), CardView.getCollection(list)));
final Card c = p.getGame().getCard(SGuiChoose.oneOrNone(Localizer.getInstance().getMessage("lblExileFromZone", from.getTranslatedName()), CardView.getCollection(list)));
if (c == null) {
return false;
}
@@ -540,7 +540,7 @@ public class HumanPlay {
payableZone.add(player);
}
}
Player chosen = controller.getGame().getPlayer(SGuiChoose.oneOrNone(Localizer.getInstance().getMessage("lblPutCardFromWhoseZone", from.toString()), PlayerView.getCollection(payableZone)));
Player chosen = controller.getGame().getPlayer(SGuiChoose.oneOrNone(Localizer.getInstance().getMessage("lblPutCardFromWhoseZone", from.getTranslatedName()), PlayerView.getCollection(payableZone)));
if (chosen == null) {
return false;
}

8
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -733,9 +733,9 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
@Override
public void reveal(final List<CardView> cards, final ZoneType zone, final PlayerView owner, String message) {
if (StringUtils.isBlank(message)) {
message = localizer.getMessage("lblLookCardInPlayerZone", "{player's}", zone.name().toLowerCase());
message = localizer.getMessage("lblLookCardInPlayerZone", "{player's}", zone.getTranslatedName().toLowerCase());
} else {
message += localizer.getMessage("lblPlayerZone", "{player's}", zone.name().toLowerCase());
message += localizer.getMessage("lblPlayerZone", "{player's}", zone.getTranslatedName().toLowerCase());
}
final String fm = MessageUtil.formatMessage(message, getLocalPlayerView(), owner);
if (!cards.isEmpty()) {
@@ -743,7 +743,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
getGui().reveal(fm, cards);
endTempShowCards();
} else {
getGui().message(MessageUtil.formatMessage(localizer.getMessage("lblThereNoCardInPlayerZone", "{player's}", zone.name().toLowerCase()),
getGui().message(MessageUtil.formatMessage(localizer.getMessage("lblThereNoCardInPlayerZone", "{player's}", zone.getTranslatedName().toLowerCase()),
player, owner), fm);
}
}
@@ -2366,7 +2366,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
final ZoneType targetZone = repeatLast ? lastAddedZone : zone;
String message = null;
if (targetZone != ZoneType.Battlefield) {
message = localizer.getMessage("lblPutCardInWhichPlayerZone", targetZone.name().toLowerCase());
message = localizer.getMessage("lblPutCardInWhichPlayerZone", targetZone.getTranslatedName().toLowerCase());
}
else {
if (noTriggers) {