hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fixes #987] Cleaner popup dialog message formatting

Browse Source
This commit is contained in:
Sibo Van Gool 2021-09-14 11:55:12 +02:00
parent e38907122b
commit 5c6ca75e51
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/resources/l10n/messages.properties
View File

@ -794,9 +794,8 @@ FinMarkingGuide.lbl.Front = Front
! MotorDatabaseLoaderDialog ! MotorDatabaseLoaderDialog
MotorDbLoaderDlg.title = Error upon thrust curve import MotorDbLoaderDlg.title = Error upon thrust curve import
MotorDbLoaderDlg.message1 = Thrust curve MotorDbLoaderDlg.message1 = Thrust curve '<b>'{0}'</b>' will be ignored during import.
MotorDbLoaderDlg.message2 = will be ignored during import. MotorDbLoaderDlg.message2 = You can try replacing, deleting or manually editing the thrust curve file to fix this issue.
MotorDbLoaderDlg.message3 = You can try replacing, deleting or manually editing the thrust curve file to fix this issue.
! MotorDatabaseLoadingDialog ! MotorDatabaseLoadingDialog
MotorDbLoadDlg.title = Loading motors MotorDbLoadDlg.title = Loading motors

6
swing/src/net/sf/openrocket/database/MotorDatabaseLoader.java
View File

@ -6,6 +6,7 @@ import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.ObjectInputStream; import java.io.ObjectInputStream;
import java.text.MessageFormat;
import java.util.List; import java.util.List;
import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.l10n.Translator;
@ -144,9 +145,8 @@ public class MotorDatabaseLoader extends AsynchronousDatabaseLoader {
catch (IllegalArgumentException e) { catch (IllegalArgumentException e) {
Translator trans = Application.getTranslator(); Translator trans = Application.getTranslator();
String message = "<html><body><p style='width: 400px;'><i>" + e.getMessage() + String message = "<html><body><p style='width: 400px;'><i>" + e.getMessage() +
"</i>.<br><br>" + trans.get("MotorDbLoaderDlg.message1") + " '<b>" + f.getU() + "</b>' " + "</i>.<br><br>" + MessageFormat.format( trans.get("MotorDbLoaderDlg.message1"), f.getU()) +
trans.get("MotorDbLoaderDlg.message2") "<br>" + trans.get("MotorDbLoaderDlg.message2") + "</p></body></html>";
+ "<br>" + trans.get("MotorDbLoaderDlg.message3") + "</p></body></html>";
JOptionPane.showMessageDialog(null, JOptionPane.showMessageDialog(null,
message, trans.get("MotorDbLoaderDlg.title"), JOptionPane.WARNING_MESSAGE); message, trans.get("MotorDbLoaderDlg.title"), JOptionPane.WARNING_MESSAGE);
} }