From 88c94cfce1b4b67992bd41ce443eb0129a3f2caf Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Mon, 17 Oct 2016 00:36:14 +0200 Subject: [PATCH 1/2] [FEATURE] Started implementing translations For issue #100 --- pom.xml | 2 +- src/main/java/org/parabot/Landing.java | 23 ++++++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 1983648..15feec6 100755 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ org.parabot internal-api - 1.02.7 + 1.03.1 diff --git a/src/main/java/org/parabot/Landing.java b/src/main/java/org/parabot/Landing.java index 4d6c1d0..9be2c18 100644 --- a/src/main/java/org/parabot/Landing.java +++ b/src/main/java/org/parabot/Landing.java @@ -1,5 +1,6 @@ package org.parabot; +import org.parabot.api.translations.TranslationHelper; import org.parabot.core.Configuration; import org.parabot.core.Core; import org.parabot.core.Directories; @@ -32,10 +33,10 @@ public final class Landing { parseArgs(args); - Core.verbose("Debug mode: " + Core.inDebugMode()); + Core.verbose(TranslationHelper.translate("DEBUG_MODE") + Core.inDebugMode()); try { - Core.verbose("Setting look and feel: " + Core.verbose(TranslationHelper.translate("SETTING_LOOK_AND_FEEL") + UIManager.getSystemLookAndFeelClassName()); UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (Throwable t) { @@ -43,25 +44,25 @@ public final class Landing { } if (!Core.inDebugMode() && !Core.isValid() && Core.hasValidation()) { - UILog.log("Updates", - "Please download the newest version of Parabot at " + UILog.log(TranslationHelper.translate("UPDATES"), + TranslationHelper.translate("DOWNLOAD_UPDATE_PARABOT_AT") + Configuration.DOWNLOAD_BOT, JOptionPane.INFORMATION_MESSAGE); URI uri = URI.create(Configuration.API_DOWNLOAD_BOT); try { Desktop.getDesktop().browse(uri); } catch (IOException e1) { - JOptionPane.showMessageDialog(null, "Connection Error", - "Error", JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(null, TranslationHelper.translate("CONNECTION_ERROR"), + TranslationHelper.translate("ERROR"), JOptionPane.ERROR_MESSAGE); e1.printStackTrace(); } return; } - Core.verbose("Validating directories..."); + Core.verbose(TranslationHelper.translate("VALIDATING_DIRECTORIES")); Directories.validate(); - Core.verbose("Validating account manager..."); + Core.verbose(TranslationHelper.translate("VALIDATION_ACCOUNT_MANAGER")); AccountManager.validate(); if (username != null && password != null) { @@ -71,7 +72,7 @@ public final class Landing { return; } - Core.verbose("Starting login gui..."); + Core.verbose(TranslationHelper.translate("STARTING_LOGIN_GUI")); new BotUI(null, null); } @@ -82,7 +83,7 @@ public final class Landing { case "-createdirs": Directories.validate(); System.out - .println("Directories created, you can now run parabot."); + .println(TranslationHelper.translate(("DIRECTORIES_CREATED"))); System.exit(0); break; case "-debug": @@ -131,7 +132,7 @@ public final class Landing { case "-proxy": ProxyType type = ProxyType.valueOf(args[++i].toUpperCase()); if (type == null) { - System.err.println("Invalid proxy type: " + args[i]); + System.err.println(TranslationHelper.translate("INVALID_PROXY_TYPE") + args[i]); System.exit(1); return; } From c9751094eb06547be27c74c228aae487d05039fb Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Mon, 17 Oct 2016 15:31:04 +0200 Subject: [PATCH 2/2] [FEATURE] Added translations for Context --- src/main/java/org/parabot/core/Context.java | 27 +++++++++++---------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/parabot/core/Context.java b/src/main/java/org/parabot/core/Context.java index 98a0896..bc11df5 100644 --- a/src/main/java/org/parabot/core/Context.java +++ b/src/main/java/org/parabot/core/Context.java @@ -1,6 +1,7 @@ package org.parabot.core; import org.json.simple.parser.JSONParser; +import org.parabot.api.translations.TranslationHelper; import org.parabot.core.asm.ASMClassLoader; import org.parabot.core.classpath.ClassPath; import org.parabot.core.desc.ServerProviderInfo; @@ -164,18 +165,18 @@ public class Context { */ public void load() { BotUI.getInstance().getJMenuBar().remove(2); - Core.verbose("Parsing server jar..."); + Core.verbose(TranslationHelper.translate("PARSING_SERVER_JAR")); serverProvider.init(); serverProvider.parseJar(); - Core.verbose("Done."); - Core.verbose("Injecting hooks..."); + Core.verbose(TranslationHelper.translate("DONE")); + Core.verbose(TranslationHelper.translate("INJECTING_HOOKS")); serverProvider.injectHooks(); - Core.verbose("Done."); - Core.verbose("Fetching game applet..."); + Core.verbose(TranslationHelper.translate("DONE")); + Core.verbose(TranslationHelper.translate("FETCHING_GAME_APPLET")); if(Core.shouldDump()) { - Core.verbose("Dumping injected client..."); + Core.verbose(TranslationHelper.translate("DUMPING_INJECTED_CLIENT")); classPath.dump(new File(Directories.getWorkspace(), "dump.jar")); - Core.verbose("Done."); + Core.verbose(TranslationHelper.translate("DONE")); } Applet applet = serverProvider.fetchApplet(); // if applet is null the server provider will call setApplet itself @@ -195,7 +196,7 @@ public class Context { setClientInstance(gameApplet); } - Core.verbose("Applet fetched."); + Core.verbose(TranslationHelper.translate("APPLET_FETCHED")); final GamePanel panel = GamePanel.getInstance(); final Dimension appletSize = serverProvider.getGameDimensions(); @@ -221,14 +222,14 @@ public class Context { } }, 1000); - Core.verbose("Initializing mouse..."); + Core.verbose(TranslationHelper.translate("INIT_MOUSE")); serverProvider.initMouse(); - Core.verbose("Done."); - Core.verbose("Initializing keyboard..."); + Core.verbose(TranslationHelper.translate("DONE")); + Core.verbose(TranslationHelper.translate("INIT_KEYBOARD")); serverProvider.initKeyboard(); - Core.verbose("Done."); + Core.verbose(TranslationHelper.translate("DONE")); - Core.verbose("Initializing key listener..."); + Core.verbose(TranslationHelper.translate("INIT_KEY_LISTENER")); this.pbKeyListener = new PBKeyListener(); applet.addKeyListener(this.pbKeyListener);