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

Merge branch 'master' into 'master'

Browse Source 
translate some controller button

See merge request core-developers/forge!2305
This commit is contained in:
swordshine
2019-11-27 14:25:51 +00:00
parent 785835632d 047bc9c5cd
commit 87bad70939
7 changed files with 112 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1227,9 +1227,9 @@ lblSelectYourDeck=Wähle dein Deck
lblSelectDeckForOpponent=Wähle Deck für Gegner
lblSelectGauntletContest=Wähle Wettbewerb
#PuzzleScreen.java
lblPuzzleText1=Der puzzle-Modus lädt ein Puzzle, welches du auf eine bestimmte Art zu gewinnen hast.
lblPuzzleText2=Drücke Start und wähle ein Puzzle aus der Liste.
lblPuzzleText3=Zu Beginn wird dir in einem Fenster dein Ziel erklärt, und auch eventuelle spezielle Karten in deiner Kommandozone.
lblPuzzleText1=Der Puzzle-Modus lädt ein Puzzle, das du in einer vorgegebenen Zeit/Weise gewinnen musst.
lblPuzzleText2=Um zu beginnen, drücke zunächst die Start-Taste und wähle dann ein Puzzle aus einer Liste aus.
lblPuzzleText3=Dein Ziel wird beim Start des Puzzles in einem Popup-Fenster angezeigt und auf einer Spezialeffektkarte angegeben, die sich in deiner Befehlszone befindet.
lblChooseAPuzzle=Wähle ein Puzzle
lblLoadingThePuzzle=Lade das Puzzle...
#InputPassPriority.java
@@ -1245,11 +1245,6 @@ lblLifePaidForPhyrexianMana=(%d Leben wurde bezahlt für phyrexianisches Mana)
lblClickOnYourLifeTotalToPayLifeForPhyrexianMana=Klicke auf deine Lebenspunkte um phyrexianisches Mana zu bezahlen.
lblClickOnYourLifeTotalToPayLifeForBlackMana=Klicke auf deine Lebenspunkte um schwarzes Mana zu bezahlen.
lblClickOnYourLifeTotalToPayLifeForPhyrexianOrBlackMana=Klicke auf deine Lebenspunkte um phyrexianisches oder schwarzes Mana zu bezahlen.
lblPuzzleText1=Der Puzzle-Modus lädt ein Puzzle, das du in einer vorgegebenen Zeit/Weise gewinnen musst.
lblPuzzleText2=Um zu beginnen, drücke zunächst die Start-Taste und wähle dann ein Puzzle aus einer Liste aus.
lblPuzzleText3=Dein Ziel wird beim Start des Puzzles in einem Popup-Fenster angezeigt und auf einer Spezialeffektkarte angegeben, die sich in deiner Befehlszone befindet.
lblChooseAPuzzle=Wähle ein Puzzle
lblLoadingThePuzzle=Lade das Puzzle...
#GameLogFormatter.java
lblLogScryTopBottomLibrary=Hellsicht: %s legte %top Karte(n) auf und %bottom Karte(n) unter die Bibliothek
lblLogScryTopLibrary=Hellsicht: %s legte %top Karte(n) auf die Bibliothek
@@ -1386,3 +1381,22 @@ lblUntapped=nicht getappt
lblVoters=Abstimmende
#PermanentCreatureEffect.java
lblCreature=Kreatur
#LimitedWinLoseController.java
btnRestartRound=Restart Round
btnTournamentInfo=Tournament Info
btnNextRound=Next Round
btnWonRound=YOU HAVE WON ROUND
btnWonTournament=***CONGRATULATIONS! YOU HAVE WON THE TOURNAMENT!***
btnLoseRound=YOU HAVE LOST ON ROUND
btnQuit=Quit
btnContinue=Continue
btnRestart=Restart
#TournamentWinLoseController.java
btnSaveQuit=Save and Quit
lblCongratulations=CONGRATULATIONS!
lblThroughTournament=You made it through the tournament!
lblDefeated=DEFEATED!
lblFailedTournament=You have failed to pass the tournament.
#GauntletWinLoseController.java
lblGauntletTournament=You made it through the gauntlet!
lblFailedGauntlet=You have failed to pass the gauntlet.

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

@@ -1381,3 +1381,22 @@ lblUntapped=Untapped
lblVoters=Voters
#PermanentCreatureEffect.java
lblCreature=Creature
#LimitedWinLoseController.java
btnRestartRound=Restart Round
btnTournamentInfo=Tournament Info
btnNextRound=Next Round
btnWonRound=YOU HAVE WON ROUND
btnWonTournament=***CONGRATULATIONS! YOU HAVE WON THE TOURNAMENT!***
btnLoseRound=YOU HAVE LOST ON ROUND
btnQuit=Quit
btnContinue=Continue
btnRestart=Restart
#TournamentWinLoseController.java
btnSaveQuit=Save and Quit
lblCongratulations=CONGRATULATIONS!
lblThroughTournament=You made it through the tournament!
lblDefeated=DEFEATED!
lblFailedTournament=You have failed to pass the tournament.
#GauntletWinLoseController.java
lblGauntletTournament=You made it through the gauntlet!
lblFailedGauntlet=You have failed to pass the gauntlet.

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

@@ -1381,3 +1381,22 @@ lblUntapped=Desgirado
lblVoters=Votantes
#PermanentCreatureEffect.java
lblCreature=Criatura
#LimitedWinLoseController.java
btnRestartRound=Restart Round
btnTournamentInfo=Tournament Info
btnNextRound=Next Round
btnWonRound=YOU HAVE WON ROUND
btnWonTournament=***CONGRATULATIONS! YOU HAVE WON THE TOURNAMENT!***
btnLoseRound=YOU HAVE LOST ON ROUND
btnQuit=Quit
btnContinue=Continue
btnRestart=Restart
#TournamentWinLoseController.java
btnSaveQuit=Save and Quit
lblCongratulations=CONGRATULATIONS!
lblThroughTournament=You made it through the tournament!
lblDefeated=DEFEATED!
lblFailedTournament=You have failed to pass the tournament.
#GauntletWinLoseController.java
lblGauntletTournament=You made it through the gauntlet!
lblFailedGauntlet=You have failed to pass the gauntlet.

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

@@ -1381,3 +1381,22 @@ lblUntapped=未横置
lblVoters=投票
#PermanentCreatureEffect.java
lblCreature=生物
#LimitedWinLoseController.java
btnRestartRound=开始新的一轮
btnTournamentInfo=锦标赛信息
btnNextRound=下一轮
btnWonRound=你赢得了此轮
btnWonTournament=***恭喜！你赢得了锦标赛！***
btnLoseRound=你输了了此轮
btnQuit=退出
btnContinue=继续
btnRestart=重新开始
#TournamentWinLoseController.java
btnSaveQuit=保存并退出
lblCongratulations=恭喜！
lblThroughTournament=你通关了锦标赛！
lblDefeated=失败了！
lblFailedTournament=你未能通关锦标赛。
#GauntletWinLoseController.java
lblGauntletTournament=你通关了决斗！
lblFailedGauntlet=你未能通关决斗。

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

@@ -13,9 +13,11 @@ import forge.interfaces.IButton;
import forge.interfaces.IWinLoseView;
import forge.model.FModel;
import forge.player.GamePlayerUtil;
import forge.util.Localizer;
public abstract class GauntletWinLoseController {
private static final String SAVE_AND_QUIT = "Save and Quit";
private final Localizer localizer = Localizer.getInstance();
private static final String SAVE_AND_QUIT = Localizer.getInstance().getMessage("btnSaveQuit");
private final IWinLoseView<? extends IButton> view;
private final GameView lastGame;
@@ -62,11 +64,11 @@ public abstract class GauntletWinLoseController {
// Gauntlet complete: Remove save file
if (gd.getCompleted() == lstDecks.size()) {
icon = FSkinProp.ICO_QUEST_COIN;
message1 = "CONGRATULATIONS!";
message2 = "You made it through the gauntlet!";
message1 = localizer.getMessage("lblCongratulations");
message2 = localizer.getMessage("lblGauntletTournament");
view.getBtnContinue().setVisible(false);
view.getBtnQuit().setText("OK");
view.getBtnQuit().setText(localizer.getMessage("lblOk"));
// Remove save file if it's a quickie, or just reset it.
if (gd.getName().startsWith(GauntletIO.PREFIX_QUICK)) {
@@ -81,18 +83,18 @@ public abstract class GauntletWinLoseController {
gd.stamp();
GauntletIO.saveGauntlet(gd);
view.getBtnContinue().setText("Next Round (" + (gd.getCompleted() + 1)
view.getBtnContinue().setText(localizer.getMessage("btnNextRound") + " (" + (gd.getCompleted() + 1)
+ "/" + len + ")");
view.getBtnContinue().setVisible(true);
view.getBtnContinue().setEnabled(true);
view.getBtnQuit().setText("Save and Quit");
view.getBtnQuit().setText(localizer.getMessage("btnSaveQuit"));
}
}
// Lose match case; stop gauntlet.
else {
icon = FSkinProp.ICO_QUEST_HEART;
message1 = "DEFEATED!";
message2 = "You have failed to pass the gauntlet.";
message1 = localizer.getMessage("lblDefeated");
message2 = localizer.getMessage("lblFailedGauntlet");
view.getBtnContinue().setVisible(false);

20
forge-gui/src/main/java/forge/limited/LimitedWinLoseController.java
View File

@@ -5,8 +5,10 @@ import forge.interfaces.IButton;
import forge.interfaces.IWinLoseView;
import forge.model.FModel;
import forge.player.GamePlayerUtil;
import forge.util.Localizer;
public abstract class LimitedWinLoseController {
private final Localizer localizer = Localizer.getInstance();
private final IWinLoseView<? extends IButton> view;
private final GameView lastGame;
private final boolean wonMatch;
@@ -36,32 +38,32 @@ public abstract class LimitedWinLoseController {
gauntlet.addLoss();
}
view.getBtnRestart().setText("Restart Round");
view.getBtnRestart().setText(localizer.getMessage("btnRestartRound"));
showOutcome(new Runnable() {
@Override
public void run() {
if (!lastGame.isMatchOver()) {
showTournamentInfo("Tournament Info");
showTournamentInfo(localizer.getMessage("btnTournamentInfo"));
return;
}
if (wonMatch) {
if (gauntlet.getCurrentRound() < gauntlet.getRounds()) {
view.getBtnContinue().setText("Next Round (" + (gauntlet.getCurrentRound() + 1)
view.getBtnContinue().setText(localizer.getMessage("btnNextRound") + " (" + (gauntlet.getCurrentRound() + 1)
+ "/" + gauntlet.getRounds() + ")");
nextRound = true;
view.getBtnContinue().setEnabled(true);
showTournamentInfo("YOU HAVE WON ROUND " + gauntlet.getCurrentRound() + "/"
showTournamentInfo(localizer.getMessage("btnWonRound") + gauntlet.getCurrentRound() + "/"
+ gauntlet.getRounds());
}
else {
showTournamentInfo("***CONGRATULATIONS! YOU HAVE WON THE TOURNAMENT!***");
showTournamentInfo(localizer.getMessage("btnWonTournament"));
}
}
else {
view.getBtnContinue().setVisible(false);
showTournamentInfo("YOU HAVE LOST ON ROUND " + gauntlet.getCurrentRound() + "/"
showTournamentInfo(localizer.getMessage("btnLoseRound") + gauntlet.getCurrentRound() + "/"
+ gauntlet.getRounds());
}
}
@@ -109,9 +111,9 @@ public abstract class LimitedWinLoseController {
*
*/
private void resetView() {
view.getBtnQuit().setText("Quit");
view.getBtnContinue().setText("Continue");
view.getBtnRestart().setText("Restart");
view.getBtnQuit().setText(localizer.getMessage("btnQuit"));
view.getBtnContinue().setText(localizer.getMessage("btnContinue"));
view.getBtnRestart().setText(localizer.getMessage("btnRestart"));
}
protected abstract void showOutcome(Runnable runnable);

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

@@ -11,10 +11,12 @@ import forge.interfaces.IButton;
import forge.interfaces.IWinLoseView;
import forge.model.FModel;
import forge.player.GamePlayerUtil;
import forge.util.Localizer;
import java.util.List;
abstract public class TournamentWinLoseController {
private final Localizer localizer = Localizer.getInstance();
private final IWinLoseView<? extends IButton> view;
private final GameView lastGame;
@@ -60,11 +62,11 @@ abstract public class TournamentWinLoseController {
// Tournament complete: Remove save file
if (gd.getCompleted() == lstDecks.size()) {
icon = FSkinProp.ICO_QUEST_COIN;
message1 = "CONGRATULATIONS!";
message2 = "You made it through the tournament!";
message1 = localizer.getMessage("lblCongratulations");
message2 = localizer.getMessage("lblThroughTournament");
view.getBtnContinue().setVisible(false);
view.getBtnQuit().setText("OK");
view.getBtnQuit().setText(localizer.getMessage("lblOk"));
// Remove save file if it's a quickie, or just reset it.
if (gd.getName().startsWith(TournamentIO.PREFIX_QUICK)) {
@@ -79,18 +81,18 @@ abstract public class TournamentWinLoseController {
gd.stamp();
TournamentIO.saveTournament(gd);
view.getBtnContinue().setText("Next Round (" + (gd.getCompleted() + 1)
view.getBtnContinue().setText(localizer.getMessage("btnNextRound") + " (" + (gd.getCompleted() + 1)
+ "/" + len + ")");
view.getBtnContinue().setVisible(true);
view.getBtnContinue().setEnabled(true);
view.getBtnQuit().setText("Save and Quit");
view.getBtnQuit().setText(localizer.getMessage("btnSaveQuit"));
}
}
// Lose match case; stop tournament.
else {
icon = FSkinProp.ICO_QUEST_HEART;
message1 = "DEFEATED!";
message2 = "You have failed to pass the tournament.";
message1 = localizer.getMessage("lblDefeated");
message2 = localizer.getMessage("lblFailedTournament");
view.getBtnContinue().setVisible(false);