projects / jSite.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 09496d7)
Show different message when the insert was aborted, add dialog titles.
authorDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Thu, 17 Jun 2010 17:54:41 +0000 (19:54 +0200)
committerDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Thu, 17 Jun 2010 18:00:48 +0000 (20:00 +0200)
src/de/todesbaum/jsite/gui/ProjectInsertPage.java patch | blob | history
src/de/todesbaum/jsite/i18n/jSite.properties patch | blob | history
src/de/todesbaum/jsite/i18n/jSite_de.properties patch | blob | history

diff --git a/src/de/todesbaum/jsite/gui/ProjectInsertPage.java b/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
index b722ceb..2e9286e 100644 (file)
--- a/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
+++ b/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
@@ -48,6 +48,7 @@ import javax.swing.JProgressBar;
 import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
 
+import de.todesbaum.jsite.application.AbortedException;
 import de.todesbaum.jsite.application.Freenet7Interface;
 import de.todesbaum.jsite.application.InsertListener;
 import de.todesbaum.jsite.application.Project;
@@ -388,9 +389,13 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
                        }
                } else {
                        if (cause == null) {
-                               JOptionPane.showMessageDialog(this, I18n.getMessage("jsite.insert.insert-failed"), null, JOptionPane.ERROR_MESSAGE);
+                               JOptionPane.showMessageDialog(this, I18n.getMessage("jsite.insert.insert-failed"), I18n.getMessage("jsite.insert.insert-failed.title"), JOptionPane.ERROR_MESSAGE);
                        } else {
-                               JOptionPane.showMessageDialog(this, MessageFormat.format(I18n.getMessage("jsite.insert.insert-failed-with-cause"), cause.getMessage()), null, JOptionPane.ERROR_MESSAGE);
+                               if (cause instanceof AbortedException) {
+                                       JOptionPane.showMessageDialog(this, I18n.getMessage("jsite.insert.insert-aborted"), I18n.getMessage("jsite.insert.insert-aborted.title"), JOptionPane.INFORMATION_MESSAGE);
+                               } else {
+                                       JOptionPane.showMessageDialog(this, MessageFormat.format(I18n.getMessage("jsite.insert.insert-failed-with-cause"), cause.getMessage()), I18n.getMessage("jsite.insert.insert-failed.title"), JOptionPane.ERROR_MESSAGE);
+                               }
                        }
                }
                SwingUtilities.invokeLater(new Runnable() {
diff --git a/src/de/todesbaum/jsite/i18n/jSite.properties b/src/de/todesbaum/jsite/i18n/jSite.properties
index 72d0c05..5b1dc7f 100644 (file)
--- a/src/de/todesbaum/jsite/i18n/jSite.properties
+++ b/src/de/todesbaum/jsite/i18n/jSite.properties
@@ -83,10 +83,13 @@ jsite.insert.start-time=Start time
 jsite.insert.starting=Starting\u2026
 jsite.insert.done=Done.
 jsite.insert.done.title=Insert done
+jsite.insert.insert-aborted=The insert was aborted.
+jsite.insert.insert-aborted.title=Insert Aborted
 jsite.insert.progress=Progress
 jsite.insert.k-per-s=KB/s
 jsite.insert.insert-failed=<html><b>Insert failed</b><br><br>The insert of the project failed.<br>Some files could not be inserted.</html>
 jsite.insert.insert-failed-with-cause=<html><b>Insert failed</b><br><br>The insert of the project failed.<br>Some files could not be inserted.<br>The following error occured:<br><br><code>{0}</code></html>
+jsite.insert.insert-failed.title=Insert Failed
 jsite.insert.inserted=<html><b>Project inserted</b><br><br>Your project was inserted successfully.</html>
 jsite.insert.okay-copy-uri=Copy URI to Clipboard
 jsite.insert.reinserted-edition=<html><b>Edition Reinserted</b><br><br>The edition you are just inserting<br>has already been inserted before.</html>
diff --git a/src/de/todesbaum/jsite/i18n/jSite_de.properties b/src/de/todesbaum/jsite/i18n/jSite_de.properties
index 02a9e17..d499982 100644 (file)
--- a/src/de/todesbaum/jsite/i18n/jSite_de.properties
+++ b/src/de/todesbaum/jsite/i18n/jSite_de.properties
@@ -83,10 +83,13 @@ jsite.insert.start-time=Beginn
 jsite.insert.starting=Beginne\u2026
 jsite.insert.done=Fertig.
 jsite.insert.done.title=Einf\u00fcgen abgeschlossen
+jsite.insert.insert-aborted=Das Einf\u00fcgen wurde abgebrochen.
+jsite.insert.insert-aborted.title=Einf\u00fcgen abgebrochen
 jsite.insert.progress=Fortschritt
 jsite.insert.k-per-s=KB/s
 jsite.insert.insert-failed=<html><b>Einf\u00fcgen fehlgeschlagen</b><br><br>Das Einf\u00fcgen des Projektes ist fehlgeschlagen, da<br>einige Dateien nicht eingef\u00fcgt werden konnten.</html>
 jsite.insert.insert-failed-with-cause=<html><b>Einf\u00fcgen fehlgeschlagen</b><br><br>Das Einf\u00fcgen des Projektes ist fehlgeschlagen, da<br>einige Dateien nicht eingef\u00fcgt werden konnten.<br>Folgender Fehler trat auf:<br><br><code>{0}</code></html>
+jsite.insert.insert-failed.title=Einf\u00fcgen fehlgeschlagen
 jsite.insert.inserted=<html><b>Projekt eingef\u00fcgt</b><br><br>Ihr Projekt wurde erfolgreich eingef\u00fcgt.</html>
 jsite.insert.okay-copy-uri=URI kopieren
 jsite.insert.reinserted-edition=<html><b>Edition bereits eingef\u00fcgt</b><br><br>Die Edition, die gerade eingef\u00fcgt wird,<br>ist schon einmal eingef\u00fcgt worden.</html>
jSite – Freenet Site Insertion Tool