projects / jSite.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a7d2ac9)
Show name and location of configuration file to be overwritten.
authorDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Tue, 16 Aug 2011 19:37:12 +0000 (21:37 +0200)
committerDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Thu, 3 Nov 2011 07:45:19 +0000 (08:45 +0100)
src/de/todesbaum/jsite/i18n/jSite.properties patch | blob | history
src/de/todesbaum/jsite/main/Main.java patch | blob | history

diff --git a/src/de/todesbaum/jsite/i18n/jSite.properties b/src/de/todesbaum/jsite/i18n/jSite.properties
index bf5c5d1..c33aef0 100644 (file)
--- a/src/de/todesbaum/jsite/i18n/jSite.properties
+++ b/src/de/todesbaum/jsite/i18n/jSite.properties
@@ -35,7 +35,7 @@ jsite.wizard.next=Next
 jsite.wizard.quit=Quit
 
 jsite.quit.question=Do you really want to quit?
-jsite.quite.overwrite-configuration=<html><b>Overwrite configuration?</b><br><br>A configuration file already exists.<br>Should it be overwritten?</html>
+jsite.quite.overwrite-configuration=<html><b>Overwrite configuration?</b><br><br>A configuration file already exists:<br><code>{0}<br><br>Should it be overwritten?</html>
 jsite.quit.config-not-saved=<html><b>Configuration not saved</b><br><br>The configuration could not be saved.<br>Do you want to quit anyway?</html>
 
 jsite.menu.languages=Languages
diff --git a/src/de/todesbaum/jsite/main/Main.java b/src/de/todesbaum/jsite/main/Main.java
index 4c7752f..205f55a 100644 (file)
--- a/src/de/todesbaum/jsite/main/Main.java
+++ b/src/de/todesbaum/jsite/main/Main.java
@@ -595,7 +595,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
                }
                if (JOptionPane.showConfirmDialog(wizard, I18n.getMessage("jsite.quit.question"), null, JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE) == JOptionPane.OK_OPTION) {
                        if (isOverwritingConfiguration()) {
-                               if (JOptionPane.showConfirmDialog(wizard, I18n.getMessage("jsite.quite.overwrite-configuration"), null, JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.OK_OPTION) {
+                               if (JOptionPane.showConfirmDialog(wizard, MessageFormat.format(I18n.getMessage("jsite.quite.overwrite-configuration"), configuration.getConfigurationLocator().getFile(configuration.getConfigurationDirectory())), null, JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.OK_OPTION) {
                                        if (saveConfiguration()) {
                                                System.exit(0);
                                        }
jSite – Freenet Site Insertion Tool