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

Merge branch 'localization_lang' into 'master'

Browse Source 
Update Lang.java to support other languages.

See merge request core-developers/forge!3971
This commit is contained in:
Michael Kamensky
2021-02-22 12:12:26 +00:00
parent 98e2f16b41 e1f68bd06c
commit e33047f988
29 changed files with 345 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui/src/main/java/forge/control/FControlGameEventHandler.java
View File

@@ -198,7 +198,7 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
final List<CardView> options = Lists.newArrayList();
for (final Entry<Player, Card> kv : ev.cards.entries()) {
//use fake card so real cards appear with proper formatting
final CardView fakeCard = new CardView(-1, null, " -- From " + Lang.getPossesive(kv.getKey().getName()) + " deck --");
final CardView fakeCard = new CardView(-1, null, " -- From " + Lang.getInstance().getPossesive(kv.getKey().getName()) + " deck --");
options.add(fakeCard);
options.add(kv.getValue().getView());
}

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

@@ -67,7 +67,7 @@ public class InputConfirmMulligan extends InputSyncronizedBase {
}
else {
sb.append(startingPlayer.getName()).append(" ").append(localizer.getMessage("lblIsGoingFirst")).append(".\n");
sb.append(player).append(", ").append(localizer.getMessage("lblYouAreGoing")).append(" ").append(Lang.getOrdinal(game.getPosition(player, startingPlayer))).append(".\n\n");
sb.append(player).append(", ").append(localizer.getMessage("lblYouAreGoing")).append(" ").append(Lang.getInstance().getOrdinal(game.getPosition(player, startingPlayer))).append(".\n\n");
}
getController().getGui().updateButtons(getOwner(), localizer.getMessage("lblKeep"), localizer.getMessage("lblMulligan"), true, true, true);

2
forge-gui/src/main/java/forge/model/FModel.java
View File

@@ -52,6 +52,7 @@ import forge.quest.data.QuestPreferences;
import forge.tournament.TournamentData;
import forge.util.CardTranslation;
import forge.util.FileUtil;
import forge.util.Lang;
import forge.util.Localizer;
import forge.util.storage.IStorage;
import forge.util.storage.StorageBase;
@@ -126,6 +127,7 @@ public final class FModel {
throw new RuntimeException(exn);
}
Lang.createInstance(FModel.getPreferences().getPref(FPref.UI_LANGUAGE));
Localizer.getInstance().initialize(FModel.getPreferences().getPref(FPref.UI_LANGUAGE), ForgeConstants.LANG_DIR);
final ProgressObserver progressBarBridge = (progressBar == null) ?

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

@@ -1874,7 +1874,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
@Override
public void revealAnte(final String message, final Multimap<Player, PaperCard> removedAnteCards) {
for (final Player p : removedAnteCards.keySet()) {
getGui().reveal(localizer.getMessage("lblActionFromPlayerDeck", message, Lang.getPossessedObject(MessageUtil.mayBeYou(player, p), "")),
getGui().reveal(localizer.getMessage("lblActionFromPlayerDeck", message, Lang.getInstance().getPossessedObject(MessageUtil.mayBeYou(player, p), "")),
ImmutableList.copyOf(removedAnteCards.get(p)));
}
}