From 6ff80452d70f77bd954bd478eaa56a3e21e95952 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Sun, 6 Mar 2022 16:07:08 +0800 Subject: [PATCH] update localization --- .../forge/adventure/scene/NewGameScene.java | 12 +++++++++- .../forge/adventure/scene/SaveLoadScene.java | 16 ++++++++------ .../forge/adventure/scene/SettingsScene.java | 3 ++- .../src/forge/adventure/scene/StartScene.java | 7 ++++++ .../src/forge/adventure/stage/GameHUD.java | 17 +++++++++----- .../src/forge/adventure/world/WorldSave.java | 5 +++-- .../Shandalar/ui/new_game_mobile.json | 12 +++++----- forge-gui/res/languages/de-DE.properties | 22 ++++++++++++++++--- forge-gui/res/languages/en-US.properties | 16 ++++++++++++++ forge-gui/res/languages/es-ES.properties | 16 ++++++++++++++ forge-gui/res/languages/it-IT.properties | 18 ++++++++++++++- forge-gui/res/languages/ja-JP.properties | 16 ++++++++++++++ forge-gui/res/languages/zh-CN.properties | 16 ++++++++++++++ 13 files changed, 149 insertions(+), 27 deletions(-) diff --git a/forge-gui-mobile/src/forge/adventure/scene/NewGameScene.java b/forge-gui-mobile/src/forge/adventure/scene/NewGameScene.java index 1eb4d84b4a8..1fb22424f49 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/NewGameScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/NewGameScene.java @@ -154,16 +154,26 @@ public class NewGameScene extends UIScene { scrollPane = ui.findActor("scroll"); titleL = ui.findActor("titleL"); titleL.setScale(2, 2); + titleL.setText(Forge.getLocalizer().getMessage("lblCreateACharacter")); + titleL.setX(scrollPane.getX() + 20); avatarL = ui.findActor("avatarL"); + avatarL.setText(Forge.getLocalizer().getMessage("lblAvatar")); nameL = ui.findActor("nameL"); + nameL.setText(Forge.getLocalizer().getMessage("lblName")); raceL = ui.findActor("raceL"); + raceL.setText(Forge.getLocalizer().getMessage("lblRace")); genderL = ui.findActor("genderL"); + genderL.setText(Forge.getLocalizer().getMessage("lblGender")); difficultyL = ui.findActor("difficultyL"); + difficultyL.setText(Forge.getLocalizer().getMessage("lblDifficulty")); deckL = ui.findActor("deckL"); + deckL.setText(Forge.getLocalizer().getMessage("lblDeck")); leftArrow = ui.findActor("leftAvatar"); rightArrow = ui.findActor("rightAvatar"); backButton = ui.findActor("back"); + backButton.getLabel().setText(Forge.getLocalizer().getMessage("lblBack")); startButton = ui.findActor("start"); + startButton.getLabel().setText(Forge.getLocalizer().getMessage("lblStart")); if (!Forge.isLandscapeMode()) { float w = Scene.GetIntendedWidth(); float sW = w - 20; @@ -177,7 +187,7 @@ public class NewGameScene extends UIScene { titleL.setScale(4, 2); titleL.setFontScale(4, 2); - titleL.setX(selectedName.getX()-20); + titleL.setX(scrollPane.getX() + 20); avatarImage.setScaleX(2); avatarImage.setX(w/2-avatarImage.getWidth()); diff --git a/forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java b/forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java index e6425a88435..08b171e1a8a 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java @@ -184,11 +184,11 @@ public class SaveLoadScene extends UIScene { public void setSaveGame(boolean save) { if (save) { - header.setText("Save game"); - saveLoadButton.setText("Save"); + header.setText(Forge.getLocalizer().getMessage("lblSaveGame")); + saveLoadButton.setText(Forge.getLocalizer().getMessage("lblSave")); } else { - header.setText("Load game"); - saveLoadButton.setText("Load"); + header.setText(Forge.getLocalizer().getMessage("lblLoadGame")); + saveLoadButton.setText(Forge.getLocalizer().getMessage("lblLoad")); } autoSave.setDisabled(save); quickSave.setDisabled(save); @@ -257,12 +257,13 @@ public class SaveLoadScene extends UIScene { header.setAlignment(Align.center); layout.add(header).pad(2).colspan(4).align(Align.center).expand(); layout.row(); - autoSave = addSaveSlot("Auto save", WorldSave.AUTO_SAVE_SLOT); - quickSave = addSaveSlot("Quick save", WorldSave.QUICK_SAVE_SLOT); + autoSave = addSaveSlot(Forge.getLocalizer().getMessage("lblAutoSave"), WorldSave.AUTO_SAVE_SLOT); + quickSave = addSaveSlot(Forge.getLocalizer().getMessage("lblQuickSave"), WorldSave.QUICK_SAVE_SLOT); for (int i = 1; i < 11; i++) - addSaveSlot("Slot:" + i, i); + addSaveSlot(Forge.getLocalizer().getMessage("lblSlot")+": " + i, i); saveLoadButton = ui.findActor("save"); + saveLoadButton.getLabel().setText(Forge.getLocalizer().getMessage("lblSave")); ui.onButtonPress("save", new Runnable() { @Override public void run() { @@ -270,6 +271,7 @@ public class SaveLoadScene extends UIScene { } }); back = ui.findActor("return"); + back.getLabel().setText(Forge.getLocalizer().getMessage("lblBack")); ui.onButtonPress("return", new Runnable() { @Override public void run() { diff --git a/forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java b/forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java index 3a8b8294c7b..8b95fcfa16f 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java @@ -183,7 +183,7 @@ public class SettingsScene extends UIScene { return null; } }); - addLabel("Plane"); + addLabel(Forge.getLocalizer().getMessage("lblWorld")); if (!Forge.isLandscapeMode()) { plane.getStyle().listStyle.font.getData().setScale(2, 1); } @@ -262,6 +262,7 @@ public class SettingsScene extends UIScene { settingGroup.row(); back = ui.findActor("return"); + back.getLabel().setText(Forge.getLocalizer().getMessage("lblBack")); ui.onButtonPress("return", new Runnable() { @Override public void run() { diff --git a/forge-gui-mobile/src/forge/adventure/scene/StartScene.java b/forge-gui-mobile/src/forge/adventure/scene/StartScene.java index 8e8b97112de..fc6fdd57aca 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/StartScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/StartScene.java @@ -123,12 +123,19 @@ public class StartScene extends UIScene { } }); newGameButton = ui.findActor("Start"); + newGameButton.getLabel().setText(Forge.getLocalizer().getMessage("lblNewGame")); loadButtton = ui.findActor("Load"); + loadButtton.getLabel().setText(Forge.getLocalizer().getMessage("lblLoad")); saveButton = ui.findActor("Save"); + saveButton.getLabel().setText(Forge.getLocalizer().getMessage("lblSave")); resumeButton = ui.findActor("Resume"); + resumeButton.getLabel().setText(Forge.getLocalizer().getMessage("lblResume")); settingsButton = ui.findActor("Settings"); + settingsButton.getLabel().setText(Forge.getLocalizer().getMessage("lblSettings")); exitButton = ui.findActor("Exit"); + exitButton.getLabel().setText(Forge.getLocalizer().getMessage("lblExit")); switchButton = ui.findActor("Switch"); + switchButton.getLabel().setText(Forge.getLocalizer().getMessage("lblClassic")); if (!Forge.isLandscapeMode()) { float w = Scene.GetIntendedWidth(); float bW = w - 165; diff --git a/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java b/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java index 27e01714ea3..d9be4dd8dc4 100644 --- a/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java +++ b/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java @@ -66,8 +66,11 @@ public class GameHUD extends Stage { mapborder = ui.findActor("mapborder"); avatarborder = ui.findActor("avatarborder"); deckActor = ui.findActor("deck"); + deckActor.getLabel().setText(Forge.getLocalizer().getMessage("lblDeck")); menuActor = ui.findActor("menu"); + menuActor.getLabel().setText(Forge.getLocalizer().getMessage("lblMenu")); statsActor = ui.findActor("statistic"); + statsActor.getLabel().setText(Forge.getLocalizer().getMessage("lblStatus")); gamehud = ui.findActor("gamehud"); miniMapPlayer = new Image(new Texture(Config.instance().getFile("ui/minimap_player.png"))); @@ -351,19 +354,21 @@ public class GameHUD extends Stage { avatarborder.setScaleX(2); avatarborder.setHeight(70); money.setX(418); + money.setFontScaleX(2); lifePoints.setX(418); lifePoints.setY(avatar.getY()-15); + lifePoints.setFontScaleX(2); money.setY(avatar.getY()-25); menuActor.setHeight(20); - menuActor.setWidth(60); - menuActor.setX(420); + menuActor.setWidth(80); + menuActor.setX(400); statsActor.setHeight(20); - statsActor.setWidth(60); - statsActor.setX(420); + statsActor.setWidth(80); + statsActor.setX(400); statsActor.setY(menuActor.getY() + 35); deckActor.setHeight(20); - deckActor.setWidth(60); - deckActor.setX(420); + deckActor.setWidth(80); + deckActor.setX(400); deckActor.setY(statsActor.getY() + 35); } } diff --git a/forge-gui-mobile/src/forge/adventure/world/WorldSave.java b/forge-gui-mobile/src/forge/adventure/world/WorldSave.java index 4f2f5f4bf14..7368fb3e428 100644 --- a/forge-gui-mobile/src/forge/adventure/world/WorldSave.java +++ b/forge-gui-mobile/src/forge/adventure/world/WorldSave.java @@ -1,5 +1,6 @@ package forge.adventure.world; +import forge.Forge; import forge.adventure.data.DifficultyData; import forge.adventure.player.AdventurePlayer; import forge.adventure.pointofintrest.PointOfInterestChanges; @@ -129,10 +130,10 @@ public class WorldSave { //return currentSave = ret; } public boolean autoSave() { - return save("auto save",AUTO_SAVE_SLOT); + return save(Forge.getLocalizer().getMessage("lblAutoSave"), AUTO_SAVE_SLOT); } public boolean quickSave() { - return save("quick save",QUICK_SAVE_SLOT); + return save(Forge.getLocalizer().getMessage("lblQuickSave"), QUICK_SAVE_SLOT); } public boolean quickLoad() { return load(QUICK_SAVE_SLOT); diff --git a/forge-gui/res/adventure/Shandalar/ui/new_game_mobile.json b/forge-gui/res/adventure/Shandalar/ui/new_game_mobile.json index e213e26e95d..e088360c59d 100644 --- a/forge-gui/res/adventure/Shandalar/ui/new_game_mobile.json +++ b/forge-gui/res/adventure/Shandalar/ui/new_game_mobile.json @@ -35,7 +35,7 @@ "width": 128, "height": 32, "font" : "black", - "x": 104, + "x": 75, "y": 58 }, { @@ -45,7 +45,7 @@ "width": 128, "height": 32, "font" : "black", - "x": 104, + "x": 75, "y": 90 }, { @@ -55,7 +55,7 @@ "width": 128, "height": 32, "font" : "black", - "x": 104, + "x": 75, "y": 124 }, { @@ -65,7 +65,7 @@ "width": 128, "height": 32, "font" : "black", - "x": 104, + "x": 75, "y": 154 }, { @@ -75,7 +75,7 @@ "width": 128, "height": 32, "font" : "black", - "x": 104, + "x": 75, "y": 186 }, { @@ -85,7 +85,7 @@ "width": 128, "height": 32, "font" : "black", - "x": 104, + "x": 75, "y": 218 }, { diff --git a/forge-gui/res/languages/de-DE.properties b/forge-gui/res/languages/de-DE.properties index 2e41cbefe66..9d739996d8d 100644 --- a/forge-gui/res/languages/de-DE.properties +++ b/forge-gui/res/languages/de-DE.properties @@ -1052,8 +1052,8 @@ lblEnableRoundBorder=Aktiviere Maske mit runden Ränder nlEnableRoundBorder=Wenn aktiviert, werden Kartenecken abgerundet. Vorzugsweise bei Karten mit vollem Rand. lblPreloadExtendedArtCards=Erw. Kartenbilder bei Start laden nlPreloadExtendedArtCards=Wenn aktiviert, werden erweiterte Kartenbilder bereits beim Start in den Speicher geladen (Hohe RAM-Auslastung). -lblEnableMatchScrollIndicator=Spielfeld-Scrollbalken -nlEnableMatchScrollIndicator=Wenn aktiviert, wird der Scrollbalken im Spielbildschirm angezeigt. +lblMatchScrollIndicator=Spielfeld-Scrollbalken +nlMatchScrollIndicator=Wenn aktiviert, wird der Scrollbalken im Spielbildschirm angezeigt. lblEnableMagnifier=Karten-Lupe (Experimental) nlEnableMagnifier=Wenn aktiviert, wird eine noch größere Version gezoomter Karten gezeigt. lblFullScreenMode=Vollbild @@ -1113,7 +1113,7 @@ lblInventory=Inhaltsverzeichnis lblCollection=Sammlung lblCommanders=Generäle lblOathbreakers=Eidbrecher -lblSave=Änderungen wurden noch nicht gesichert. +lblSave=Speichern lblDontSave=Nicht speichern lblPackN=Pack {0} #Forge.java @@ -2855,3 +2855,19 @@ lblInvalidTargetSpecification=Nicht alle Zielbedingungen sind erfüllt. #CPrompt.java lblDay=Tag lblNight=Nacht +#Adventure +lblCreateACharacter=Einen Charakter erstellen +lblRace=Wettrennen +lblGender=Geschlecht +lblStart=Start +lblLoad=Belastung +lblSaveGame=Spiel speichern +lblResume=Fortsetzen +lblClassic=Klassisch +lblClassicMode=Klassischer Modus +lblAdventureMode=Abenteuermodus +lblMenu=Speisekarte +lblStatus=Status +lblAutoSave=Auto Save +lblQuickSave=Schnellspeichern +lblSlot=Slot \ No newline at end of file diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties index f88bd7c22eb..60fee364c7f 100644 --- a/forge-gui/res/languages/en-US.properties +++ b/forge-gui/res/languages/en-US.properties @@ -2858,3 +2858,19 @@ lblInvalidTargetSpecification=Not all target requirements are met. #CPrompt.java lblDay=Day lblNight=Night +#Adventure +lblCreateACharacter=Create a Character +lblRace=Race +lblGender=Gender +lblStart=Start +lblLoad=Load +lblSaveGame=Save Game +lblResume=Resume +lblClassic=Classic +lblClassicMode=Classic Mode +lblAdventureMode=Adventure Mode +lblMenu=Menu +lblStatus=Status +lblAutoSave=Auto Save +lblQuickSave=Quick Save +lblSlot=Slot \ No newline at end of file diff --git a/forge-gui/res/languages/es-ES.properties b/forge-gui/res/languages/es-ES.properties index df166301a13..e9a7a749f5f 100644 --- a/forge-gui/res/languages/es-ES.properties +++ b/forge-gui/res/languages/es-ES.properties @@ -2858,3 +2858,19 @@ lblInvalidTargetSpecification=No se cumplen todos los requisitos de objetivos. #CPrompt.java lblDay=Día lblNight=Noche +#Adventure +lblCreateACharacter=Crear un personaje +lblRace=Raza +lblGender=Género +lblStart=Comienzo +lblLoad=Carga +lblSaveGame=Guardar partida +lblResume=Reanudar +lblClassic=Clásico +lblClassicMode=Modo clásico +lblAdventureMode=Modo de aventura +lblMenu=Menú +lblStatus=Estado +lblAutoSave=Guardar auto +lblQuickSave=Guardar rápido +lblSlot=Espacio \ No newline at end of file diff --git a/forge-gui/res/languages/it-IT.properties b/forge-gui/res/languages/it-IT.properties index 7714ea44524..9d05da0a6bc 100644 --- a/forge-gui/res/languages/it-IT.properties +++ b/forge-gui/res/languages/it-IT.properties @@ -2860,4 +2860,20 @@ lblGauntletProgress=Avanzamento della Sfida lblInvalidTargetSpecification=Bersagli non validi. #CPrompt.java lblDay=Giorno -lblNight=Notte \ No newline at end of file +lblNight=Notte +#Adventure +lblCreateACharacter=Creare un personaggio +lblRace=Gara +lblGender=Genere +lblStart=Cominciare +lblLoad=Carico +lblSaveGame=Salva il gioco +lblResume=Riprendere +lblClassic=Classico +lblClassicMode=Modalità classica +lblAdventureMode=Modalità di avventura +lblMenu=Menù +lblStatus=Stato +lblAutoSave=Salva automatico +lblQuickSave=Salvataggio veloce +lblSlot=Fessura \ No newline at end of file diff --git a/forge-gui/res/languages/ja-JP.properties b/forge-gui/res/languages/ja-JP.properties index 03c7c79e0ca..b5104390ad0 100644 --- a/forge-gui/res/languages/ja-JP.properties +++ b/forge-gui/res/languages/ja-JP.properties @@ -2857,3 +2857,19 @@ lblInvalidTargetSpecification=全ての対象制限を満たしていない。 #CPrompt.java lblDay=日 lblNight=夜 +#Adventure +lblCreateACharacter=キャラクターを作成します +lblRace=人種 +lblGender=性别 +lblStart=始める +lblLoad=ロード +lblSaveGame=ゲームを保存する +lblResume=履歴書 +lblClassic=クラシック +lblClassicMode=クラシックモード +lblAdventureMode=冒険モード +lblMenu=メニュー +lblStatus=スターテス +lblAutoSave=自動保存 +lblQuickSave=クイックセーブ +lblSlot=スロット diff --git a/forge-gui/res/languages/zh-CN.properties b/forge-gui/res/languages/zh-CN.properties index 90b95c23471..85c4f270a32 100644 --- a/forge-gui/res/languages/zh-CN.properties +++ b/forge-gui/res/languages/zh-CN.properties @@ -2840,3 +2840,19 @@ lblInvalidTargetSpecification=并非所有目标的要求都得到了满足。 #CPrompt.java lblDay=日 lblNight=夜晚 +#Adventure +lblCreateACharacter=创建一个字符 +lblRace=种族 +lblGender=性别 +lblStart=开始 +lblLoad=加载 +lblSaveGame=保存游戏 +lblResume=恢复 +lblClassic=经典的 +lblClassicMode=经典模式 +lblAdventureMode=冒险模式 +lblMenu=菜单 +lblStatus=状态 +lblAutoSave=自动保存 +lblQuickSave=快速保存 +lblSlot=投币口 \ No newline at end of file