Changeset 629 for AE


Ignore:
Timestamp:
Jan 18, 2013, 12:17:17 PM (7 years ago)
Author:
alloc
Message:

AEI2 0.88:

  • Localization files moved to common localization package
Location:
AE/installer2/src/net/oni2/aeinstaller
Files:
7 added
5 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • AE/installer2/src/net/oni2/aeinstaller/AEInstaller.properties

    r627 r629  
    11appname=AE Installer 2
    2 appversion=0.87
    3 
    4 invalidPath.title=Wrong directory
    5 invalidPath.text=This program has to be placed in the subfolder Edition/AEInstaller inside a vanilla Oni folder.\nThe full path of the .jar-file has to be:\nOniFolder/Edition/AEInstaller/AEInstaller2.jar
    6 
    7 dotNetMissing.title=.NET is not installed
    8 dotNetMissing.text=.NET, which is required to use this tool, is not installed on this machine.<br>Please download and install it:<br>%1
    9 
    10 offlineMode.title=Offline mode
    11 offlineMode.text=Connection to the ModDepot could not be established.\nAEI will run in offline mode.\nUpdates or installation of mods not already downloaded will not be possible.
     2appversion=0.88
  • AE/installer2/src/net/oni2/aeinstaller/AEInstaller2.java

    r628 r629  
    3737
    3838        private static ResourceBundle imagesBundle = ResourceBundle
    39                         .getBundle(AEInstaller2.class.getPackage().getName() + ".Images");
     39                        .getBundle("net.oni2.aeinstaller.Images");
    4040        private static ResourceBundle basicBundle = ResourceBundle
    41                         .getBundle(AEInstaller2.class.getPackage().getName()
    42                                         + ".AEInstaller");
     41                        .getBundle("net.oni2.aeinstaller.AEInstaller");
     42        private static ResourceBundle startupBundle = ResourceBundle
     43                        .getBundle("net.oni2.aeinstaller.localization.Startup");
    4344
    4445        private static Application app = null;
     
    9293                SwingJavaBuilder.getConfig().addResourceBundle(imagesBundle);
    9394                SwingJavaBuilder.getConfig().addResourceBundle(basicBundle);
     95                SwingJavaBuilder.getConfig().addResourceBundle(startupBundle);
    9496                SwingJavaBuilder.getConfig().setMarkInvalidResourceBundleKeys(true);
    9597                SwingJavaBuilder.getConfig().addType("JToolBarSeparator",
     
    160162                                        dlUrl = "http://www.go-mono.com/mono-downloads/download.html";
    161163                        }
    162                         hll.setText(basicBundle.getString("dotNetMissing.text").replaceAll(
     164                        hll.setText(startupBundle.getString("dotNetMissing.text").replaceAll(
    163165                                        "%1", String.format("<a href=\"%s\">%s</a>", dlUrl, dlUrl)));
    164166                        JOptionPane.showMessageDialog(null, hll,
    165                                         basicBundle.getString("dotNetMissing.title"),
     167                                        startupBundle.getString("dotNetMissing.title"),
    166168                                        JOptionPane.ERROR_MESSAGE);
    167169                        return;
     
    170172                if (!Installer.verifyRunningDirectory()) {
    171173                        JOptionPane.showMessageDialog(null,
    172                                         basicBundle.getString("invalidPath.text"),
    173                                         basicBundle.getString("invalidPath.title"),
     174                                        startupBundle.getString("invalidPath.text"),
     175                                        startupBundle.getString("invalidPath.title"),
    174176                                        JOptionPane.ERROR_MESSAGE);
    175177                        if (!Settings.isDebug()) {
     
    181183                if (offline) {
    182184                        JOptionPane.showMessageDialog(null,
    183                                         basicBundle.getString("offlineMode.text"),
    184                                         basicBundle.getString("offlineMode.title"),
     185                                        startupBundle.getString("offlineMode.text"),
     186                                        startupBundle.getString("offlineMode.title"),
    185187                                        JOptionPane.INFORMATION_MESSAGE);
    186188                }
  • AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java

    r627 r629  
    8686        private static final long serialVersionUID = -4027395051382659650L;
    8787
    88         private ResourceBundle bundle = ResourceBundle.getBundle(getClass()
    89                         .getName());
     88        private ResourceBundle bundle = ResourceBundle
     89                        .getBundle("net.oni2.aeinstaller.localization."
     90                                        + getClass().getSimpleName());
    9091        @SuppressWarnings("unused")
    9192        private BuildResult result = SwingJavaBuilder.build(this, bundle);
  • AE/installer2/src/net/oni2/aeinstaller/gui/downloadwindow/Downloader.java

    r606 r629  
    2424        private static final long serialVersionUID = 9097967828001263776L;
    2525
    26         private ResourceBundle bundle = ResourceBundle.getBundle(getClass()
    27                         .getName());
     26        private ResourceBundle bundle = ResourceBundle
     27                        .getBundle("net.oni2.aeinstaller.localization."
     28                                        + getClass().getSimpleName());
    2829        @SuppressWarnings("unused")
    2930        private BuildResult result = SwingJavaBuilder.build(this, bundle);
  • AE/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTableModel.java

    r608 r629  
    2020        private static final long serialVersionUID = -8278155705802697354L;
    2121
    22         private ResourceBundle bundle = ResourceBundle.getBundle(getClass()
    23                         .getName());
     22        private ResourceBundle bundle = ResourceBundle
     23                        .getBundle("net.oni2.aeinstaller.localization."
     24                                        + getClass().getSimpleName());
    2425
    2526        private Vector<Mod> items = new Vector<Mod>();
  • AE/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.java

    r625 r629  
    2525        private static final long serialVersionUID = -5719515325671846620L;
    2626
    27         private ResourceBundle bundle = ResourceBundle.getBundle(getClass()
    28                         .getName());
     27        private ResourceBundle bundle = ResourceBundle
     28                        .getBundle("net.oni2.aeinstaller.localization."
     29                                        + getClass().getSimpleName());
    2930        @SuppressWarnings("unused")
    3031        private BuildResult result = SwingJavaBuilder.build(this, bundle);
  • AE/installer2/src/net/oni2/aeinstaller/gui/toolmanager/ToolManager.java

    r626 r629  
    3535        private static final long serialVersionUID = 343221630538866384L;
    3636
    37         private ResourceBundle bundle = ResourceBundle.getBundle(getClass()
    38                         .getName());
     37        private ResourceBundle bundle = ResourceBundle
     38                        .getBundle("net.oni2.aeinstaller.localization."
     39                                        + getClass().getSimpleName());
    3940        @SuppressWarnings("unused")
    4041        private BuildResult result = SwingJavaBuilder.build(this, bundle);
Note: See TracChangeset for help on using the changeset viewer.