Changeset 1023 for java/installer2/src

Timestamp:

May 30, 2015, 3:14:44 PM (9 years ago)

Author:

alloc

Message:

AEI 2.23: More strings in localization

Location:

java/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller.properties (modified) (1 diff)
• AEInstaller2.java (modified) (1 diff)
• backend/oni/management/Initializer.java (modified) (5 diffs)
• backend/oni/management/Installer.java (modified) (4 diffs)
• gui/MainWin.java (modified) (4 diffs)
• localization/Global.properties (modified) (1 diff)
• localization/MainWin.properties (modified) (1 diff)

java/installer2/src/net/oni2/aeinstaller/AEInstaller.properties

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=.22
+appversion=.23

java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java

@@ -55 +55 @@
         private static ResourceBundle basicBundle = ResourceBundle
                         .getBundle("net.oni2.aeinstaller.AEInstaller");
-        private static ResourceBundle globalBundle;
+        public static ResourceBundle globalBundle;
 
         private static Application app = null;

java/installer2/src/net/oni2/aeinstaller/backend/oni/management/Initializer.java

@@ -11 +11 @@
 import java.util.Vector;
 
+import net.oni2.aeinstaller.AEInstaller2;
 import net.oni2.aeinstaller.backend.Paths;
 import net.oni2.aeinstaller.backend.oni.OniSplit;
@@ -68 +69 @@
 
                         listener.installProgressUpdate(stepsDone, totalSteps,
-                                        "Cleaning up directories");
+                                        AEInstaller2.globalBundle.getString("coreInitializer.cleanup"));
                         createEmptyPath(Paths.getVanillaOnisPath());
                         createEmptyPath(init);
@@ -87 +88 @@
                                 log.println("\t\tExporting");
                                 listener.installProgressUpdate(stepsDone, totalSteps,
-                                                "Exporting vanilla level " + levelNumber);
+                                                AEInstaller2.globalBundle.getString("coreInitializer.exportVanilla").replaceAll("%1", String.valueOf(levelNumber)));
 
                                 // Edition/GameDataFolder/level*_Final/
@@ -116 +117 @@
                                 log.println("\t" + levelName);
                                 listener.installProgressUpdate(stepsDone, totalSteps,
-                                                "Creating globalized " + levelName);
+                                                AEInstaller2.globalBundle.getString("coreInitializer.globalize").replaceAll("%1", levelName));
 
                                 Vector<File> folders = new Vector<File>();
@@ -132 +133 @@
 
                         listener.installProgressUpdate(stepsDone, totalSteps,
-                                        "Copying basic files");
+                                        AEInstaller2.globalBundle.getString("coreInitializer.copyBasicFiles"));
                         // Copy Oni-configs
                         File persistVanilla = new File(Paths.getOniBasePath(),

java/installer2/src/net/oni2/aeinstaller/backend/oni/management/Installer.java

@@ -276 +276 @@
         private static void combineBSLFolders(TreeSet<Package> mods,
                         InstallProgressListener listener, Logger log) {
-                listener.installProgressUpdate(95, 100, "Installing BSL files");
+                listener.installProgressUpdate(95, 100, AEInstaller2.globalBundle.getString("modInstaller.installBsl"));
                 log.println();
                 log.println("Installing BSL files");
@@ -393 +393 @@
                 log.println();
                 log.println("Applying XML patches");
-                listener.installProgressUpdate(0, 1, "Applying XML patches");
+                listener.installProgressUpdate(0, 1, AEInstaller2.globalBundle.getString("modInstaller.applyXmlPatches"));
 
                 long startMS = new Date().getTime();
@@ -551 +551 @@
                         log.println("\tLevel " + l);
                         listener.installProgressUpdate(stepsDone, totalSteps,
-                                        "Installing level " + l);
+                                        AEInstaller2.globalBundle.getString("modInstaller.buildingLevelN").replaceAll("%1", l.toString()));
 
                         if ((levelsUpdated == null)
@@ -605 +605 @@
 
         private static void copyPlainFiles(final Logger log, TreeSet<Package> mods, InstallProgressListener listener) {
-                listener.installProgressUpdate(97, 100, "Copying plain files");
+                listener.installProgressUpdate(97, 100, AEInstaller2.globalBundle.getString("modInstaller.copyPlainFiles"));
                 log.println();
                 log.println("Copying plain files from mods");

java/installer2/src/net/oni2/aeinstaller/gui/MainWin.java

@@ -277 +277 @@
                                 for (final Package m : mods) {
                                         size += m.getZipSize();
-                                        JCheckBox check = new JCheckBox("Mod: " + m.getName()
+                                        JCheckBox check = new JCheckBox(bundle.getString("mod") + ": " + m.getName()
                                                         + " (" + SizeFormatter.format(m.getZipSize(), 1)
                                                         + ")");
@@ -302 +302 @@
                                 for (final Package m : tools) {
                                         size += m.getZipSize();
-                                        JCheckBox check = new JCheckBox("Tool: " + m.getName()
+                                        JCheckBox check = new JCheckBox(bundle.getString("tool") + ": " + m.getName()
                                                         + " (" + SizeFormatter.format(m.getZipSize(), 1)
                                                         + ")");
@@ -425 +425 @@
                                                 + bundle.getString("newPackages.text") + "</html>";
                                 if (modsString.length() > 0) {
-                                        modsString.insert(0, "Mods:<ul>");
+                                        modsString.insert(0, bundle.getString("mods") + ":<ul>");
                                         modsString.append("</ul>");
                                         message = message.replaceAll("%1", modsString.toString());
@@ -432 +432 @@
                                 }
                                 if (toolsString.length() > 0) {
-                                        toolsString.insert(0, "Tools:<ul>");
+                                        toolsString.insert(0, bundle.getString("tools") + ":<ul>");
                                         toolsString.append("</ul>");
                                         message = message.replaceAll("%2", toolsString.toString());

java/installer2/src/net/oni2/aeinstaller/localization/Global.properties

@@ -13 +13 @@
 aeiUpdateAvailable.title=Update available!
 aeiUpdateAvailable.text=An update for the AEInstaller is available.\nPlease update now by selecting Yes.
+
+
+modInstaller.applyXmlPatches=Applying XML patches
+modInstaller.buildingLevelN=Installing level %1
+modInstaller.copyPlainFiles=Copying plain files
+modInstaller.installBsl=Installing BSL files
+
+coreInitializer.cleanup=Cleaning up directories
+coreInitializer.exportVanilla=Exporting vanilla level %1
+coreInitializer.globalize=Creating globalized level %1
+coreInitializer.copyBasicFiles=Copying basic files

java/installer2/src/net/oni2/aeinstaller/localization/MainWin.properties

@@ -138 +138 @@
 exeNotFound.text=Executable was not found.
 exeNotFound.title=Exe not found
+
+mod=Mod
+mods=Mods
+tool=Tool
+tools=Tools