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

[Bugfix] FlightConfiguration now uses i8n for its empty-motors description

Browse Source
This commit is contained in:
Daniel_M_Williams 2016-04-27 21:36:31 -04:00
parent 1a3b5efb74
commit 2ee7464038
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1477,6 +1477,7 @@ MotorMount.IgnitionEvent.short.EJECTION_CHARGE = Ejection charge
MotorMount.IgnitionEvent.short.BURNOUT = Burnout MotorMount.IgnitionEvent.short.BURNOUT = Burnout
MotorMount.IgnitionEvent.short.NEVER = Never MotorMount.IgnitionEvent.short.NEVER = Never
MotorMount.NoMotors = [No Motors Defined]
!ComponentIcons !ComponentIcons
ComponentIcons.Stage = Axial Stage ComponentIcons.Stage = Axial Stage

8
core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
View File

@ -10,8 +10,10 @@ import java.util.Queue;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.motor.MotorConfiguration; import net.sf.openrocket.motor.MotorConfiguration;
import net.sf.openrocket.motor.MotorConfigurationId; import net.sf.openrocket.motor.MotorConfigurationId;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.ArrayList; import net.sf.openrocket.util.ArrayList;
import net.sf.openrocket.util.Coordinate; import net.sf.openrocket.util.Coordinate;
import net.sf.openrocket.util.MathUtil; import net.sf.openrocket.util.MathUtil;
@ -27,9 +29,7 @@ import net.sf.openrocket.util.Monitorable;
*/ */
public class FlightConfiguration implements FlightConfigurableParameter<FlightConfiguration>, Monitorable { public class FlightConfiguration implements FlightConfigurableParameter<FlightConfiguration>, Monitorable {
private static final Logger log = LoggerFactory.getLogger(FlightConfiguration.class); private static final Logger log = LoggerFactory.getLogger(FlightConfiguration.class);
private static final Translator trans = Application.getTranslator();
private final static String NO_MOTORS_NAME = "[No Motors Defined]";
private final static String DEFAULT_CONFIGURATION_NAME = NO_MOTORS_NAME;
private String configurationName=null; private String configurationName=null;
@ -314,7 +314,7 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
} }
} }
if( 0 == activeMotorCount ){ if( 0 == activeMotorCount ){
return DEFAULT_CONFIGURATION_NAME; return trans.get("MotorMount.NoMotors");
} }
buff.append("]"); buff.append("]");
return buff.toString(); return buff.toString();