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

Mobile: Translated more strings and Views

Browse Source 
Fixed duplicated Catalog label
Fixed Stack label not found
This commit is contained in:
Peter
2019-09-22 20:49:55 +02:00
parent d850a6685a
commit 4bf837701f
19 changed files with 412 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
forge-gui-mobile/src/forge/deck/FDeckChooser.java
View File

@@ -73,6 +73,7 @@ public class FDeckChooser extends FScreen {
private boolean isAi;
private final ForgePreferences prefs = FModel.getPreferences();
private final Localizer localizer = Localizer.getInstance();
private FPref stateSetting = null;
private FOptionPane optionPane;
@@ -98,7 +99,7 @@ public class FDeckChooser extends FScreen {
container.add(deckChooser.lstDecks);
container.setHeight(FOptionPane.getMaxDisplayObjHeight());
deckChooser.optionPane = new FOptionPane(null, null, title, null, container, ImmutableList.of("OK", "Cancel"), 0, new Callback<Integer>() {
deckChooser.optionPane = new FOptionPane(null, null, title, null, container, ImmutableList.of(Localizer.getInstance().getMessage("lblOK"), Localizer.getInstance().getMessage("lblCancel")), 0, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == 0) {
@@ -309,7 +310,7 @@ public class FDeckChooser extends FScreen {
editor = new FDeckEditor(getEditorType(), generatedDeck, true);
}
else {
FOptionPane.showErrorDialog("You must select something before you can generate a new deck.");
FOptionPane.showErrorDialog(localizer.getMessage("lblMustSelectGenerateNewDeck"));
return;
}
break;
@@ -377,9 +378,10 @@ public class FDeckChooser extends FScreen {
return;
}
//prompt to duplicate deck if deck doesn't exist already
FOptionPane.showConfirmDialog(selectedDeckType + " cannot be edited directly. Would you like to duplicate " + deck.getName() + " for editing as a custom user deck?",
"Duplicate Deck?", "Duplicate", "Cancel", new Callback<Boolean>() {
FOptionPane.showConfirmDialog(selectedDeckType + " " + localizer.getMessage("lblCannotEditDuplicateCustomDeck").replace("%s", deck.getName()),
localizer.getMessage("lblDuplicateDeck"), localizer.getMessage("lblDuplicate"), localizer.getMessage("lblCancel"), new Callback<Boolean>() {
@Override
public void run(Boolean result) {
if (result) {
@@ -770,16 +772,16 @@ public class FDeckChooser extends FScreen {
btnViewDeck.setVisible(false);
btnRandom.setWidth(btnNewDeck.getWidth());
btnNewDeck.setText("Generate New Deck");
btnNewDeck.setText(localizer.getMessage("lblGenerateNewDeck"));
switch (deckType) {
case COLOR_DECK:
btnRandom.setText("Random Colors");
btnRandom.setText(localizer.getMessage("lblRandomColors"));
break;
case THEME_DECK:
btnRandom.setText("Random Theme");
btnRandom.setText(localizer.getMessage("lblRandomTheme"));
break;
default:
btnRandom.setText("Random Deck");
btnRandom.setText(localizer.getMessage("lblRandomDeck"));
break;
}
}
@@ -789,11 +791,11 @@ public class FDeckChooser extends FScreen {
btnViewDeck.setVisible(true);
btnRandom.setWidth(btnNewDeck.getWidth());
btnNewDeck.setText("New Deck");
btnNewDeck.setText(localizer.getMessage("lblNewDeck"));
if (lstDecks.getGameType() == GameType.DeckManager) {
//handle special case of Deck Editor screen where this button will start a game with the deck
btnRandom.setText("Test Deck");
btnRandom.setText(localizer.getMessage("lblTestDeck"));
switch (selectedDeckType) {
case SCHEME_DECK:
@@ -806,7 +808,7 @@ public class FDeckChooser extends FScreen {
}
}
else {
btnRandom.setText("Random Deck");
btnRandom.setText(localizer.getMessage("lblRandomDeck"));
}
}
@@ -1063,7 +1065,7 @@ public class FDeckChooser extends FScreen {
return;
}
GuiChoose.getInteger("How many opponents are you willing to face?", 1, 50, new Callback<Integer>() {
GuiChoose.getInteger(localizer.getMessage("lblHowManyOpponents"), 1, 50, new Callback<Integer>() {
@Override
public void run(final Integer numOpponents) {
if (numOpponents == null) { return; }
@@ -1089,7 +1091,7 @@ public class FDeckChooser extends FScreen {
}
ListChooser<DeckType> chooser = new ListChooser<>(
"Choose allowed deck types for opponents", 0, deckTypes.size(), deckTypes, null, new Callback<List<DeckType>>() {
localizer.getMessage("lblChooseAllowedDeckTypeOpponents"), 0, deckTypes.size(), deckTypes, null, new Callback<List<DeckType>>() {
@Override
public void run(final List<DeckType> allowedDeckTypes) {
if (allowedDeckTypes == null || allowedDeckTypes.isEmpty()) {
@@ -1109,7 +1111,7 @@ public class FDeckChooser extends FScreen {
FThreads.invokeInEdtLater(new Runnable() {
@Override
public void run() {
LoadingOverlay.show("Loading new game...", new Runnable() {
LoadingOverlay.show(localizer.getMessage("lblLoadingNewGame"), new Runnable() {
@Override
public void run() {
GauntletData gauntlet = GauntletUtil.createQuickGauntlet(userDeck, numOpponents, allowedDeckTypes, netCat);
@@ -1135,12 +1137,12 @@ public class FDeckChooser extends FScreen {
}
private void testVariantDeck(final Deck userDeck, final GameType variant) {
promptForDeck("Select Opponent's Deck", variant, true, new Callback<Deck>() {
promptForDeck(localizer.getMessage("lblSelectOpponentDeck"), variant, true, new Callback<Deck>() {
@Override
public void run(final Deck aiDeck) {
if (aiDeck == null) { return; }
LoadingOverlay.show("Loading new game...", new Runnable() {
LoadingOverlay.show(localizer.getMessage("lblLoadingNewGame"), new Runnable() {
@Override
public void run() {
Set<GameType> appliedVariants = new HashSet<>();