From 5c6ca75e513ed3ccaac05f6652cdb635eebaf61d Mon Sep 17 00:00:00 2001 From: Sibo Van Gool Date: Tue, 14 Sep 2021 11:55:12 +0200 Subject: [PATCH] [fixes #987] Cleaner popup dialog message formatting --- core/resources/l10n/messages.properties | 5 ++--- .../src/net/sf/openrocket/database/MotorDatabaseLoader.java | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties index b1d326afa..f9ed86b9d 100644 --- a/core/resources/l10n/messages.properties +++ b/core/resources/l10n/messages.properties @@ -794,9 +794,8 @@ FinMarkingGuide.lbl.Front = Front ! MotorDatabaseLoaderDialog MotorDbLoaderDlg.title = Error upon thrust curve import -MotorDbLoaderDlg.message1 = Thrust curve -MotorDbLoaderDlg.message2 = will be ignored during import. -MotorDbLoaderDlg.message3 = You can try replacing, deleting or manually editing the thrust curve file to fix this issue. +MotorDbLoaderDlg.message1 = Thrust curve ''{0}'' will be ignored during import. +MotorDbLoaderDlg.message2 = You can try replacing, deleting or manually editing the thrust curve file to fix this issue. ! MotorDatabaseLoadingDialog MotorDbLoadDlg.title = Loading motors diff --git a/swing/src/net/sf/openrocket/database/MotorDatabaseLoader.java b/swing/src/net/sf/openrocket/database/MotorDatabaseLoader.java index 6d610e299..18b7e16ed 100644 --- a/swing/src/net/sf/openrocket/database/MotorDatabaseLoader.java +++ b/swing/src/net/sf/openrocket/database/MotorDatabaseLoader.java @@ -6,6 +6,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; +import java.text.MessageFormat; import java.util.List; import net.sf.openrocket.l10n.Translator; @@ -144,9 +145,8 @@ public class MotorDatabaseLoader extends AsynchronousDatabaseLoader { catch (IllegalArgumentException e) { Translator trans = Application.getTranslator(); String message = "

" + e.getMessage() + - ".

" + trans.get("MotorDbLoaderDlg.message1") + " '" + f.getU() + "' " + - trans.get("MotorDbLoaderDlg.message2") - + "
" + trans.get("MotorDbLoaderDlg.message3") + "

"; + ".

" + MessageFormat.format( trans.get("MotorDbLoaderDlg.message1"), f.getU()) + + "
" + trans.get("MotorDbLoaderDlg.message2") + "

"; JOptionPane.showMessageDialog(null, message, trans.get("MotorDbLoaderDlg.title"), JOptionPane.WARNING_MESSAGE); }