diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/TextSearchFilter.java b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/TextSearchFilter.java index 1bee48d047e..e0c24b9eda7 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/TextSearchFilter.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/TextSearchFilter.java @@ -8,6 +8,7 @@ import forge.itemmanager.ItemManager; import forge.itemmanager.SFilterUtil; import forge.toolbox.FTextField; import forge.toolbox.LayoutHelper; +import forge.util.Localizer; import javax.swing.*; @@ -60,7 +61,7 @@ public class TextSearchFilter extends ItemFilter { @Override protected void buildWidget(JPanel widget) { - txtSearch = new FTextField.Builder().ghostText("Search").build(); + txtSearch = new FTextField.Builder().ghostText(Localizer.getInstance().getMessage("lblSearch")).build(); widget.add(txtSearch); txtSearch.addKeyListener(new KeyAdapter() { diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java index 16e2eca982d..c7a4bffc26f 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java @@ -850,7 +850,7 @@ public class ImageView extends ItemView { @Override protected String getCaption() { - return "Image View"; + return Localizer.getInstance().getMessage("lblImageView"); } @Override diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemListView.java b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemListView.java index 50b354a2357..8f56579a5f0 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemListView.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemListView.java @@ -85,6 +85,7 @@ import forge.toolbox.FSkin.SkinFont; import forge.toolbox.FSkin.SkinImage; import forge.toolbox.FSkin.SkinnedTable; import forge.toolbox.FSkin.SkinnedTableHeader; +import forge.util.Localizer; /** @@ -255,7 +256,7 @@ public final class ItemListView extends ItemView { @Override protected String getCaption() { - return "List View"; + return Localizer.getInstance().getMessage("lblListView"); } @Override diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/online/OnlineMenu.java b/forge-gui-desktop/src/main/java/forge/screens/home/online/OnlineMenu.java index 31b460a8c73..b35cafa2056 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/online/OnlineMenu.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/online/OnlineMenu.java @@ -1,6 +1,7 @@ package forge.screens.home.online; import forge.gui.FNetOverlay; +import forge.util.Localizer; import javax.swing.*; import java.awt.event.ActionEvent; @@ -13,7 +14,7 @@ import java.awt.event.KeyEvent; public final class OnlineMenu { public static JMenu getMenu() { - JMenu menu = new JMenu("Online"); + JMenu menu = new JMenu(Localizer.getInstance().getMessage("lblOnline")); menu.setMnemonic(KeyEvent.VK_O); menu.add(getMenuItem_ConnectToServer()); menu.add(new JSeparator()); @@ -24,7 +25,7 @@ public final class OnlineMenu { public static final JCheckBoxMenuItem chatItem; static { - chatItem = new JCheckBoxMenuItem("Show Chat Panel"); + chatItem = new JCheckBoxMenuItem(Localizer.getInstance().getMessage("lblShowChatPanel")); chatItem.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -39,7 +40,7 @@ public final class OnlineMenu { } private static JMenuItem getMenuItem_ConnectToServer() { - JMenuItem menuItem = new JMenuItem("Connect to Server"); + JMenuItem menuItem = new JMenuItem(Localizer.getInstance().getMessage("lblConnectToServer")); menuItem.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/menus/CardOverlaysMenu.java b/forge-gui-desktop/src/main/java/forge/screens/match/menus/CardOverlaysMenu.java index 67c4dd9dcc8..6fdd326e220 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/menus/CardOverlaysMenu.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/menus/CardOverlaysMenu.java @@ -5,6 +5,7 @@ import forge.model.FModel; import forge.properties.ForgePreferences; import forge.properties.ForgePreferences.FPref; import forge.screens.match.CMatchUI; +import forge.util.Localizer; import javax.swing.*; @@ -23,14 +24,14 @@ public final class CardOverlaysMenu { private static boolean showOverlays = prefs.getPrefBoolean(FPref.UI_SHOW_CARD_OVERLAYS); public JMenu getMenu() { - JMenu menu = new JMenu("Card Overlays"); + JMenu menu = new JMenu(Localizer.getInstance().getMessage("lblCardOverlays")); menu.add(getMenuItem_ShowOverlays()); menu.addSeparator(); - menu.add(getMenuItem_CardOverlay("Card Name", FPref.UI_OVERLAY_CARD_NAME)); - menu.add(getMenuItem_CardOverlay("Mana Cost", FPref.UI_OVERLAY_CARD_MANA_COST)); - menu.add(getMenuItem_CardOverlay("Power/Toughness", FPref.UI_OVERLAY_CARD_POWER)); - menu.add(getMenuItem_CardOverlay("Card Id", FPref.UI_OVERLAY_CARD_ID)); - menu.add(getMenuItem_CardOverlay("Ability Icon", FPref.UI_OVERLAY_ABILITY_ICONS)); + menu.add(getMenuItem_CardOverlay(Localizer.getInstance().getMessage("lblCardName"), FPref.UI_OVERLAY_CARD_NAME)); + menu.add(getMenuItem_CardOverlay(Localizer.getInstance().getMessage("lblManaCost"), FPref.UI_OVERLAY_CARD_MANA_COST)); + menu.add(getMenuItem_CardOverlay(Localizer.getInstance().getMessage("lblPowerOrToughness"), FPref.UI_OVERLAY_CARD_POWER)); + menu.add(getMenuItem_CardOverlay(Localizer.getInstance().getMessage("lblCardID"), FPref.UI_OVERLAY_CARD_ID)); + menu.add(getMenuItem_CardOverlay(Localizer.getInstance().getMessage("lblAbilityIcon"), FPref.UI_OVERLAY_ABILITY_ICONS)); return menu; } @@ -43,7 +44,7 @@ public final class CardOverlaysMenu { } private JMenuItem getMenuItem_ShowOverlays() { - JCheckBoxMenuItem menu = new JCheckBoxMenuItem("Show"); + JCheckBoxMenuItem menu = new JCheckBoxMenuItem(Localizer.getInstance().getMessage("lblShow")); menu.setAccelerator(MenuUtil.getAcceleratorKey(KeyEvent.VK_O)); menu.setState(prefs.getPrefBoolean(FPref.UI_SHOW_CARD_OVERLAYS)); menu.addActionListener(getShowOverlaysAction()); diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/views/VField.java b/forge-gui-desktop/src/main/java/forge/screens/match/views/VField.java index 8df4d0a924b..c00993e0474 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/views/VField.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/views/VField.java @@ -46,6 +46,7 @@ import forge.toolbox.FSkin.SkinnedPanel; import forge.toolbox.special.PhaseIndicator; import forge.toolbox.special.PlayerDetailsPanel; import forge.view.arcane.PlayArea; +import forge.util.Localizer; /** * Assembles Swing components of a player field instance. @@ -60,7 +61,7 @@ public class VField implements IVDoc { private final CField control; private DragCell parentCell; private final EDocID docID; - private final DragTab tab = new DragTab("Field"); + private final DragTab tab = new DragTab(Localizer.getInstance().getMessage("lblField")); // Other fields private final PlayerView player; @@ -96,8 +97,8 @@ public class VField implements IVDoc { this.docID = id0; this.player = p; - if (p != null) { tab.setText(p.getName() + " Field"); } - else { tab.setText("NO PLAYER FOR " + docID.toString()); } + if (p != null) { tab.setText(Localizer.getInstance().getMessage("lblPlayField", p.getName())); } + else { tab.setText(Localizer.getInstance().getMessage("lblNoPlayerForEDocID", docID.toString())); } detailsPanel = new PlayerDetailsPanel(player); diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/views/VHand.java b/forge-gui-desktop/src/main/java/forge/screens/match/views/VHand.java index 496c0c0fe9e..54121ed7bb0 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/views/VHand.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/views/VHand.java @@ -29,6 +29,7 @@ import forge.screens.match.CMatchUI; import forge.screens.match.controllers.CHand; import forge.toolbox.FScrollPane; import forge.view.arcane.HandArea; +import forge.util.Localizer; /** * Assembles Swing components of hand area. @@ -40,7 +41,7 @@ public class VHand implements IVDoc { private final CHand control; private DragCell parentCell; private final EDocID docID; - private final DragTab tab = new DragTab("Your Hand"); + private final DragTab tab = new DragTab(Localizer.getInstance().getMessage("lblYourHand")); // Top-level containers private final FScrollPane scroller = new FScrollPane(false); @@ -59,9 +60,9 @@ public class VHand implements IVDoc { id0.setDoc(this); if (p == null) { - tab.setText("NO PLAYER Hand"); + tab.setText("lblNoPlayerHand"); } else { - tab.setText(p.getName() + " Hand"); + tab.setText(Localizer.getInstance().getMessage("lblPlayerHand", p.getName())); } scroller.setViewportView(VHand.this.hand); diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/special/PlayerDetailsPanel.java b/forge-gui-desktop/src/main/java/forge/toolbox/special/PlayerDetailsPanel.java index 4a37d331223..396e8ae8bd1 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/special/PlayerDetailsPanel.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/special/PlayerDetailsPanel.java @@ -10,6 +10,7 @@ import forge.toolbox.FSkin; import forge.toolbox.FSkin.SkinFont; import forge.toolbox.FSkin.SkinnedPanel; import forge.trackable.TrackableProperty; +import forge.util.Localizer; import net.miginfocom.swing.MigLayout; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; @@ -26,23 +27,23 @@ public class PlayerDetailsPanel extends JPanel { private final PlayerView player; // Info labels - private final DetailLabel lblHand = new DetailLabel(FSkinProp.IMG_ZONE_HAND, "Hand (%s/%s)"); - private final DetailLabel lblGraveyard = new DetailLabel(FSkinProp.IMG_ZONE_GRAVEYARD, "Graveyard (%s) Types[%s]"); - private final DetailLabel lblLibrary = new DetailLabel(FSkinProp.IMG_ZONE_LIBRARY, "Library (%s)"); - private final DetailLabel lblExile = new DetailLabel(FSkinProp.IMG_ZONE_EXILE, "Exile (%s)"); - private final DetailLabel lblFlashback = new DetailLabel(FSkinProp.IMG_ZONE_FLASHBACK, "Flashback cards (%s)"); - private final DetailLabel lblCommand = new DetailLabel(FSkinProp.IMG_PLANESWALKER, "Command zone (%s)"); + private final DetailLabel lblHand = new DetailLabel(FSkinProp.IMG_ZONE_HAND, Localizer.getInstance().getMessage("lblHandNOfMax", "%s", "%s")); + private final DetailLabel lblGraveyard = new DetailLabel(FSkinProp.IMG_ZONE_GRAVEYARD, Localizer.getInstance().getMessage("lblGraveyardNCardsNTypes", "%s", "%s")); + private final DetailLabel lblLibrary = new DetailLabel(FSkinProp.IMG_ZONE_LIBRARY, Localizer.getInstance().getMessage("lblLibraryNCards", "%s")); + private final DetailLabel lblExile = new DetailLabel(FSkinProp.IMG_ZONE_EXILE, Localizer.getInstance().getMessage("lblExileNCards", "%s")); + private final DetailLabel lblFlashback = new DetailLabel(FSkinProp.IMG_ZONE_FLASHBACK, Localizer.getInstance().getMessage("lblFlashbackNCards", "%s")); + private final DetailLabel lblCommand = new DetailLabel(FSkinProp.IMG_PLANESWALKER, Localizer.getInstance().getMessage("lblCommandZoneNCards", "%s")); private final List> manaLabels = new ArrayList<>(); public PlayerDetailsPanel(final PlayerView player0) { player = player0; - manaLabels.add(Pair.of(new DetailLabel(FSkinProp.IMG_MANA_W, "White mana (%s)"), (byte)ManaAtom.WHITE)); - manaLabels.add(Pair.of(new DetailLabel(FSkinProp.IMG_MANA_U, "Blue mana (%s)"), (byte)ManaAtom.BLUE)); - manaLabels.add(Pair.of(new DetailLabel(FSkinProp.IMG_MANA_B, "Black mana (%s)"), (byte)ManaAtom.BLACK)); - manaLabels.add(Pair.of(new DetailLabel(FSkinProp.IMG_MANA_R, "Red mana (%s)"), (byte)ManaAtom.RED)); - manaLabels.add(Pair.of(new DetailLabel(FSkinProp.IMG_MANA_G, "Green mana (%s)"), (byte)ManaAtom.GREEN)); - manaLabels.add(Pair.of(new DetailLabel(FSkinProp.IMG_MANA_COLORLESS, "Colorless mana (%s)"), (byte)ManaAtom.COLORLESS)); + manaLabels.add(Pair.of(new DetailLabel(FSkinProp.IMG_MANA_W, Localizer.getInstance().getMessage("lblWhiteManaOfN", "%s")), (byte)ManaAtom.WHITE)); + manaLabels.add(Pair.of(new DetailLabel(FSkinProp.IMG_MANA_U, Localizer.getInstance().getMessage("lblBlueManaOfN", "%s")), (byte)ManaAtom.BLUE)); + manaLabels.add(Pair.of(new DetailLabel(FSkinProp.IMG_MANA_B, Localizer.getInstance().getMessage("lblBlackManaOfN", "%s")), (byte)ManaAtom.BLACK)); + manaLabels.add(Pair.of(new DetailLabel(FSkinProp.IMG_MANA_R, Localizer.getInstance().getMessage("lblRedManaOfN", "%s")), (byte)ManaAtom.RED)); + manaLabels.add(Pair.of(new DetailLabel(FSkinProp.IMG_MANA_G, Localizer.getInstance().getMessage("lblGreenManaOfN", "%s")), (byte)ManaAtom.GREEN)); + manaLabels.add(Pair.of(new DetailLabel(FSkinProp.IMG_MANA_COLORLESS, Localizer.getInstance().getMessage("lblColorlessManaOfN", "%s")), (byte)ManaAtom.COLORLESS)); setOpaque(false); setLayout(new MigLayout("insets 0, gap 0, wrap"));