Merge branch 'italian-translation' into next

[jSite.git] / src / main / java / de / todesbaum / jsite / main / Main.java

diff --git a/src/main/java/de/todesbaum/jsite/main/Main.java b/src/main/java/de/todesbaum/jsite/main/Main.java
index 5536543..a6ac559 100644 (file)
--- a/src/main/java/de/todesbaum/jsite/main/Main.java
+++ b/src/main/java/de/todesbaum/jsite/main/Main.java
@@ -80,7 +80,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
        private static final Logger logger = Logger.getLogger(Main.class.getName());
 
        /** The version. */
-       private static final Version VERSION = new Version(0, 11, 1);
+       private static final Version VERSION = new Version(0, 12);
 
        /** The configuration. */
        private Configuration configuration;
@@ -122,7 +122,14 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
        }
 
        /** The supported locales. */
-       private static final Locale[] SUPPORTED_LOCALES = new Locale[] { Locale.ENGLISH, Locale.GERMAN, Locale.FRENCH, new Locale("pl") };
+       private static final Locale[] SUPPORTED_LOCALES = new Locale[] {
+                       Locale.ENGLISH,
+                       Locale.GERMAN,
+                       Locale.FRENCH,
+                       Locale.ITALIAN,
+                       new Locale("pl"),
+                       new Locale("fi")
+       };
 
        /** The actions that switch the language. */
        private Map<Locale, Action> languageActions = new HashMap<Locale, Action>();
@@ -190,7 +197,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
                jSiteIcon = IconLoader.loadIcon("/jsite-icon.png");
                wizard.setIcon(jSiteIcon);
 
-               updateChecker = new UpdateChecker(freenetInterface);
+               updateChecker = new UpdateChecker(freenetInterface, getVersion());
                updateChecker.addUpdateListener(this);
                updateChecker.start();
 
@@ -477,7 +484,6 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
                ((PreferencesPage) pages.get(PageType.PAGE_PREFERENCES)).setHasCustomConfiguration(configuration.getConfigurationLocator().isValidLocation(ConfigurationLocation.CUSTOM));
                ((PreferencesPage) pages.get(PageType.PAGE_PREFERENCES)).setUseEarlyEncode(configuration.useEarlyEncode());
                ((PreferencesPage) pages.get(PageType.PAGE_PREFERENCES)).setPriority(configuration.getPriority());
-               ((PreferencesPage) pages.get(PageType.PAGE_PREFERENCES)).setManifestPutter(configuration.getManifestPutter());
                showPage(PageType.PAGE_PREFERENCES);
                optionsPreferencesAction.setEnabled(false);
                wizard.setNextEnabled(true);
@@ -582,7 +588,6 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
                        projectInsertPage.setTempDirectory(tempDirectory);
                        projectInsertPage.setUseEarlyEncode(configuration.useEarlyEncode());
                        projectInsertPage.setPriority(configuration.getPriority());
-                       projectInsertPage.setManifestPutter(configuration.getManifestPutter());
                        projectInsertPage.startInsert();
                        nodeMenu.setEnabled(false);
                        optionsPreferencesAction.setEnabled(false);
@@ -601,7 +606,6 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
                        optionsPreferencesAction.setEnabled(true);
                        configuration.setUseEarlyEncode(preferencesPage.useEarlyEncode());
                        configuration.setPriority(preferencesPage.getPriority());
-                       configuration.setManifestPutter(preferencesPage.getManifestPutter());
                        configuration.setConfigurationLocation(preferencesPage.getConfigurationLocation());
                }
        }