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

Mobile - Translation: Deck Chooser, Deck Editor and Match Screen.

Browse Source 
Fix compare String with equals()
This commit is contained in:
Peter
2019-09-13 11:19:35 +02:00
parent 207eaf482d
commit 16da63aa9c
7 changed files with 241 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,7 @@ import forge.toolbox.ListChooser;
import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FOptionPane; import forge.toolbox.FOptionPane;
import forge.util.Callback; import forge.util.Callback;
import forge.util.Localizer;
import forge.util.Utils; import forge.util.Utils;
import forge.util.storage.IStorage; import forge.util.storage.IStorage;
@@ -63,10 +64,10 @@ public class FDeckChooser extends FScreen {
private boolean refreshingDeckType; private boolean refreshingDeckType;
private final DeckManager lstDecks; private final DeckManager lstDecks;
private final FButton btnNewDeck = new FButton("New Deck"); private final FButton btnNewDeck = new FButton(Localizer.getInstance().getMessage("lblNewDeck"));
private final FButton btnEditDeck = new FButton("Edit Deck"); private final FButton btnEditDeck = new FButton(Localizer.getInstance().getMessage("btnEditDeck"));
private final FButton btnViewDeck = new FButton("View Deck"); private final FButton btnViewDeck = new FButton(Localizer.getInstance().getMessage("lblViewDeck"));
private final FButton btnRandom = new FButton("Random Deck"); private final FButton btnRandom = new FButton(Localizer.getInstance().getMessage("lblRandomDeck"));
private RegisteredPlayer player; private RegisteredPlayer player;
private boolean isAi; private boolean isAi;

135
forge-gui-mobile/src/forge/deck/FDeckEditor.java
View File

@@ -36,6 +36,7 @@ import forge.toolbox.FEvent.FEventType;
import forge.util.Callback; import forge.util.Callback;
import forge.util.ItemPool; import forge.util.ItemPool;
import forge.util.Lang; import forge.util.Lang;
import forge.util.Localizer;
import forge.util.Utils; import forge.util.Utils;
import forge.util.storage.IStorage; import forge.util.storage.IStorage;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@@ -163,6 +164,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
} }
private static DeckEditorPage[] getPages(EditorType editorType) { private static DeckEditorPage[] getPages(EditorType editorType) {
final Localizer localizer = Localizer.getInstance();
switch (editorType) { switch (editorType) {
default: default:
case Constructed: case Constructed:
@@ -195,7 +197,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
return new DeckEditorPage[] { return new DeckEditorPage[] {
new CatalogPage(ItemManagerConfig.CARD_CATALOG), new CatalogPage(ItemManagerConfig.CARD_CATALOG),
new DeckSectionPage(DeckSection.Main), new DeckSectionPage(DeckSection.Main),
new DeckSectionPage(DeckSection.Commander, ItemManagerConfig.OATHBREAKER_SECTION, "Oathbreaker", FSkinImage.COMMANDER), new DeckSectionPage(DeckSection.Commander, ItemManagerConfig.OATHBREAKER_SECTION, localizer.getMessage("lblOathbreaker"), FSkinImage.COMMANDER),
new DeckSectionPage(DeckSection.Sideboard) new DeckSectionPage(DeckSection.Sideboard)
}; };
case Archenemy: case Archenemy:
@@ -210,7 +212,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
}; };
case Quest: case Quest:
return new DeckEditorPage[] { return new DeckEditorPage[] {
new CatalogPage(ItemManagerConfig.QUEST_EDITOR_POOL, "Inventory", FSkinImage.QUEST_BOX), new CatalogPage(ItemManagerConfig.QUEST_EDITOR_POOL, localizer.getMessage("lblInventory"), FSkinImage.QUEST_BOX),
new DeckSectionPage(DeckSection.Main, ItemManagerConfig.QUEST_DECK_EDITOR), new DeckSectionPage(DeckSection.Main, ItemManagerConfig.QUEST_DECK_EDITOR),
new DeckSectionPage(DeckSection.Sideboard, ItemManagerConfig.QUEST_DECK_EDITOR) new DeckSectionPage(DeckSection.Sideboard, ItemManagerConfig.QUEST_DECK_EDITOR)
}; };
@@ -222,8 +224,8 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
}; };
case PlanarConquest: case PlanarConquest:
return new DeckEditorPage[] { return new DeckEditorPage[] {
new CatalogPage(ItemManagerConfig.CONQUEST_COLLECTION, "Collection", FSkinImage.SPELLBOOK), new CatalogPage(ItemManagerConfig.CONQUEST_COLLECTION, localizer.getMessage("lblCollection"), FSkinImage.SPELLBOOK),
new DeckSectionPage(DeckSection.Main, ItemManagerConfig.CONQUEST_DECK_EDITOR, "Deck", FSkinImage.DECKLIST), new DeckSectionPage(DeckSection.Main, ItemManagerConfig.CONQUEST_DECK_EDITOR, localizer.getMessage("lblDeck"), FSkinImage.DECKLIST),
new DeckSectionPage(DeckSection.Commander, ItemManagerConfig.COMMANDER_SECTION) new DeckSectionPage(DeckSection.Commander, ItemManagerConfig.COMMANDER_SECTION)
}; };
} }
@@ -334,7 +336,9 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
FPopupMenu menu = new FPopupMenu() { FPopupMenu menu = new FPopupMenu() {
@Override @Override
protected void buildMenu() { protected void buildMenu() {
addItem(new FMenuItem("Add Basic Lands", FSkinImage.LAND, new FEventHandler() { final Localizer localizer = Localizer.getInstance();
addItem(new FMenuItem(localizer.getMessage("lblAddBasicLands"), FSkinImage.LAND, new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
CardEdition defaultLandSet; CardEdition defaultLandSet;
@@ -367,7 +371,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
} }
})); }));
if (!isLimitedEditor()) { if (!isLimitedEditor()) {
addItem(new FMenuItem("Import from Clipboard", FSkinImage.OPEN, new FEventHandler() { addItem(new FMenuItem(localizer.getMessage("lblImportFromClipboard"), FSkinImage.OPEN, new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
FDeckImportDialog dialog = new FDeckImportDialog(!deck.isEmpty(), new Callback<Deck>() { FDeckImportDialog dialog = new FDeckImportDialog(!deck.isEmpty(), new Callback<Deck>() {
@@ -386,11 +390,11 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
setSelectedPage(getMainDeckPage()); //select main deck page if needed so main deck if visible below dialog setSelectedPage(getMainDeckPage()); //select main deck page if needed so main deck if visible below dialog
} }
})); }));
addItem(new FMenuItem("Save As...", FSkinImage.SAVEAS, new FEventHandler() { addItem(new FMenuItem(localizer.getMessage("lblSaveAs"), FSkinImage.SAVEAS, new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
String defaultName = editorType.getController().getNextAvailableName(); String defaultName = editorType.getController().getNextAvailableName();
FOptionPane.showInputDialog("Enter name for new copy of deck", defaultName, new Callback<String>() { FOptionPane.showInputDialog(localizer.getMessage("lblNameNewCopyDeck"), defaultName, new Callback<String>() {
@Override @Override
public void run(String result) { public void run(String result) {
if (!StringUtils.isEmpty(result)) { if (!StringUtils.isEmpty(result)) {
@@ -402,10 +406,10 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
})); }));
} }
if (allowRename()) { if (allowRename()) {
addItem(new FMenuItem("Rename Deck", FSkinImage.EDIT, new FEventHandler() { addItem(new FMenuItem(localizer.getMessage("lblRenameDeck"), FSkinImage.EDIT, new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
FOptionPane.showInputDialog("Enter new name for deck", deck.getName(), new Callback<String>() { FOptionPane.showInputDialog(localizer.getMessage("lblNewNameDeck"), deck.getName(), new Callback<String>() {
@Override @Override
public void run(String result) { public void run(String result) {
editorType.getController().rename(result); editorType.getController().rename(result);
@@ -415,12 +419,12 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
})); }));
} }
if (allowDelete()) { if (allowDelete()) {
addItem(new FMenuItem("Delete Deck", FSkinImage.DELETE, new FEventHandler() { addItem(new FMenuItem(localizer.getMessage("lblDeleteDeck"), FSkinImage.DELETE, new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
FOptionPane.showConfirmDialog( FOptionPane.showConfirmDialog(
"Are you sure you want to delete '" + deck.getName() + "'?", localizer.getMessage("lblConfirmDelete") + " '" + deck.getName() + "'?",
"Delete Deck", "Delete", "Cancel", false, new Callback<Boolean>() { localizer.getMessage("lblDeleteDeck"), localizer.getMessage("lblDelete"), localizer.getMessage("lblCancel"), false, new Callback<Boolean>() {
@Override @Override
public void run(Boolean result) { public void run(Boolean result) {
if (result) { if (result) {
@@ -432,7 +436,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
} }
})); }));
} }
addItem(new FMenuItem("Copy to Clipboard", new FEventHandler() { addItem(new FMenuItem(localizer.getMessage("btnCopyToClipboard"), new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
FDeckViewer.copyDeckToClipboard(deck); FDeckViewer.copyDeckToClipboard(deck);
@@ -538,7 +542,8 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
if (StringUtils.isEmpty(deck.getName())) { if (StringUtils.isEmpty(deck.getName())) {
List<PaperCard> commanders = deck.getCommanders(); //use commander name as default deck name List<PaperCard> commanders = deck.getCommanders(); //use commander name as default deck name
String initialInput = Lang.joinHomogenous(commanders); String initialInput = Lang.joinHomogenous(commanders);
FOptionPane.showInputDialog("Enter name for new deck", initialInput, new Callback<String>() { final Localizer localizer = Localizer.getInstance();
FOptionPane.showInputDialog(localizer.getMessage("lblNameNewDeck"), initialInput, new Callback<String>() {
@Override @Override
public void run(String result) { public void run(String result) {
if (StringUtils.isEmpty(result)) { return; } if (StringUtils.isEmpty(result)) { return; }
@@ -566,7 +571,8 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
super.onClose(canCloseCallback); //can skip prompt if draft saved super.onClose(canCloseCallback); //can skip prompt if draft saved
return; return;
} }
FOptionPane.showOptionDialog("Save changes to current deck?", "", final Localizer localizer = Localizer.getInstance();
FOptionPane.showOptionDialog(localizer.getMessage("lblSaveChangesCurrentDeck"), "",
FOptionPane.QUESTION_ICON, onCloseOptions, new Callback<Integer>() { FOptionPane.QUESTION_ICON, onCloseOptions, new Callback<Integer>() {
@Override @Override
public void run(Integer result) { public void run(Integer result) {
@@ -828,7 +834,8 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
callback.run(max); callback.run(max);
} }
else { else {
GuiChoose.getInteger(cardManager.getSelectedItem() + " - " + verb + " how many?", 1, max, 20, callback); final Localizer localizer = Localizer.getInstance();
GuiChoose.getInteger(cardManager.getSelectedItem() + " - " + verb + " " + localizer.getMessage("lblHowMany"), 1, max, 20, callback);
} }
} }
})); }));
@@ -962,7 +969,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
private boolean initialized, needRefreshWhenShown; private boolean initialized, needRefreshWhenShown;
protected CatalogPage(ItemManagerConfig config) { protected CatalogPage(ItemManagerConfig config) {
this(config, "Catalog", FSkinImage.FOLDER); this(config, Localizer.getInstance().getMessage("lblCatalog"), FSkinImage.FOLDER);
} }
protected CatalogPage(ItemManagerConfig config, String caption0, FImage icon0) { protected CatalogPage(ItemManagerConfig config, String caption0, FImage icon0) {
super(config, caption0, icon0); super(config, caption0, icon0);
@@ -993,13 +1000,14 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
} }
protected String getItemManagerCaption() { protected String getItemManagerCaption() {
final Localizer localizer = Localizer.getInstance();
switch (parentScreen.getEditorType()) { switch (parentScreen.getEditorType()) {
case Archenemy: case Archenemy:
return "Schemes"; return localizer.getMessage("lblSchemes");
case Planechase: case Planechase:
return "Planes"; return localizer.getMessage("lblPlanes");
default: default:
return "Cards"; return localizer.getMessage("lblCards");
} }
} }
@@ -1018,6 +1026,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
public void refresh() { public void refresh() {
Predicate<PaperCard> additionalFilter = null; Predicate<PaperCard> additionalFilter = null;
final EditorType editorType = parentScreen.getEditorType(); final EditorType editorType = parentScreen.getEditorType();
final Localizer localizer = Localizer.getInstance();
switch (editorType) { switch (editorType) {
case Archenemy: case Archenemy:
cardManager.setPool(ItemPool.createFrom(FModel.getMagicDb().getVariantCards().getAllCards(Predicates.compose(CardRulesPredicates.Presets.IS_SCHEME, PaperCard.FN_GET_RULES)), PaperCard.class), true); cardManager.setPool(ItemPool.createFrom(FModel.getMagicDb().getVariantCards().getAllCards(Predicates.compose(CardRulesPredicates.Presets.IS_SCHEME, PaperCard.FN_GET_RULES)), PaperCard.class), true);
@@ -1047,19 +1056,19 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
switch (editorType) { switch (editorType) {
case Commander: case Commander:
additionalFilter = DeckFormat.Commander.isLegalCommanderPredicate(); additionalFilter = DeckFormat.Commander.isLegalCommanderPredicate();
cardManager.setCaption("Commanders"); cardManager.setCaption(localizer.getMessage("lblCommanders"));
break; break;
case Oathbreaker: case Oathbreaker:
additionalFilter = DeckFormat.Oathbreaker.isLegalCommanderPredicate(); additionalFilter = DeckFormat.Oathbreaker.isLegalCommanderPredicate();
cardManager.setCaption("Oathbreakers"); cardManager.setCaption(localizer.getMessage("lblOathbreakers"));
break; break;
case TinyLeaders: case TinyLeaders:
additionalFilter = DeckFormat.TinyLeaders.isLegalCommanderPredicate(); additionalFilter = DeckFormat.TinyLeaders.isLegalCommanderPredicate();
cardManager.setCaption("Commanders"); cardManager.setCaption(localizer.getMessage("lblCommanders"));
break; break;
case Brawl: case Brawl:
additionalFilter = DeckFormat.Brawl.isLegalCommanderPredicate(); additionalFilter = DeckFormat.Brawl.isLegalCommanderPredicate();
cardManager.setCaption("Commanders"); cardManager.setCaption(localizer.getMessage("lblCommanders"));
break; break;
default: default:
// Do nothing // Do nothing
@@ -1083,7 +1092,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
default: default:
// Do nothing // Do nothing
} }
cardManager.setCaption("Cards"); cardManager.setCaption(localizer.getMessage("lblCards"));
} }
// fall through to below // fall through to below
default: default:
@@ -1117,8 +1126,10 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
@Override @Override
protected void buildMenu(final FDropDownMenu menu, final PaperCard card) { protected void buildMenu(final FDropDownMenu menu, final PaperCard card) {
final Localizer localizer = Localizer.getInstance();
if (!needsCommander() && !canOnlyBePartnerCommander(card)) { if (!needsCommander() && !canOnlyBePartnerCommander(card)) {
addItem(menu, "Add", "to " + parentScreen.getMainDeckPage().cardManager.getCaption(), parentScreen.getMainDeckPage().getIcon(), true, true, new Callback<Integer>() { addItem(menu, localizer.getMessage("lblAdd"), localizer.getMessage("lblTo") + " " + parentScreen.getMainDeckPage().cardManager.getCaption(), parentScreen.getMainDeckPage().getIcon(), true, true, new Callback<Integer>() {
@Override @Override
public void run(Integer result) { public void run(Integer result) {
if (result == null || result <= 0) { return; } if (result == null || result <= 0) { return; }
@@ -1130,7 +1141,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
} }
}); });
if (parentScreen.getSideboardPage() != null) { if (parentScreen.getSideboardPage() != null) {
addItem(menu, "Add", "to Sideboard", parentScreen.getSideboardPage().getIcon(), true, true, new Callback<Integer>() { addItem(menu, localizer.getMessage("lblAdd"), localizer.getMessage("lbltosideboard"), parentScreen.getSideboardPage().getIcon(), true, true, new Callback<Integer>() {
@Override @Override
public void run(Integer result) { public void run(Integer result) {
if (result == null || result <= 0) { return; } if (result == null || result <= 0) { return; }
@@ -1150,7 +1161,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
//add option to add or remove card from favorites //add option to add or remove card from favorites
final CardPreferences prefs = CardPreferences.getPrefs(card); final CardPreferences prefs = CardPreferences.getPrefs(card);
if (prefs.getStarCount() == 0) { if (prefs.getStarCount() == 0) {
menu.addItem(new FMenuItem("Add to Favorites", FSkinImage.STAR_FILLED, new FEventHandler() { menu.addItem(new FMenuItem(localizer.getMessage("lblAddFavorites"), FSkinImage.STAR_FILLED, new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
prefs.setStarCount(1); prefs.setStarCount(1);
@@ -1159,7 +1170,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
})); }));
} }
else { else {
menu.addItem(new FMenuItem("Remove from Favorites", FSkinImage.STAR_OUTINE, new FEventHandler() { menu.addItem(new FMenuItem(localizer.getMessage("lblRemoveFavorites"), FSkinImage.STAR_OUTINE, new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
prefs.setStarCount(0); prefs.setStarCount(0);
@@ -1171,7 +1182,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
//if card has more than one art option, add item to change user's preferred art //if card has more than one art option, add item to change user's preferred art
final List<PaperCard> artOptions = FModel.getMagicDb().getCommonCards().getAllCards(card.getName()); final List<PaperCard> artOptions = FModel.getMagicDb().getCommonCards().getAllCards(card.getName());
if (artOptions != null && artOptions.size() > 1) { if (artOptions != null && artOptions.size() > 1) {
menu.addItem(new FMenuItem("Change Preferred Art", FSkinImage.SETTINGS, new FEventHandler() { menu.addItem(new FMenuItem(localizer.getMessage("lblChangePreferredArt"), FSkinImage.SETTINGS, new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
//sort options so current option is on top and selected by default //sort options so current option is on top and selected by default
@@ -1182,7 +1193,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
sortedOptions.add(option); sortedOptions.add(option);
} }
} }
GuiChoose.oneOrNone("Select preferred art for " + card.getName(), sortedOptions, new Callback<PaperCard>() { GuiChoose.oneOrNone(localizer.getMessage("lblSelectPreferredArt") + " " + card.getName(), sortedOptions, new Callback<PaperCard>() {
@Override @Override
public void run(PaperCard result) { public void run(PaperCard result) {
if (result != null) { if (result != null) {
@@ -1203,7 +1214,8 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
@Override @Override
protected void buildDeckMenu(FPopupMenu menu) { protected void buildDeckMenu(FPopupMenu menu) {
if (cardManager.getConfig().getShowUniqueCardsOption()) { if (cardManager.getConfig().getShowUniqueCardsOption()) {
menu.addItem(new FCheckBoxMenuItem("Unique Cards Only", cardManager.getWantUnique(), new FEventHandler() { final Localizer localizer = Localizer.getInstance();
menu.addItem(new FCheckBoxMenuItem(localizer.getMessage("lblUniqueCardsOnly"), cardManager.getWantUnique(), new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
boolean wantUnique = !cardManager.getWantUnique(); boolean wantUnique = !cardManager.getWantUnique();
@@ -1226,37 +1238,39 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
protected DeckSectionPage(DeckSection deckSection0, ItemManagerConfig config) { protected DeckSectionPage(DeckSection deckSection0, ItemManagerConfig config) {
super(config, null, null); super(config, null, null);
final Localizer localizer = Localizer.getInstance();
deckSection = deckSection0; deckSection = deckSection0;
switch (deckSection) { switch (deckSection) {
default: default:
case Main: case Main:
captionPrefix = "Main"; captionPrefix = localizer.getMessage("lblMain");
cardManager.setCaption("Main Deck"); cardManager.setCaption(localizer.getMessage("ttMain"));
icon = MAIN_DECK_ICON; icon = MAIN_DECK_ICON;
break; break;
case Sideboard: case Sideboard:
captionPrefix = "Side"; captionPrefix = localizer.getMessage("lblSide");
cardManager.setCaption("Sideboard"); cardManager.setCaption(localizer.getMessage("lblSideboard"));
icon = SIDEBOARD_ICON; icon = SIDEBOARD_ICON;
break; break;
case Commander: case Commander:
captionPrefix = "Commander"; captionPrefix = localizer.getMessage("lblCommander");
cardManager.setCaption("Commander"); cardManager.setCaption(localizer.getMessage("lblCommander"));
icon = FSkinImage.COMMANDER; icon = FSkinImage.COMMANDER;
break; break;
case Avatar: case Avatar:
captionPrefix = "Avatar"; captionPrefix = localizer.getMessage("lblAvatar");
cardManager.setCaption("Avatar"); cardManager.setCaption(localizer.getMessage("lblAvatar"));
icon = new FTextureRegionImage(FSkin.getAvatars().get(0)); icon = new FTextureRegionImage(FSkin.getAvatars().get(0));
break; break;
case Planes: case Planes:
captionPrefix = "Planes"; captionPrefix = localizer.getMessage("lblPlanes");
cardManager.setCaption("Planes"); cardManager.setCaption(localizer.getMessage("lblPlanes"));
icon = FSkinImage.CHAOS; icon = FSkinImage.CHAOS;
break; break;
case Schemes: case Schemes:
captionPrefix = "Schemes"; captionPrefix = localizer.getMessage("lblSchemes");
cardManager.setCaption("Schemes"); cardManager.setCaption(localizer.getMessage("lblSchemes"));
icon = FSkinImage.POISON; icon = FSkinImage.POISON;
break; break;
} }
@@ -1317,10 +1331,11 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
@Override @Override
protected void buildMenu(final FDropDownMenu menu, final PaperCard card) { protected void buildMenu(final FDropDownMenu menu, final PaperCard card) {
final Localizer localizer = Localizer.getInstance();
switch (deckSection) { switch (deckSection) {
default: default:
case Main: case Main:
addItem(menu, "Add", null, FSkinImage.PLUS, true, false, new Callback<Integer>() { addItem(menu, localizer.getMessage("lblAdd"), null, FSkinImage.PLUS, true, false, new Callback<Integer>() {
@Override @Override
public void run(Integer result) { public void run(Integer result) {
if (result == null || result <= 0) { return; } if (result == null || result <= 0) { return; }
@@ -1335,7 +1350,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
} }
}); });
if (!parentScreen.isLimitedEditor()) { if (!parentScreen.isLimitedEditor()) {
addItem(menu, "Remove", null, FSkinImage.MINUS, false, false, new Callback<Integer>() { addItem(menu, localizer.getMessage("lblRemove"), null, FSkinImage.MINUS, false, false, new Callback<Integer>() {
@Override @Override
public void run(Integer result) { public void run(Integer result) {
if (result == null || result <= 0) { return; } if (result == null || result <= 0) { return; }
@@ -1348,7 +1363,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
}); });
} }
if (parentScreen.getSideboardPage() != null) { if (parentScreen.getSideboardPage() != null) {
addItem(menu, "Move", "to Sideboard", parentScreen.getSideboardPage().getIcon(), false, false, new Callback<Integer>() { addItem(menu, localizer.getMessage("lblMove"), localizer.getMessage("lbltosideboard"), parentScreen.getSideboardPage().getIcon(), false, false, new Callback<Integer>() {
@Override @Override
public void run(Integer result) { public void run(Integer result) {
if (result == null || result <= 0) { return; } if (result == null || result <= 0) { return; }
@@ -1361,7 +1376,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
addCommanderItems(menu, card, false, false); addCommanderItems(menu, card, false, false);
break; break;
case Sideboard: case Sideboard:
addItem(menu, "Add", null, FSkinImage.PLUS, true, false, new Callback<Integer>() { addItem(menu, localizer.getMessage("lblAdd"), null, FSkinImage.PLUS, true, false, new Callback<Integer>() {
@Override @Override
public void run(Integer result) { public void run(Integer result) {
if (result == null || result <= 0) { return; } if (result == null || result <= 0) { return; }
@@ -1376,7 +1391,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
} }
}); });
if (!parentScreen.isLimitedEditor()) { if (!parentScreen.isLimitedEditor()) {
addItem(menu, "Remove", null, FSkinImage.MINUS, false, false, new Callback<Integer>() { addItem(menu, localizer.getMessage("lblRemove"), null, FSkinImage.MINUS, false, false, new Callback<Integer>() {
@Override @Override
public void run(Integer result) { public void run(Integer result) {
if (result == null || result <= 0) { return; } if (result == null || result <= 0) { return; }
@@ -1388,7 +1403,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
} }
}); });
} }
addItem(menu, "Move", "to Main Deck", parentScreen.getMainDeckPage().getIcon(), false, false, new Callback<Integer>() { addItem(menu, localizer.getMessage("lblMove"), localizer.getMessage("lblToMainDeck"), parentScreen.getMainDeckPage().getIcon(), false, false, new Callback<Integer>() {
@Override @Override
public void run(Integer result) { public void run(Integer result) {
if (result == null || result <= 0) { return; } if (result == null || result <= 0) { return; }
@@ -1401,7 +1416,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
break; break;
case Commander: case Commander:
if (parentScreen.editorType != EditorType.PlanarConquest || isPartnerCommander(card)) { if (parentScreen.editorType != EditorType.PlanarConquest || isPartnerCommander(card)) {
addItem(menu, "Remove", null, FSkinImage.MINUS, false, false, new Callback<Integer>() { addItem(menu, localizer.getMessage("lblRemove"), null, FSkinImage.MINUS, false, false, new Callback<Integer>() {
@Override @Override
public void run(Integer result) { public void run(Integer result) {
if (result == null || result <= 0) { if (result == null || result <= 0) {
@@ -1416,7 +1431,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
} }
break; break;
case Avatar: case Avatar:
addItem(menu, "Remove", null, FSkinImage.MINUS, false, false, new Callback<Integer>() { addItem(menu, localizer.getMessage("lblRemove"), null, FSkinImage.MINUS, false, false, new Callback<Integer>() {
@Override @Override
public void run(Integer result) { public void run(Integer result) {
if (result == null || result <= 0) { return; } if (result == null || result <= 0) { return; }
@@ -1434,7 +1449,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
addCard(card, result); addCard(card, result);
} }
}); });
addItem(menu, "Remove", null, FSkinImage.MINUS, false, false, new Callback<Integer>() { addItem(menu, localizer.getMessage("lblRemove"), null, FSkinImage.MINUS, false, false, new Callback<Integer>() {
@Override @Override
public void run(Integer result) { public void run(Integer result) {
if (result == null || result <= 0) { return; } if (result == null || result <= 0) { return; }
@@ -1444,7 +1459,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
}); });
break; break;
case Planes: case Planes:
addItem(menu, "Add", null, FSkinImage.PLUS, true, false, new Callback<Integer>() { addItem(menu, localizer.getMessage("lblAdd"), null, FSkinImage.PLUS, true, false, new Callback<Integer>() {
@Override @Override
public void run(Integer result) { public void run(Integer result) {
if (result == null || result <= 0) { return; } if (result == null || result <= 0) { return; }
@@ -1452,7 +1467,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
addCard(card, result); addCard(card, result);
} }
}); });
addItem(menu, "Remove", null, FSkinImage.MINUS, false, false, new Callback<Integer>() { addItem(menu, localizer.getMessage("lblRemove"), null, FSkinImage.MINUS, false, false, new Callback<Integer>() {
@Override @Override
public void run(Integer result) { public void run(Integer result) {
if (result == null || result <= 0) { return; } if (result == null || result <= 0) { return; }
@@ -1513,14 +1528,15 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
@Override @Override
protected void buildMenu(final FDropDownMenu menu, final PaperCard card) { protected void buildMenu(final FDropDownMenu menu, final PaperCard card) {
addItem(menu, "Add", "to Main Deck", parentScreen.getMainDeckPage().getIcon(), true, true, new Callback<Integer>() { final Localizer localizer = Localizer.getInstance();
addItem(menu, localizer.getMessage("lblAdd"), localizer.getMessage("lblToMainDeck"), parentScreen.getMainDeckPage().getIcon(), true, true, new Callback<Integer>() {
@Override @Override
public void run(Integer result) { //ignore quantity public void run(Integer result) { //ignore quantity
parentScreen.getMainDeckPage().addCard(card); parentScreen.getMainDeckPage().addCard(card);
afterCardPicked(card); afterCardPicked(card);
} }
}); });
addItem(menu, "Add", "to Sideboard", parentScreen.getSideboardPage().getIcon(), true, true, new Callback<Integer>() { addItem(menu, localizer.getMessage("lblAdd"), localizer.getMessage("lbltosideboard"), parentScreen.getSideboardPage().getIcon(), true, true, new Callback<Integer>() {
@Override @Override
public void run(Integer result) { //ignore quantity public void run(Integer result) { //ignore quantity
parentScreen.getSideboardPage().addCard(card); parentScreen.getSideboardPage().addCard(card);
@@ -1630,7 +1646,8 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
if (editor != null) { if (editor != null) {
String name = this.getModelName(); String name = this.getModelName();
if (name.isEmpty()) { if (name.isEmpty()) {
name = "[New Deck]"; final Localizer localizer = Localizer.getInstance();
name = "[" + localizer.getMessage("lblNewDeck") + "]";
} }
if (!saved) { if (!saved) {
name = "*" + name; name = "*" + name;

28
forge-gui-mobile/src/forge/screens/match/MatchScreen.java
View File

@@ -3,6 +3,7 @@ package forge.screens.match;
import java.util.*; import java.util.*;
import java.util.Map.Entry; import java.util.Map.Entry;
import forge.util.Localizer;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.Input.Keys;
@@ -136,17 +137,18 @@ public class MatchScreen extends FScreen {
stack.setDropDownContainer(this); stack.setDropDownContainer(this);
FMenuBar menuBar = (FMenuBar)getHeader(); FMenuBar menuBar = (FMenuBar)getHeader();
final Localizer localizer = Localizer.getInstance();
if (topPlayerPrompt == null) { if (topPlayerPrompt == null) {
menuBar.addTab("Game", gameMenu); menuBar.addTab(localizer.getMessage("lblGame"), gameMenu);
menuBar.addTab("Players (" + playerPanels.size() + ")", players); menuBar.addTab(localizer.getMessage("lblPlayers") + " (" + playerPanels.size() + ")", players);
menuBar.addTab("Log", log); menuBar.addTab(localizer.getMessage("lblLog"), log);
menuBar.addTab("Dev", devMenu); menuBar.addTab(localizer.getMessage("lblDev"), devMenu);
menuBar.addTab("Stack (0)", stack); menuBar.addTab( localizer.getMessage("lblStack") + " (0)", stack);
} }
else { else {
menuBar.addTab("\u2022 \u2022 \u2022", new PlayerSpecificMenu(true)); menuBar.addTab("\u2022 \u2022 \u2022", new PlayerSpecificMenu(true));
stack.setRotate90(true); stack.setRotate90(true);
menuBar.addTab("Stack (0)", stack); menuBar.addTab(localizer.getMessage("Stack") + " (0)", stack);
menuBar.addTab("\u2022 \u2022 \u2022", new PlayerSpecificMenu(false)); menuBar.addTab("\u2022 \u2022 \u2022", new PlayerSpecificMenu(false));
//create fake menu tabs for other drop downs so they can be positioned as needed //create fake menu tabs for other drop downs so they can be positioned as needed
@@ -223,16 +225,18 @@ public class MatchScreen extends FScreen {
@Override @Override
protected void buildMenu() { protected void buildMenu() {
final Localizer localizer = Localizer.getInstance();
if (isTopHumanPlayerActive() == getRotate180()) { if (isTopHumanPlayerActive() == getRotate180()) {
addItem(new MenuItem("Game", gameMenu)); addItem(new MenuItem(localizer.getMessage("lblGame"), gameMenu));
addItem(new MenuItem("Players (" + playerPanels.size() + ")", players)); addItem(new MenuItem(localizer.getMessage("lblPlayers") + " (" + playerPanels.size() + ")", players));
addItem(new MenuItem("Log", log)); addItem(new MenuItem(localizer.getMessage("lblLog"), log));
if (ForgePreferences.DEV_MODE) { if (ForgePreferences.DEV_MODE) {
addItem(new MenuItem("Dev", devMenu)); addItem(new MenuItem(localizer.getMessage("lblDev"), devMenu));
} }
} }
else { //TODO: Support using menu when player doesn't have priority else { //TODO: Support using menu when player doesn't have priority
FMenuItem item = new FMenuItem("Must wait for priority...", null); FMenuItem item = new FMenuItem(localizer.getMessage("lblMustWaitPriority"), null);
item.setEnabled(false); item.setEnabled(false);
addItem(item); addItem(item);
} }
@@ -665,7 +669,7 @@ public class MatchScreen extends FScreen {
private boolean hasActivePlane(){ private boolean hasActivePlane(){
if(MatchController.instance.getGameView() != null) if(MatchController.instance.getGameView() != null)
if(MatchController.instance.getGameView().getPlanarPlayer() != null) { if(MatchController.instance.getGameView().getPlanarPlayer() != null) {
return MatchController.instance.getGameView().getPlanarPlayer().getCurrentPlaneName() != ""; return !MatchController.instance.getGameView().getPlanarPlayer().getCurrentPlaneName().equals("");
} }
return false; return false;
} }

33
forge-gui/res/languages/de-DE.properties
View File

@@ -937,3 +937,36 @@ nlShowMatchBackground=Show match background image on battlefield, otherwise back
nlTheme=Sets the theme that determines how display components are skinned. nlTheme=Sets the theme that determines how display components are skinned.
nlVibrateAfterLongPress=Enable quick vibration to signify a long press, such as for card zooming. nlVibrateAfterLongPress=Enable quick vibration to signify a long press, such as for card zooming.
nlVibrateWhenLosingLife=Enable vibration when your player loses life or takes damage during a game. nlVibrateWhenLosingLife=Enable vibration when your player loses life or takes damage during a game.
#MatchScreen.java
lblPlayers=Players
lblLog=Log
lblDev=Dev
lblStack=Stack
lblMustWaitPriority=Must wait for priority...
#FDeckEditor.java
lblImportFromClipboard=Import from Clipboard
lblSaveAs=Save As...
lblNameNewCopyDeck=Enter name for new copy of deck
lblRenameDeck=Rename Deck
lblNewNameDeck=Enter new name for deck
lblDeleteDeck=Delete Deck
lblDelete=Delete
lblConfirmDelete=Are you sure you want to delete
lblNameNewDeck=Enter name for new deck
lblSaveChangesCurrentDeck=Save changes to current deck?
lblAddFavorites=Add to Favorites
lblRemoveFavorites=Remove from Favorites
lblChangePreferredArt=Change Preferred Art
lblSelectPreferredArt=Select preferred art for
lblTo=to
lblAvatar=Avatar
lblCards=Cards
lblPlanes=Planes
lblSchemes=Schemes
lblToMainDeck=to Main Deck
lblHowMany=how many?
lblInventory=Inventory
lblCollection=Collection
lblCatalog=Catalog
lblCommanders=Commanders
lblOathbreakers=Oathbreakers

33
forge-gui/res/languages/en-US.properties
View File

@@ -937,3 +937,36 @@ nlShowMatchBackground=Show match background image on battlefield, otherwise back
nlTheme=Sets the theme that determines how display components are skinned. nlTheme=Sets the theme that determines how display components are skinned.
nlVibrateAfterLongPress=Enable quick vibration to signify a long press, such as for card zooming. nlVibrateAfterLongPress=Enable quick vibration to signify a long press, such as for card zooming.
nlVibrateWhenLosingLife=Enable vibration when your player loses life or takes damage during a game. nlVibrateWhenLosingLife=Enable vibration when your player loses life or takes damage during a game.
#MatchScreen.java
lblPlayers=Players
lblLog=Log
lblDev=Dev
lblStack=Stack
lblMustWaitPriority=Must wait for priority...
#FDeckEditor.java
lblImportFromClipboard=Import from Clipboard
lblSaveAs=Save As...
lblNameNewCopyDeck=Enter name for new copy of deck
lblRenameDeck=Rename Deck
lblNewNameDeck=Enter new name for deck
lblDeleteDeck=Delete Deck
lblDelete=Delete
lblConfirmDelete=Are you sure you want to delete
lblNameNewDeck=Enter name for new deck
lblSaveChangesCurrentDeck=Save changes to current deck?
lblAddFavorites=Add to Favorites
lblRemoveFavorites=Remove from Favorites
lblChangePreferredArt=Change Preferred Art
lblSelectPreferredArt=Select preferred art for
lblTo=to
lblAvatar=Avatar
lblCards=Cards
lblPlanes=Planes
lblSchemes=Schemes
lblToMainDeck=to Main Deck
lblHowMany=how many?
lblInventory=Inventory
lblCollection=Collection
lblCatalog=Catalog
lblCommanders=Commanders
lblOathbreakers=Oathbreakers

47
forge-gui/res/languages/es-ES.properties
View File

@@ -222,7 +222,7 @@ TresetMatchScreenLayout=Restablecer diseño de pantalla de Juego
OKresetMatchScreenLayout=El diseño de la pantalla de Juego se ha restablecido. OKresetMatchScreenLayout=El diseño de la pantalla de Juego se ha restablecido.
#EMenuGroup.java #EMenuGroup.java
lblSanctionedFormats=Formatos Oficiales lblSanctionedFormats=Formatos Oficiales
lblOnlineMultiplayer=Multijugador en linea lblOnlineMultiplayer=Multijugador en línea
lblQuestMode=Modo Aventura lblQuestMode=Modo Aventura
lblPuzzleMode=Modo Puzzle lblPuzzleMode=Modo Puzzle
lblGauntlets=Desafíos lblGauntlets=Desafíos
@@ -230,8 +230,8 @@ lblGameSettings=Configuración
#VLobby.java #VLobby.java
lblHeaderConstructedMode=Formato Oficial: Construido lblHeaderConstructedMode=Formato Oficial: Construido
lblGetNewRandomName=Obtener nuevo nombre aleatorio lblGetNewRandomName=Obtener nuevo nombre aleatorio
lbltypeofName=Qué tipo de nombre quieres generar? lbltypeofName=¿Qué tipo de nombre quieres generar?
lblconfirmName=Quieres usar el nombre de %n, o probar de nuevo? lblconfirmName=¿Quieres usar el nombre de %n, o probar de nuevo?
lblUseThisName=Usar este nombre lblUseThisName=Usar este nombre
lblTryAgain=Probar de nuevo lblTryAgain=Probar de nuevo
lblAddAPlayer=Añadir Jugador lblAddAPlayer=Añadir Jugador
@@ -315,12 +315,12 @@ lblName=Nombre
lblTeam=Equipo lblTeam=Equipo
#InputConfirmMulligan.java #InputConfirmMulligan.java
lblKeep=Mantener lblKeep=Mantener
lblYouAreGoingFirst=tu vas primero! lblYouAreGoingFirst=tú vas primero!
lblIsGoingFirst=va primero lblIsGoingFirst=va primero
lblYouAreGoing=vas lblYouAreGoing=vas
lblMulligan=Mulligan lblMulligan=Mulligan
lblDoYouWantToKeepYourHand=¿Quieres quedarte tu mano? lblDoYouWantToKeepYourHand=¿Quieres quedarte tu mano?
lblReturnForLondon=Return %d card(s) to the bottom of your library lblReturnForLondon=Devuelve %d carta(s) en la parte inferior de tu biblioteca
lblOk=Ok lblOk=Ok
lblReset=Reset lblReset=Reset
lblAuto=Auto lblAuto=Auto
@@ -545,7 +545,7 @@ lblRandomModernColorDecks=Mazos Standard Aleatorio por Color
lblRandomThemeDecks=Mazos Aleatorios Temáticos lblRandomThemeDecks=Mazos Aleatorios Temáticos
lblRandomDecks=Mazos Aleatorios lblRandomDecks=Mazos Aleatorios
lblNetDecks=Mazos en línea lblNetDecks=Mazos en línea
lblNetCommanderDecks=Mazos Commander en linea lblNetCommanderDecks=Mazos Commander en línea
#VSubmenuPuzzleSolve.java #VSubmenuPuzzleSolve.java
lblSolve=Resolver lblSolve=Resolver
lblPuzzleModeSolve=Modo Puzzle: Resolver lblPuzzleModeSolve=Modo Puzzle: Resolver
@@ -886,7 +886,7 @@ ttType=Type
#HomeScreen.java #HomeScreen.java
lblNewGame=Nueva partida lblNewGame=Nueva partida
lblLoadGame=Cargar partida lblLoadGame=Cargar partida
lblPlayOnline=Jugar en linea lblPlayOnline=Jugar online
lblSettings=Configuración lblSettings=Configuración
#SettingsPage.java #SettingsPage.java
lblAutomaticBugReports=Informes automáticos de errores lblAutomaticBugReports=Informes automáticos de errores
@@ -937,3 +937,36 @@ nlShowMatchBackground=Muestra la imagen de fondo de la partida en el campo de ba
nlTheme=Establece el tema que determina el aspecto global del juego. nlTheme=Establece el tema que determina el aspecto global del juego.
nlVibrateAfterLongPress=Habilita la vibración rápida cuando se realice una pulsación prolongada, como p.ej. al realizar zoom de la carta. nlVibrateAfterLongPress=Habilita la vibración rápida cuando se realice una pulsación prolongada, como p.ej. al realizar zoom de la carta.
nlVibrateWhenLosingLife=Habilita la vibración cuando tu jugador pierde vida o sufre daños durante un juego. nlVibrateWhenLosingLife=Habilita la vibración cuando tu jugador pierde vida o sufre daños durante un juego.
#MatchScreen.java
lblPlayers=Jugadores
lblLog=Log
lblDev=Dev
lblStack=Pila
lblMustWaitPriority=Debes esperar debido a la prioridad...
#FDeckEditor.java
lblImportFromClipboard=Importar del portapapeles
lblSaveAs=Guardar como...
lblNameNewCopyDeck=Introduce un nombre para la nueva copia del mazo
lblRenameDeck=Renombrar Mazo
lblNewNameDeck=Introduce un nuevo nombre para el mazo
lblDeleteDeck=Borrar Mazo
lblDelete=Borrar
lblConfirmDelete=¿Estás seguro que quieres borrar
lblNameNewDeck=Introduce un nombre para el nuevo mazo
lblSaveChangesCurrentDeck=¿Guardar los cambios al mazo actual?
lblAddFavorites=Añadir a Favoritos
lblRemoveFavorites=Eliminar de Favoritos
lblChangePreferredArt=Cambiar Arte Preferido
lblSelectPreferredArt=Selecciona el arte preferido para
lblTo=a
lblAvatar=Avatar
lblCards=Cartas
lblPlanes=Planos
lblSchemes=Schemes
lblToMainDeck=al Mazo Principal
lblHowMany=¿cuántos?
lblInventory=Inventario
lblCollection=Colección
lblCatalog=Catálogo
lblCommanders=Commanders
lblOathbreakers=Oathbreakers

33
forge-gui/res/languages/zh-CN.properties
View File

@@ -937,3 +937,36 @@ nlShowMatchBackground=在战场显示背景图片，否则显示背景纹理。
nlTheme=设置显示的组件使用的外观主题。 nlTheme=设置显示的组件使用的外观主题。
nlVibrateAfterLongPress=启用长按触发震动，例如长按缩放卡牌图片。 nlVibrateAfterLongPress=启用长按触发震动，例如长按缩放卡牌图片。
nlVibrateWhenLosingLife=启用当玩家在游戏中失去生命或收到伤害时震动。 nlVibrateWhenLosingLife=启用当玩家在游戏中失去生命或收到伤害时震动。
#MatchScreen.java
lblPlayers=Players
lblLog=Log
lblDev=Dev
lblStack=Stack
lblMustWaitPriority=Must wait for priority...
#FDeckEditor.java
lblImportFromClipboard=Import from Clipboard
lblSaveAs=Save As...
lblNameNewCopyDeck=Enter name for new copy of deck
lblRenameDeck=Rename Deck
lblNewNameDeck=Enter new name for deck
lblDeleteDeck=Delete Deck
lblDelete=Delete
lblConfirmDelete=Are you sure you want to delete
lblNameNewDeck=Enter name for new deck
lblSaveChangesCurrentDeck=Save changes to current deck?
lblAddFavorites=Add to Favorites
lblRemoveFavorites=Remove from Favorites
lblChangePreferredArt=Change Preferred Art
lblSelectPreferredArt=Select preferred art for
lblTo=to
lblAvatar=Avatar
lblCards=Cards
lblPlanes=Planes
lblSchemes=Schemes
lblToMainDeck=to Main Deck
lblHowMany=how many?
lblInventory=Inventory
lblCollection=Collection
lblCatalog=Catalog
lblCommanders=Commanders
lblOathbreakers=Oathbreakers