From: David ‘Bombe’ Roden Date: Tue, 16 Aug 2011 19:37:12 +0000 (+0200) Subject: Show name and location of configuration file to be overwritten. X-Git-Tag: 0.10-rc1~60 X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=21eb9e153f17fb0820ef1815a72f57d2068b145b;p=jSite.git Show name and location of configuration file to be overwritten. --- diff --git a/src/de/todesbaum/jsite/i18n/jSite.properties b/src/de/todesbaum/jsite/i18n/jSite.properties index bf5c5d1..c33aef0 100644 --- 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=Overwrite configuration?

A configuration file already exists.
Should it be overwritten? +jsite.quite.overwrite-configuration=Overwrite configuration?

A configuration file already exists:
{0}

Should it be overwritten? jsite.quit.config-not-saved=Configuration not saved

The configuration could not be saved.
Do you want to quit anyway? 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 --- 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); }