Changeset 1023 for java/installer2/src/net
- Timestamp:
- May 30, 2015, 3:14:44 PM (9 years ago)
- Location:
- java/installer2/src/net/oni2/aeinstaller
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
java/installer2/src/net/oni2/aeinstaller/AEInstaller.properties
r1020 r1023 1 1 appname=AE Installer 2 2 appversion=.2 22 appversion=.23 -
java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java
r988 r1023 55 55 private static ResourceBundle basicBundle = ResourceBundle 56 56 .getBundle("net.oni2.aeinstaller.AEInstaller"); 57 p rivatestatic ResourceBundle globalBundle;57 public static ResourceBundle globalBundle; 58 58 59 59 private static Application app = null; -
java/installer2/src/net/oni2/aeinstaller/backend/oni/management/Initializer.java
r749 r1023 11 11 import java.util.Vector; 12 12 13 import net.oni2.aeinstaller.AEInstaller2; 13 14 import net.oni2.aeinstaller.backend.Paths; 14 15 import net.oni2.aeinstaller.backend.oni.OniSplit; … … 68 69 69 70 listener.installProgressUpdate(stepsDone, totalSteps, 70 "Cleaning up directories");71 AEInstaller2.globalBundle.getString("coreInitializer.cleanup")); 71 72 createEmptyPath(Paths.getVanillaOnisPath()); 72 73 createEmptyPath(init); … … 87 88 log.println("\t\tExporting"); 88 89 listener.installProgressUpdate(stepsDone, totalSteps, 89 "Exporting vanilla level " + levelNumber);90 AEInstaller2.globalBundle.getString("coreInitializer.exportVanilla").replaceAll("%1", String.valueOf(levelNumber))); 90 91 91 92 // Edition/GameDataFolder/level*_Final/ … … 116 117 log.println("\t" + levelName); 117 118 listener.installProgressUpdate(stepsDone, totalSteps, 118 "Creating globalized " + levelName);119 AEInstaller2.globalBundle.getString("coreInitializer.globalize").replaceAll("%1", levelName)); 119 120 120 121 Vector<File> folders = new Vector<File>(); … … 132 133 133 134 listener.installProgressUpdate(stepsDone, totalSteps, 134 "Copying basic files");135 AEInstaller2.globalBundle.getString("coreInitializer.copyBasicFiles")); 135 136 // Copy Oni-configs 136 137 File persistVanilla = new File(Paths.getOniBasePath(), -
java/installer2/src/net/oni2/aeinstaller/backend/oni/management/Installer.java
r1021 r1023 276 276 private static void combineBSLFolders(TreeSet<Package> mods, 277 277 InstallProgressListener listener, Logger log) { 278 listener.installProgressUpdate(95, 100, "Installing BSL files");278 listener.installProgressUpdate(95, 100, AEInstaller2.globalBundle.getString("modInstaller.installBsl")); 279 279 log.println(); 280 280 log.println("Installing BSL files"); … … 393 393 log.println(); 394 394 log.println("Applying XML patches"); 395 listener.installProgressUpdate(0, 1, "Applying XML patches");395 listener.installProgressUpdate(0, 1, AEInstaller2.globalBundle.getString("modInstaller.applyXmlPatches")); 396 396 397 397 long startMS = new Date().getTime(); … … 551 551 log.println("\tLevel " + l); 552 552 listener.installProgressUpdate(stepsDone, totalSteps, 553 "Installing level " + l);553 AEInstaller2.globalBundle.getString("modInstaller.buildingLevelN").replaceAll("%1", l.toString())); 554 554 555 555 if ((levelsUpdated == null) … … 605 605 606 606 private static void copyPlainFiles(final Logger log, TreeSet<Package> mods, InstallProgressListener listener) { 607 listener.installProgressUpdate(97, 100, "Copying plain files");607 listener.installProgressUpdate(97, 100, AEInstaller2.globalBundle.getString("modInstaller.copyPlainFiles")); 608 608 log.println(); 609 609 log.println("Copying plain files from mods"); -
java/installer2/src/net/oni2/aeinstaller/gui/MainWin.java
r1019 r1023 277 277 for (final Package m : mods) { 278 278 size += m.getZipSize(); 279 JCheckBox check = new JCheckBox( "Mod: " + m.getName()279 JCheckBox check = new JCheckBox(bundle.getString("mod") + ": " + m.getName() 280 280 + " (" + SizeFormatter.format(m.getZipSize(), 1) 281 281 + ")"); … … 302 302 for (final Package m : tools) { 303 303 size += m.getZipSize(); 304 JCheckBox check = new JCheckBox( "Tool: " + m.getName()304 JCheckBox check = new JCheckBox(bundle.getString("tool") + ": " + m.getName() 305 305 + " (" + SizeFormatter.format(m.getZipSize(), 1) 306 306 + ")"); … … 425 425 + bundle.getString("newPackages.text") + "</html>"; 426 426 if (modsString.length() > 0) { 427 modsString.insert(0, "Mods:<ul>");427 modsString.insert(0, bundle.getString("mods") + ":<ul>"); 428 428 modsString.append("</ul>"); 429 429 message = message.replaceAll("%1", modsString.toString()); … … 432 432 } 433 433 if (toolsString.length() > 0) { 434 toolsString.insert(0, "Tools:<ul>");434 toolsString.insert(0, bundle.getString("tools") + ":<ul>"); 435 435 toolsString.append("</ul>"); 436 436 message = message.replaceAll("%2", toolsString.toString()); -
java/installer2/src/net/oni2/aeinstaller/localization/Global.properties
r804 r1023 13 13 aeiUpdateAvailable.title=Update available! 14 14 aeiUpdateAvailable.text=An update for the AEInstaller is available.\nPlease update now by selecting Yes. 15 16 17 modInstaller.applyXmlPatches=Applying XML patches 18 modInstaller.buildingLevelN=Installing level %1 19 modInstaller.copyPlainFiles=Copying plain files 20 modInstaller.installBsl=Installing BSL files 21 22 coreInitializer.cleanup=Cleaning up directories 23 coreInitializer.exportVanilla=Exporting vanilla level %1 24 coreInitializer.globalize=Creating globalized level %1 25 coreInitializer.copyBasicFiles=Copying basic files -
java/installer2/src/net/oni2/aeinstaller/localization/MainWin.properties
r988 r1023 138 138 exeNotFound.text=Executable was not found. 139 139 exeNotFound.title=Exe not found 140 141 mod=Mod 142 mods=Mods 143 tool=Tool 144 tools=Tools
Note:
See TracChangeset
for help on using the changeset viewer.