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

merge lblOk and lblOK (#4040)

Browse Source
This commit is contained in:
Northmoc
2023-10-30 14:50:28 -04:00
committed by GitHub
parent 68b5cca38e
commit 77725b6e6d
25 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java
View File

@@ -69,7 +69,7 @@ public class FDeckChooser extends JPanel implements IDecksComboBoxListener {
final Dimension parentSize = JOptionPane.getRootFrame().getSize(); final Dimension parentSize = JOptionPane.getRootFrame().getSize();
chooser.setMinimumSize(new Dimension((int)(parentSize.getWidth() / 2), (int)parentSize.getHeight() - 200)); chooser.setMinimumSize(new Dimension((int)(parentSize.getWidth() / 2), (int)parentSize.getHeight() - 200));
final Localizer localizer = Localizer.getInstance(); final Localizer localizer = Localizer.getInstance();
final FOptionPane optionPane = new FOptionPane(null, title, null, chooser, ImmutableList.of(localizer.getMessage("lblOk"), localizer.getMessage("lblCancel")), 0); final FOptionPane optionPane = new FOptionPane(null, title, null, chooser, ImmutableList.of(localizer.getMessage("lblOK"), localizer.getMessage("lblCancel")), 0);
optionPane.setDefaultFocus(chooser); optionPane.setDefaultFocus(chooser);
chooser.lstDecks.setItemActivateCommand(new UiCommand() { chooser.lstDecks.setItemActivateCommand(new UiCommand() {
@Override @Override

2
forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseFormats.java
View File

@@ -86,7 +86,7 @@ public class DialogChooseFormats {
} }
}; };
FButton btnOk = new FButton(localizer.getMessage("lblOk")); FButton btnOk = new FButton(localizer.getMessage("lblOK"));
btnOk.addActionListener(new ActionListener() { btnOk.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent arg0) { public void actionPerformed(ActionEvent arg0) {

2
forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChoosePoolDistribution.java
View File

@@ -48,7 +48,7 @@ public class DialogChoosePoolDistribution {
private final FTextField numberOfBoostersField = new FTextField.Builder().text("0").maxLength(10).build(); private final FTextField numberOfBoostersField = new FTextField.Builder().text("0").maxLength(10).build();
private final FButton btnOk = new FButton(localizer.getMessage("lblOk")); private final FButton btnOk = new FButton(localizer.getMessage("lblOK"));
private Runnable callback; private Runnable callback;

2
forge-gui-desktop/src/main/java/forge/screens/match/VAssignCombatDamage.java
View File

@@ -86,7 +86,7 @@ public class VAssignCombatDamage {
private final JLabel lblTotalDamage = new FLabel.Builder().text(localizer.getMessage("lblTotalDamageText")).build(); private final JLabel lblTotalDamage = new FLabel.Builder().text(localizer.getMessage("lblTotalDamageText")).build();
private final JLabel lblAssignRemaining = new FLabel.Builder().text(localizer.getMessage("lblAssignRemainingText")).build(); private final JLabel lblAssignRemaining = new FLabel.Builder().text(localizer.getMessage("lblAssignRemainingText")).build();
// Label Buttons // Label Buttons
private final FButton btnOK = new FButton(localizer.getMessage("lblOk")); private final FButton btnOK = new FButton(localizer.getMessage("lblOK"));
private final FButton btnReset = new FButton(localizer.getMessage("lblReset")); private final FButton btnReset = new FButton(localizer.getMessage("lblReset"));
private final FButton btnAuto = new FButton(localizer.getMessage("lblAuto")); private final FButton btnAuto = new FButton(localizer.getMessage("lblAuto"));
private final FButton btnSkip = new FButton(localizer.getMessage("lblSkip")); private final FButton btnSkip = new FButton(localizer.getMessage("lblSkip"));

2
forge-gui-desktop/src/main/java/forge/screens/match/VAssignGenericAmount.java
View File

@@ -73,7 +73,7 @@ public class VAssignGenericAmount {
private final JLabel lblTotalAmount; private final JLabel lblTotalAmount;
private final boolean atLeastOne; private final boolean atLeastOne;
// Label Buttons // Label Buttons
private final FButton btnOK = new FButton(localizer.getMessage("lblOk")); private final FButton btnOK = new FButton(localizer.getMessage("lblOK"));
private final FButton btnReset = new FButton(localizer.getMessage("lblReset")); private final FButton btnReset = new FButton(localizer.getMessage("lblReset"));
private static class AssignTarget { private static class AssignTarget {

2
forge-gui-desktop/src/main/java/forge/screens/match/views/VPrompt.java
View File

@@ -59,7 +59,7 @@ public class VPrompt implements IVDoc<CPrompt> {
private final DragTab tab = new DragTab(localizer.getMessage("lblPrompt")); private final DragTab tab = new DragTab(localizer.getMessage("lblPrompt"));
// Various components // Various components
private final FButton btnOK = new FButton(localizer.getMessage("lblOk")); private final FButton btnOK = new FButton(localizer.getMessage("lblOK"));
private final FButton btnCancel = new FButton(localizer.getMessage("lblCancel")); private final FButton btnCancel = new FButton(localizer.getMessage("lblCancel"));
private final FHtmlViewer tarMessage = new FHtmlViewer(); private final FHtmlViewer tarMessage = new FHtmlViewer();
private final FScrollPane messageScroller = new FScrollPane(tarMessage, false, private final FScrollPane messageScroller = new FScrollPane(tarMessage, false,

6
forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java
View File

@@ -69,7 +69,7 @@ public class DeckSelectScene extends UIScene {
int index = Current.player().copyDeck(); int index = Current.player().copyDeck();
if (index == -1) { if (index == -1) {
showDialog(createGenericDialog(Forge.getLocalizer().getMessage("lblCopy"), Forge.getLocalizer().getMessage("lblNoAvailableSlots"), showDialog(createGenericDialog(Forge.getLocalizer().getMessage("lblCopy"), Forge.getLocalizer().getMessage("lblNoAvailableSlots"),
Forge.getLocalizer().getMessage("lblOk"), Forge.getLocalizer().getMessage("lblOK"),
null, this::removeDialog, null)); null, this::removeDialog, null));
} }
else { else {
@@ -82,7 +82,7 @@ public class DeckSelectScene extends UIScene {
private void maybeDelete() { private void maybeDelete() {
if (Current.player().isEmptyDeck(currentSlot)) return; if (Current.player().isEmptyDeck(currentSlot)) return;
Dialog deleteDialog = createGenericDialog(Forge.getLocalizer().getMessage("lblDelete"), Forge.getLocalizer().getMessage("lblAreYouSureProceedDelete"), Dialog deleteDialog = createGenericDialog(Forge.getLocalizer().getMessage("lblDelete"), Forge.getLocalizer().getMessage("lblAreYouSureProceedDelete"),
Forge.getLocalizer().getMessage("lblOk"), Forge.getLocalizer().getMessage("lblOK"),
Forge.getLocalizer().getMessage("lblAbort"), this::delete, this::removeDialog); Forge.getLocalizer().getMessage("lblAbort"), this::delete, this::removeDialog);
showDialog(deleteDialog); showDialog(deleteDialog);
@@ -103,7 +103,7 @@ public class DeckSelectScene extends UIScene {
private void showRenameDialog() { private void showRenameDialog() {
if (renameDialog == null) { if (renameDialog == null) {
renameDialog = createGenericDialog(Forge.getLocalizer().getMessage("lblRenameDeck"), null, renameDialog = createGenericDialog(Forge.getLocalizer().getMessage("lblRenameDeck"), null,
Forge.getLocalizer().getMessage("lblOk"), Forge.getLocalizer().getMessage("lblOK"),
Forge.getLocalizer().getMessage("lblAbort"), () -> { Forge.getLocalizer().getMessage("lblAbort"), () -> {
this.rename(); this.rename();
removeDialog(); removeDialog();

2
forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java
View File

@@ -203,7 +203,7 @@ public class SaveLoadScene extends UIScene {
textInput.setText(buttons.get(currentSlot).actor.getText()); textInput.setText(buttons.get(currentSlot).actor.getText());
if (saveDialog == null) { if (saveDialog == null) {
saveDialog = createGenericDialog(Forge.getLocalizer().getMessage("lblSave"), null, saveDialog = createGenericDialog(Forge.getLocalizer().getMessage("lblSave"), null,
Forge.getLocalizer().getMessage("lblOk"), Forge.getLocalizer().getMessage("lblOK"),
Forge.getLocalizer().getMessage("lblAbort"), () -> { Forge.getLocalizer().getMessage("lblAbort"), () -> {
this.save(); this.save();
removeDialog(); removeDialog();

6
forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java
View File

@@ -59,7 +59,7 @@ public class SettingsScene extends UIScene {
if (somethingWentWrong.get()) { if (somethingWentWrong.get()) {
if (errorDialog == null) { if (errorDialog == null) {
errorDialog = createGenericDialog("Something went wrong", "Copy was not successful check your access right\n and if the folder is in use", errorDialog = createGenericDialog("Something went wrong", "Copy was not successful check your access right\n and if the folder is in use",
Forge.getLocalizer().getMessage("lblOk"), Forge.getLocalizer().getMessage("lblAbort"), this::removeDialog, this::removeDialog); Forge.getLocalizer().getMessage("lblOK"), Forge.getLocalizer().getMessage("lblAbort"), this::removeDialog, this::removeDialog);
} }
showDialog(errorDialog); showDialog(errorDialog);
} else { } else {
@@ -67,7 +67,7 @@ public class SettingsScene extends UIScene {
copyPlane = createGenericDialog("Copied plane", "New plane " + newPlaneName.getText() + copyPlane = createGenericDialog("Copied plane", "New plane " + newPlaneName.getText() +
" was created\nYou can now start the editor to change the plane\n" + " was created\nYou can now start the editor to change the plane\n" +
"or edit it manually from the folder\n" + Config.instance().getPlanePath("<user>" + newPlaneName.getText()), "or edit it manually from the folder\n" + Config.instance().getPlanePath("<user>" + newPlaneName.getText()),
Forge.getLocalizer().getMessage("lblOk"), Forge.getLocalizer().getMessage("lblAbort"), this::removeDialog, this::removeDialog); Forge.getLocalizer().getMessage("lblOK"), Forge.getLocalizer().getMessage("lblAbort"), this::removeDialog, this::removeDialog);
} }
Config.instance().getSettingData().plane = "<user>" + newPlaneName.getText(); Config.instance().getSettingData().plane = "<user>" + newPlaneName.getText();
Config.instance().saveSettings(); Config.instance().saveSettings();
@@ -78,7 +78,7 @@ public class SettingsScene extends UIScene {
private void createNewPlane() { private void createNewPlane() {
if (createNewPlane == null) { if (createNewPlane == null) {
createNewPlane = createGenericDialog("Create your own Plane", "Select a plane to copy", createNewPlane = createGenericDialog("Create your own Plane", "Select a plane to copy",
Forge.getLocalizer().getMessage("lblOk"), Forge.getLocalizer().getMessage("lblOK"),
Forge.getLocalizer().getMessage("lblAbort"), () -> { Forge.getLocalizer().getMessage("lblAbort"), () -> {
this.copyNewPlane(); this.copyNewPlane();
removeDialog(); removeDialog();

2
forge-gui-mobile/src/forge/adventure/scene/StartScene.java
View File

@@ -103,7 +103,7 @@ public class StartScene extends UIScene {
public boolean Exit() { public boolean Exit() {
if (exitDialog == null) { if (exitDialog == null) {
exitDialog = createGenericDialog(Forge.getLocalizer().getMessage("lblExitForge"), exitDialog = createGenericDialog(Forge.getLocalizer().getMessage("lblExitForge"),
Forge.getLocalizer().getMessage("lblAreYouSureYouWishExitForge"), Forge.getLocalizer().getMessage("lblOk"), Forge.getLocalizer().getMessage("lblAreYouSureYouWishExitForge"), Forge.getLocalizer().getMessage("lblOK"),
Forge.getLocalizer().getMessage("lblAbort"), () -> { Forge.getLocalizer().getMessage("lblAbort"), () -> {
Forge.exit(true); Forge.exit(true);
removeDialog(); removeDialog();

2
forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java
View File

@@ -57,7 +57,7 @@ public class OnlineLobbyScreen extends LobbyScreen implements IOnlineLobby {
Forge.back(); Forge.back();
if (msg.length() > 0) { if (msg.length() > 0) {
FThreads.invokeInBackgroundThread(() -> { FThreads.invokeInBackgroundThread(() -> {
final boolean callBackAlwaysTrue = SOptionPane.showOptionDialog(msg, Forge.getLocalizer().getMessage("lblError"), FSkinProp.ICO_WARNING, ImmutableList.of(Forge.getLocalizer().getMessage("lblOk")), 1) == 0; final boolean callBackAlwaysTrue = SOptionPane.showOptionDialog(msg, Forge.getLocalizer().getMessage("lblError"), FSkinProp.ICO_WARNING, ImmutableList.of(Forge.getLocalizer().getMessage("lblOK")), 1) == 0;
if (callBackAlwaysTrue) { //to activate online menu popup when player press play online if (callBackAlwaysTrue) { //to activate online menu popup when player press play online
GuiBase.setInterrupted(false); GuiBase.setInterrupted(false);

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

@@ -374,7 +374,6 @@ lblYouAreGoing=Du startest
lblMulligan=Mulligan lblMulligan=Mulligan
lblDoYouWantToKeepYourHand=Starthand behalten? lblDoYouWantToKeepYourHand=Starthand behalten?
lblReturnForLondon=Lege %d Karten unter die Bibliothek lblReturnForLondon=Lege %d Karten unter die Bibliothek
lblOk=OK
lblReset=Zurück lblReset=Zurück
lblAuto=Auto lblAuto=Auto
#VAssignDamage.java #VAssignDamage.java

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

@@ -374,7 +374,6 @@ lblYouAreGoing=you are going
lblMulligan=Mulligan lblMulligan=Mulligan
lblDoYouWantToKeepYourHand=Do you want to keep your hand? lblDoYouWantToKeepYourHand=Do you want to keep your hand?
lblReturnForLondon=Return %d card(s) to the bottom of your library lblReturnForLondon=Return %d card(s) to the bottom of your library
lblOk=Ok
lblReset=Reset lblReset=Reset
lblAuto=Auto lblAuto=Auto
#VAssignDamage.java #VAssignDamage.java

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

@@ -374,7 +374,6 @@ lblYouAreGoing=juegas
lblMulligan=Mulligan lblMulligan=Mulligan
lblDoYouWantToKeepYourHand=¿Quieres conservar tu mano o hacer mulligan? lblDoYouWantToKeepYourHand=¿Quieres conservar tu mano o hacer mulligan?
lblReturnForLondon=Devuelve %d carta(s) en la parte inferior de tu biblioteca lblReturnForLondon=Devuelve %d carta(s) en la parte inferior de tu biblioteca
lblOk=OK
lblReset=Reset lblReset=Reset
lblAuto=Auto lblAuto=Auto
#VAssignDamage.java #VAssignDamage.java

1
forge-gui/res/languages/fr-FR.properties
View File

@@ -374,7 +374,6 @@ lblYouAreGoing=tu vas en
lblMulligan=Mulligan lblMulligan=Mulligan
lblDoYouWantToKeepYourHand=Voulez-vous garder votre main ? lblDoYouWantToKeepYourHand=Voulez-vous garder votre main ?
lblReturnForLondon=Renvoyer %d carte(s) au bas de votre bibliothèque lblReturnForLondon=Renvoyer %d carte(s) au bas de votre bibliothèque
lblOk=Ok
lblReset=Réinitialiser lblReset=Réinitialiser
lblAuto=Auto lblAuto=Auto
#VAssignDamage.java #VAssignDamage.java

1
forge-gui/res/languages/it-IT.properties
View File

@@ -373,7 +373,6 @@ lblYouAreGoing=stai andando
lblMulligan=Mulligan lblMulligan=Mulligan
lblDoYouWantToKeepYourHand=Vuoi tenere la mano? lblDoYouWantToKeepYourHand=Vuoi tenere la mano?
lblReturnForLondon=Poni %d carte in fondo al tuo grimorio lblReturnForLondon=Poni %d carte in fondo al tuo grimorio
lblOk=Ok
lblReset=Ripristina lblReset=Ripristina
lblAuto=Auto lblAuto=Auto
#VAssignDamage.java #VAssignDamage.java

1
forge-gui/res/languages/ja-JP.properties
View File

@@ -374,7 +374,6 @@ lblYouAreGoing=あなたの順番は
lblMulligan=マリガン lblMulligan=マリガン
lblDoYouWantToKeepYourHand=手札をキープしますか？ lblDoYouWantToKeepYourHand=手札をキープしますか？
lblReturnForLondon=ライブラリの一番下に %d枚カードを戻してください lblReturnForLondon=ライブラリの一番下に %d枚カードを戻してください
lblOk=Ok
lblReset=リセット lblReset=リセット
lblAuto=自動 lblAuto=自動
#VAssignDamage.java #VAssignDamage.java

1
forge-gui/res/languages/pt-BR.properties
View File

@@ -386,7 +386,6 @@ lblYouAreGoing=você está indo
lblMulligan=Mulligan lblMulligan=Mulligan
lblDoYouWantToKeepYourHand=Você quer manter a mão? lblDoYouWantToKeepYourHand=Você quer manter a mão?
lblReturnForLondon=Devolver %d carta(s) para o fundo do grimório lblReturnForLondon=Devolver %d carta(s) para o fundo do grimório
lblOk=Ok
lblReset=Redefinir lblReset=Redefinir
lblAuto=Automático lblAuto=Automático
#VAssignDamage.java #VAssignDamage.java

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

@@ -374,7 +374,6 @@ lblYouAreGoing=你是
lblMulligan=调度 lblMulligan=调度
lblDoYouWantToKeepYourHand=你想保留这个手牌吗？ lblDoYouWantToKeepYourHand=你想保留这个手牌吗？
lblReturnForLondon=放回%d张牌到牌库底 lblReturnForLondon=放回%d张牌到牌库底
lblOk=确认
lblReset=重置 lblReset=重置
lblAuto=自动 lblAuto=自动
#VAssignDamage.java #VAssignDamage.java

2
forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletWinLoseController.java
View File

@@ -68,7 +68,7 @@ public abstract class GauntletWinLoseController {
message2 = localizer.getMessage("lblGauntletTournament"); message2 = localizer.getMessage("lblGauntletTournament");
view.getBtnContinue().setVisible(false); view.getBtnContinue().setVisible(false);
view.getBtnQuit().setText(localizer.getMessage("lblOk")); view.getBtnQuit().setText(localizer.getMessage("lblOK"));
// Remove save file if it's a quickie, or just reset it. // Remove save file if it's a quickie, or just reset it.
if (gd.getName().startsWith(GauntletIO.PREFIX_QUICK)) { if (gd.getName().startsWith(GauntletIO.PREFIX_QUICK)) {

2
forge-gui/src/main/java/forge/gamemodes/match/input/InputAttack.java
View File

@@ -88,7 +88,7 @@ public class InputAttack extends InputSyncronizedBase {
private void updatePrompt() { private void updatePrompt() {
Localizer localizer = Localizer.getInstance(); Localizer localizer = Localizer.getInstance();
String alphaLabel = canCallBackAttackers() ? localizer.getMessage("lblCallBack") : localizer.getMessage("lblAlphaStrike"); String alphaLabel = canCallBackAttackers() ? localizer.getMessage("lblCallBack") : localizer.getMessage("lblAlphaStrike");
getController().getGui().updateButtons(getOwner(), localizer.getMessage("lblOk"), alphaLabel, true, true, true); getController().getGui().updateButtons(getOwner(), localizer.getMessage("lblOK"), alphaLabel, true, true, true);
} }
private void disablePrompt() { private void disablePrompt() {

2
forge-gui/src/main/java/forge/gamemodes/match/input/InputLondonMulligan.java
View File

@@ -60,7 +60,7 @@ public class InputLondonMulligan extends InputSyncronizedBase {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
getController().getGui().updateButtons(getOwner(), localizer.getMessage("lblOk"), localizer.getMessage("lblAuto"), cardsLeft == 0, cardsLeft != 0, true); getController().getGui().updateButtons(getOwner(), localizer.getMessage("lblOK"), localizer.getMessage("lblAuto"), cardsLeft == 0, cardsLeft != 0, true);
sb.append(String.format(localizer.getMessage("lblReturnForLondon"), cardsLeft)); sb.append(String.format(localizer.getMessage("lblReturnForLondon"), cardsLeft));

2
forge-gui/src/main/java/forge/gamemodes/match/input/InputPassPriority.java
View File

@@ -114,7 +114,7 @@ public class InputPassPriority extends InputSyncronizedBase {
if (player.getManaPool().hasBurn()) { if (player.getManaPool().hasBurn()) {
message += " " + localizer.getMessage("lblYouWillTakeManaBurnDamageEqualAmountFloatingManaLostThisWay"); message += " " + localizer.getMessage("lblYouWillTakeManaBurnDamageEqualAmountFloatingManaLostThisWay");
} }
if (getController().getGui().showConfirmDialog(message, localizer.getMessage("lblManaFloating"), localizer.getMessage("lblOk"), localizer.getMessage("lblCancel"))) { if (getController().getGui().showConfirmDialog(message, localizer.getMessage("lblManaFloating"), localizer.getMessage("lblOK"), localizer.getMessage("lblCancel"))) {
runnable.run(); runnable.run();
} }
} }

2
forge-gui/src/main/java/forge/gamemodes/tournament/TournamentWinLoseController.java
View File

@@ -67,7 +67,7 @@ abstract public class TournamentWinLoseController {
message2 = localizer.getMessage("lblThroughTournament"); message2 = localizer.getMessage("lblThroughTournament");
view.getBtnContinue().setVisible(false); view.getBtnContinue().setVisible(false);
view.getBtnQuit().setText(localizer.getMessage("lblOk")); view.getBtnQuit().setText(localizer.getMessage("lblOK"));
// Remove save file if it's a quickie, or just reset it. // Remove save file if it's a quickie, or just reset it.
if (gd.getName().startsWith(TournamentIO.PREFIX_QUICK)) { if (gd.getName().startsWith(TournamentIO.PREFIX_QUICK)) {

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

@@ -1725,7 +1725,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
cardView = CardView.getCardForUi(iPaperCard); cardView = CardView.getCardForUi(iPaperCard);
else else
cardView = sa.getHostCard().getView(); cardView = sa.getHostCard().getView();
getGui().confirm(cardView, message, ImmutableList.of(localizer.getMessage("lblOk"))); getGui().confirm(cardView, message, ImmutableList.of(localizer.getMessage("lblOK")));
} else { } else {
getGui().message(message, sa == null || sa.getHostCard() == null ? "" : CardView.get(sa.getHostCard()).toString()); getGui().message(message, sa == null || sa.getHostCard() == null ? "" : CardView.get(sa.getHostCard()).toString());
} }