From a527211bcfa36caebd360e243a5a8db8f7a7a86a Mon Sep 17 00:00:00 2001 From: CCTV-1 Date: Mon, 9 Mar 2020 20:15:36 +0800 Subject: [PATCH] translate AutoUpdater --- forge-gui/res/languages/de-DE.properties | 16 +++++++++++++++- forge-gui/res/languages/en-US.properties | 12 +++++++++++- forge-gui/res/languages/es-ES.properties | 16 +++++++++++++++- forge-gui/res/languages/it-IT.properties | 16 +++++++++++++++- forge-gui/res/languages/zh-CN.properties | 16 +++++++++++++++- .../main/java/forge/download/AutoUpdater.java | 19 +++++++++---------- 6 files changed, 80 insertions(+), 15 deletions(-) diff --git a/forge-gui/res/languages/de-DE.properties b/forge-gui/res/languages/de-DE.properties index a8fd9291993..5dd27c2a6c6 100644 --- a/forge-gui/res/languages/de-DE.properties +++ b/forge-gui/res/languages/de-DE.properties @@ -52,6 +52,8 @@ btnResetJavaFutureCompatibilityWarnings=Java-Kompatibilitätswarnung zurücksetz btnClearImageCache=Leere Bildspeicher btnTokenPreviewer=Spielstein-Vorschau btnCopyToClipboard=In Zwischenablage kopieren +cbpAutoUpdater=Auto updater +nlAutoUpdater=Select the release channel to use for updating Forge cbpSelectLanguage=Sprache nlSelectLanguage=Wähle Sprache (Ist noch in Arbeit und nur teilweise umgesetzt.) (Neustart ist erforderlich.) cbRemoveSmall=Entferne kleine Kreaturen @@ -182,6 +184,7 @@ KeyboardShortcuts=Tastenkombinationen #VSubmenuAchievements.java lblAchievements=Errungenschaften #VSubmenuDownloaders.java +btnCheckForUpdates=Check for Updates btnDownloadSetPics=Bilder(LQ) Sets herunterladen btnDownloadPicsHQ=Bilder(HQ) Karten herunterladen (Sehr langsam!) btnDownloadPics=Bilder(LQ) Karten herunterladen @@ -194,6 +197,7 @@ btnImportPictures=Daten importieren btnHowToPlay=Wie man spielt btnDownloadPrices=Kartenpreise herunterladen btnLicensing=Lizenzhinweis +lblCheckForUpdates=Check Forge server to see if there''s a more recent release lblDownloadPics=Lädt ein Standardbild pro Karte. lblDownloadPicsHQ=Lädt ein HQ-Standardbild pro Karte. lblDownloadSetPics=Lädt alle Bilder pro Karte. Eines für jedes Set, in welchem die Karte auftauchte. @@ -2544,4 +2548,14 @@ lblPlayerDeckError={0} deck {1} lblInvalidCommanderGameTypeDeck=Invalid {0} Deck lblInvalidSchemeDeck=Invalid Scheme Deck lblInvalidPlanarDeck=Invalid Planar Deck -lblNoSelectedVanguardAvatarForPlayer=No Vanguard avatar selected for {0}. Please choose one or disable the Vanguard variant \ No newline at end of file +lblNoSelectedVanguardAvatarForPlayer=No Vanguard avatar selected for {0}. Please choose one or disable the Vanguard variant +#AutoUpdater.java +lblYouHaventSetUpdateChannel=You haven''t set an update channel. Do you want to check a channel now? +lblManualCheck=Manual Check +lblNewVersionForgeAvailableUpdateConfirm=A new version of Forge is available ({0}).\nYou are currently on version ({1})\n\nWould you like to update to the new version now? +lblUpdateNow=Update Now +lblUpdateLater=Update Later +lblNewVersionAvailable=New Version Available +lblNewVersionDownloading=Download the new version.. +lblForgeHasBeenUpdateRestartForgeToUseNewVersion=Forge has been downloaded. You should extract the package and restart Forge for the new version. +lblExitNowConfirm=Exit now? \ 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 d804d3f9c27..7aaac0b1de9 100644 --- a/forge-gui/res/languages/en-US.properties +++ b/forge-gui/res/languages/en-US.properties @@ -2548,4 +2548,14 @@ lblPlayerDeckError={0} deck {1} lblInvalidCommanderGameTypeDeck=Invalid {0} Deck lblInvalidSchemeDeck=Invalid Scheme Deck lblInvalidPlanarDeck=Invalid Planar Deck -lblNoSelectedVanguardAvatarForPlayer=No Vanguard avatar selected for {0}. Please choose one or disable the Vanguard variant \ No newline at end of file +lblNoSelectedVanguardAvatarForPlayer=No Vanguard avatar selected for {0}. Please choose one or disable the Vanguard variant +#AutoUpdater.java +lblYouHaventSetUpdateChannel=You haven''t set an update channel. Do you want to check a channel now? +lblManualCheck=Manual Check +lblNewVersionForgeAvailableUpdateConfirm=A new version of Forge is available ({0}).\nYou are currently on version ({1})\n\nWould you like to update to the new version now? +lblUpdateNow=Update Now +lblUpdateLater=Update Later +lblNewVersionAvailable=New Version Available +lblNewVersionDownloading=Download the new version.. +lblForgeHasBeenUpdateRestartForgeToUseNewVersion=Forge has been downloaded. You should extract the package and restart Forge for the new version. +lblExitNowConfirm=Exit now? \ 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 22d62661680..3a7d02bfcba 100644 --- a/forge-gui/res/languages/es-ES.properties +++ b/forge-gui/res/languages/es-ES.properties @@ -52,6 +52,8 @@ btnResetJavaFutureCompatibilityWarnings=Restablecer las advertencias de compatib btnClearImageCache=Limpiar Caché de Imágenes btnTokenPreviewer=Previsualizador de Fichas (Token) btnCopyToClipboard=Copiar al portapapeles +cbpAutoUpdater=Auto updater +nlAutoUpdater=Select the release channel to use for updating Forge cbpSelectLanguage=Idioma nlSelectLanguage=Seleccionar idioma (excepto partida). Todavía un trabajo en progreso) (Es necesario reiniciar Forge) cbRemoveSmall=Eliminar Pequeñas Criaturas @@ -182,6 +184,7 @@ KeyboardShortcuts=Atajos de teclado #VSubmenuAchievements.java lblAchievements=Logros #VSubmenuDownloaders.java +btnCheckForUpdates=Check for Updates btnDownloadSetPics=Descargar todas las Ediciones de Cartas btnDownloadPics=Descargar todas las Cartas btnDownloadPicsHQ=Descargar todas las Cartas en calidad alta (Muy lento!) @@ -194,6 +197,7 @@ btnImportPictures=Importar Datos btnHowToPlay=Cómo jugar (Inglés) btnDownloadPrices=Descargar los precios de las cartas btnLicensing=Detalles de la licencia +lblCheckForUpdates=Check Forge server to see if there''s a more recent release lblDownloadPics=Descargar la imagen de la carta por defecto para cada carta. lblDownloadPicsHQ=Descargar la imagen en calidad alta de la carta por defecto para cada carta. lblDownloadSetPics=Descargue todas las imágenes de cada carta (una por cada edición donde apareció la carta) @@ -2544,4 +2548,14 @@ lblPlayerDeckError={0} deck {1} lblInvalidCommanderGameTypeDeck=Invalid {0} Deck lblInvalidSchemeDeck=Invalid Scheme Deck lblInvalidPlanarDeck=Invalid Planar Deck -lblNoSelectedVanguardAvatarForPlayer=No Vanguard avatar selected for {0}. Please choose one or disable the Vanguard variant \ No newline at end of file +lblNoSelectedVanguardAvatarForPlayer=No Vanguard avatar selected for {0}. Please choose one or disable the Vanguard variant +#AutoUpdater.java +lblYouHaventSetUpdateChannel=You haven''t set an update channel. Do you want to check a channel now? +lblManualCheck=Manual Check +lblNewVersionForgeAvailableUpdateConfirm=A new version of Forge is available ({0}).\nYou are currently on version ({1})\n\nWould you like to update to the new version now? +lblUpdateNow=Update Now +lblUpdateLater=Update Later +lblNewVersionAvailable=New Version Available +lblNewVersionDownloading=Download the new version.. +lblForgeHasBeenUpdateRestartForgeToUseNewVersion=Forge has been downloaded. You should extract the package and restart Forge for the new version. +lblExitNowConfirm=Exit now? \ 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 f5015d614e2..7af4f72f02e 100644 --- a/forge-gui/res/languages/it-IT.properties +++ b/forge-gui/res/languages/it-IT.properties @@ -52,6 +52,8 @@ btnResetJavaFutureCompatibilityWarnings=Ripristina avvisi di compatibilità Java btnClearImageCache=Cancella cache immagini btnTokenPreviewer=Anteprima token btnCopyToClipboard=Copia negli appunti +cbpAutoUpdater=Auto updater +nlAutoUpdater=Select the release channel to use for updating Forge cbpSelectLanguage=Lingua nlSelectLanguage=Seleziona la lingua (parte di gioco esclusa. Ancora in fase di sviluppo) (RIAVVIO NECESSARIO) cbRemoveSmall=Rimuovi le piccole creature @@ -182,6 +184,7 @@ KeyboardShortcuts=Tasti rapidi #VSubmenuAchievements.java lblAchievements=realizzazioni #VSubmenuDownloaders.java +btnCheckForUpdates=Check for Updates btnDownloadSetPics=Scarica LQ Set Pictures btnDownloadPicsHQ=Scarica le immagini della scheda HQ (molto lento!) btnDownloadPics=Scarica LQ Card Pictures @@ -194,6 +197,7 @@ btnImportPictures=Importa dati btnHowToPlay=Come giocare btnDownloadPrices=Scarica i prezzi delle carte btnLicensing=Dettagli della licenza +lblCheckForUpdates=Check Forge server to see if there''s a more recent release lblDownloadPics=Scarica l''immagine della carta predefinita per ogni carta. lblDownloadPicsHQ=Scarica l''immagine HQ della scheda predefinita per ogni scheda. lblDownloadSetPics=Scarica tutte le immagini di ogni carta (una per ogni set in cui è apparso la carta) @@ -2544,4 +2548,14 @@ lblPlayerDeckError={0} deck {1} lblInvalidCommanderGameTypeDeck=Invalid {0} Deck lblInvalidSchemeDeck=Invalid Scheme Deck lblInvalidPlanarDeck=Invalid Planar Deck -lblNoSelectedVanguardAvatarForPlayer=No Vanguard avatar selected for {0}. Please choose one or disable the Vanguard variant \ No newline at end of file +lblNoSelectedVanguardAvatarForPlayer=No Vanguard avatar selected for {0}. Please choose one or disable the Vanguard variant +#AutoUpdater.java +lblYouHaventSetUpdateChannel=You haven''t set an update channel. Do you want to check a channel now? +lblManualCheck=Manual Check +lblNewVersionForgeAvailableUpdateConfirm=A new version of Forge is available ({0}).\nYou are currently on version ({1})\n\nWould you like to update to the new version now? +lblUpdateNow=Update Now +lblUpdateLater=Update Later +lblNewVersionAvailable=New Version Available +lblNewVersionDownloading=Download the new version.. +lblForgeHasBeenUpdateRestartForgeToUseNewVersion=Forge has been downloaded. You should extract the package and restart Forge for the new version. +lblExitNowConfirm=Exit now? \ No newline at end of file diff --git a/forge-gui/res/languages/zh-CN.properties b/forge-gui/res/languages/zh-CN.properties index bd28313a2cc..1f8626e2456 100644 --- a/forge-gui/res/languages/zh-CN.properties +++ b/forge-gui/res/languages/zh-CN.properties @@ -53,6 +53,8 @@ btnClearImageCache=清除图片缓存 btnTokenPreviewer=衍生物预览器 btnCopyToClipboard=复制到剪切板 cbpSelectLanguage=语言 +cbpAutoUpdater=自动更新 +nlAutoUpdater=选择用于更新Forge的发布渠道 nlSelectLanguage=选择语言（除了正在进行中的游戏）（需要重新启动） cbRemoveSmall=删除小生物 cbCardBased=包括基于单卡生成的套牌 @@ -182,6 +184,7 @@ KeyboardShortcuts=键盘快捷键 #VSubmenuAchievements.java lblAchievements=成就 #VSubmenuDownloaders.java +btnCheckForUpdates=检查更新 btnDownloadSetPics=下载低清系列图 btnDownloadPicsHQ=下载高清卡图（这很慢！） btnDownloadPics=下载低清卡图 @@ -194,6 +197,7 @@ btnImportPictures=导入数据 btnHowToPlay=如何玩 btnDownloadPrices=下载卡牌价格 btnLicensing=许可证详情 +lblCheckForUpdates=检查Forge服务器，查看是否有新的版本 lblDownloadPics=下载缺省牌的图片 lblDownloadPicsHQ=下载缺省牌的高清图片 lblDownloadSetPics=下载每张牌的图片（每张牌出现一次） @@ -2544,4 +2548,14 @@ lblPlayerDeckError={0}的套牌{1} lblInvalidCommanderGameTypeDeck=错误的{0}套牌 lblInvalidSchemeDeck=无效的阴谋套牌 lblInvalidPlanarDeck=无效的时空套牌 -lblNoSelectedVanguardAvatarForPlayer={0}没有选择以下先锋Avatar。请选择一种或者禁用先锋变种。 \ No newline at end of file +lblNoSelectedVanguardAvatarForPlayer={0}没有选择以下先锋Avatar。请选择一种或者禁用先锋变种。 +#AutoUpdater.java +lblYouHaventSetUpdateChannel=你还没设置更新频道。你要立刻检查更新吗？ +lblManualCheck=手动检查更新 +lblNewVersionForgeAvailableUpdateConfirm=有新版本Forge可用({0}).\n你当前的Forge版本({1})\n\n你要更新到新版本吗？ +lblUpdateNow=现在更新 +lblUpdateLater=稍后更新 +lblNewVersionAvailable=有新版本可用 +lblNewVersionDownloading=下载新版本中 +lblForgeHasBeenUpdateRestartForgeToUseNewVersion=Forge has been downloaded. You should extract the package and restart Forge for the new version. +lblExitNowConfirm=现在退出吗？ \ No newline at end of file diff --git a/forge-gui/src/main/java/forge/download/AutoUpdater.java b/forge-gui/src/main/java/forge/download/AutoUpdater.java index 8d050efecef..8e731be5c55 100644 --- a/forge-gui/src/main/java/forge/download/AutoUpdater.java +++ b/forge-gui/src/main/java/forge/download/AutoUpdater.java @@ -6,6 +6,7 @@ import forge.model.FModel; import forge.properties.ForgePreferences; import forge.util.BuildInfo; import forge.util.FileUtil; +import forge.util.Localizer; import forge.util.WaitCallback; import forge.util.gui.SOptionPane; import org.apache.commons.lang3.StringUtils; @@ -28,6 +29,7 @@ public class AutoUpdater { private final String RELEASE_MAVEN_METADATA = "https://releases.cardforge.org/forge/forge-gui-desktop/maven-metadata.xml"; private static final boolean VERSION_FROM_METADATA = true; private static final String TMP_DIR = "tmp/"; + private static final Localizer localizer = Localizer.getInstance(); public static String[] updateChannels = new String[]{ "none", "snapshot", "release"}; @@ -74,9 +76,9 @@ public class AutoUpdater { // TODO This doesn't work yet, because FSkin isn't loaded at the time. return false; } else if (updateChannel.equals("none")) { - String message = "You haven't set an update channel. Do you want to check a channel now?"; + String message = localizer.getMessage("lblYouHaventSetUpdateChannel"); List options = ImmutableList.of("Cancel", "release", "snapshot"); - int option = SOptionPane.showOptionDialog(message, "Manual Check", null, options, 0); + int option = SOptionPane.showOptionDialog(message, localizer.getMessage("lblManualCheck"), null, options, 0); if (option == 0) { return false; } else { @@ -180,12 +182,9 @@ public class AutoUpdater { return downloadFromBrowser(); } - String message = "A new version of Forge is available (" + version + ").\n" + - "You are currently on version (" + buildVersion + ").\n\n" + - "Would you like to update to the new version now?"; - - final List options = ImmutableList.of("Update Now", "Update Later"); - if (SOptionPane.showOptionDialog(message, "New Version Available", null, options, 0) == 0) { + String message = localizer.getMessage("lblNewVersionForgeAvailableUpdateConfirm", version, buildVersion); + final List options = ImmutableList.of(localizer.getMessage("lblUpdateNow"), localizer.getMessage("lblUpdateLater")); + if (SOptionPane.showOptionDialog(message, localizer.getMessage("lblNewVersionAvailable"), null, options, 0) == 0) { return downloadFromForge(); } @@ -208,7 +207,7 @@ public class AutoUpdater { WaitCallback callback = new WaitCallback() { @Override public void run() { - GuiBase.getInterface().download(new GuiDownloadZipService("Auto Updater", "Download the new version..", packageUrl, "tmp/", null, null) { + GuiBase.getInterface().download(new GuiDownloadZipService("Auto Updater", localizer.getMessage("lblNewVersionDownloading"), packageUrl, "tmp/", null, null) { @Override public void downloadAndUnzip() { packagePath = download(version + "-upgrade.tar.bz2"); @@ -240,7 +239,7 @@ public class AutoUpdater { } private void restartForge() { - if (isLoading || SOptionPane.showConfirmDialog("Forge has been downloaded. You should extract the package and restart Forge for the new version.", "Exit now?")) { + if (isLoading || SOptionPane.showConfirmDialog(localizer.getMessage("lblForgeHasBeenUpdateRestartForgeToUseNewVersion"), localizer.getMessage("lblExitNowConfirm"))) { System.exit(0); } }