From 5c2f35e3a116b0d273564d5373d379f37f037f57 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Wed, 1 Mar 2023 03:48:54 +0100 Subject: [PATCH] Fix plugged option not selecting --- core/resources/l10n/messages.properties | 1 - core/resources/l10n/messages_ar.properties | 1 - core/resources/l10n/messages_cs.properties | 1 - core/resources/l10n/messages_de.properties | 1 - core/resources/l10n/messages_es.properties | 1 - core/resources/l10n/messages_fr.properties | 1 - core/resources/l10n/messages_it.properties | 1 - core/resources/l10n/messages_ja.properties | 1 - core/resources/l10n/messages_nl.properties | 1 - core/resources/l10n/messages_pl.properties | 1 - core/resources/l10n/messages_pt.properties | 1 - core/resources/l10n/messages_ru.properties | 1 - core/resources/l10n/messages_uk_UA.properties | 1 - core/resources/l10n/messages_zh_CN.properties | 1 - .../motor/thrustcurve/ThrustCurveMotorSelectionPanel.java | 2 +- 15 files changed, 1 insertion(+), 15 deletions(-) diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties index ebe011ef2..38a3dfec7 100644 --- a/core/resources/l10n/messages.properties +++ b/core/resources/l10n/messages.properties @@ -1372,7 +1372,6 @@ TCMotorSelPan.MotorMountDimensions = Motor mount dimensions: TCMotorSelPan.lbl.Search = Search: TCMotorSelPan.lbl.Selectthrustcurve = Select thrust curve: TCMotorSelPan.lbl.Ejectionchargedelay = Ejection charge delay: -TCMotorSelPan.equalsIgnoreCase.None = None TCMotorSelPan.lbl.NumberofsecondsorNone = (Number of seconds or \"None\") TCMotorSelPan.lbl.Designation = Designation: TCMotorSelPan.lbl.CommonName = Common name: diff --git a/core/resources/l10n/messages_ar.properties b/core/resources/l10n/messages_ar.properties index 96b73076c..a9a37c691 100644 --- a/core/resources/l10n/messages_ar.properties +++ b/core/resources/l10n/messages_ar.properties @@ -1335,7 +1335,6 @@ TCMotorSelPan.MotorMountDimensions = :أبعاد حامل المحرك TCMotorSelPan.lbl.Search = :بحث TCMotorSelPan.lbl.Selectthrustcurve = :حدد منحنى الدفع TCMotorSelPan.lbl.Ejectionchargedelay = :تأخير شحنة الإطلاق -TCMotorSelPan.equalsIgnoreCase.None = لا شئ TCMotorSelPan.lbl.NumberofsecondsorNone = (\"لا شئ\" عدد الثواني أو) TCMotorSelPan.lbl.Designation = :تسمية الشركة المصنعة TCMotorSelPan.lbl.Totalimpulse = :الدفع الكلي diff --git a/core/resources/l10n/messages_cs.properties b/core/resources/l10n/messages_cs.properties index 234e98879..26f2b1f2f 100644 --- a/core/resources/l10n/messages_cs.properties +++ b/core/resources/l10n/messages_cs.properties @@ -940,7 +940,6 @@ TCMotorSelPan.lbl.Motormountdia = Prumer uchycen TCMotorSelPan.lbl.Search = Hledej: TCMotorSelPan.lbl.Selectthrustcurve = Vyber vkonovou krivku: TCMotorSelPan.lbl.Ejectionchargedelay = Oddelovac zpo\u017Eden: -TCMotorSelPan.equalsIgnoreCase.None = Nic TCMotorSelPan.lbl.NumberofsecondsorNone = (Pocet sekund nebo \"Nic\") TCMotorSelPan.lbl.Designation = Pojmenovn: TCMotorSelPan.lbl.Totalimpulse = Celkov impulse: diff --git a/core/resources/l10n/messages_de.properties b/core/resources/l10n/messages_de.properties index 4429bbe82..fe1ffafd5 100644 --- a/core/resources/l10n/messages_de.properties +++ b/core/resources/l10n/messages_de.properties @@ -998,7 +998,6 @@ TCMotorSelPan.lbl.Motormountdia = Durchmesser der Motorhalterung TCMotorSelPan.lbl.Search = Suchen: TCMotorSelPan.lbl.Selectthrustcurve = Schubkurve auswhlen: TCMotorSelPan.lbl.Ejectionchargedelay = Verzgerung der Ausstoladung: -TCMotorSelPan.equalsIgnoreCase.None = keine TCMotorSelPan.lbl.NumberofsecondsorNone = (Anzahl der Sekunden oder \keine\) TCMotorSelPan.lbl.Designation = Bezeichnung: TCMotorSelPan.lbl.Totalimpulse = Gesamtimpuls: diff --git a/core/resources/l10n/messages_es.properties b/core/resources/l10n/messages_es.properties index fef931de6..d1b4e97bd 100644 --- a/core/resources/l10n/messages_es.properties +++ b/core/resources/l10n/messages_es.properties @@ -1126,7 +1126,6 @@ TCMotorSelPan.checkbox.hideUsed = Ocultar los motores que ya est\u00e1n TCMotorSelPan.checkbox.limitdiameter = Limitar el di\u00e1metro de motor al di\u00e1metro del porta motor TCMotorSelPan.checkbox.limitlength = Limitar la longitud del motor a la longitud del porta motor TCMotorSelPan.delayBox.None = Ninguno -TCMotorSelPan.equalsIgnoreCase.None = Ninguno TCMotorSelPan.lbl.Avgthrust = Empuje medio: TCMotorSelPan.lbl.Burntime = Tiempo de quemado: TCMotorSelPan.lbl.Datapoints = Muestras de la curva: diff --git a/core/resources/l10n/messages_fr.properties b/core/resources/l10n/messages_fr.properties index 8229ba211..babe924e2 100644 --- a/core/resources/l10n/messages_fr.properties +++ b/core/resources/l10n/messages_fr.properties @@ -1120,7 +1120,6 @@ TCMotorSelPan.checkbox.hideUsed = Ne pas afficher les moteurs d\u00E9j\u TCMotorSelPan.checkbox.limitdiameter = Afficher uniquement les moteurs dont le diametre est \u00E9gale au porte moteur TCMotorSelPan.checkbox.limitlength = Limiter la longueur du moteur \u00E0 celle du porte moteur TCMotorSelPan.delayBox.None = Aucun -TCMotorSelPan.equalsIgnoreCase.None = Aucun TCMotorSelPan.lbl.Avgthrust = Pouss\u00E9e moyenne: TCMotorSelPan.lbl.Burntime = Temps de combustion: TCMotorSelPan.lbl.Datapoints = Points de donn\u00E9es: diff --git a/core/resources/l10n/messages_it.properties b/core/resources/l10n/messages_it.properties index 2a89f0235..4968e1470 100644 --- a/core/resources/l10n/messages_it.properties +++ b/core/resources/l10n/messages_it.properties @@ -999,7 +999,6 @@ TCMotorSelPan.lbl.Motormountdia = Diametro dell'alloggio del motore: TCMotorSelPan.lbl.Search = Cerca: TCMotorSelPan.lbl.Selectthrustcurve = Seleziona la curva di spinta: TCMotorSelPan.lbl.Ejectionchargedelay = Ritardo della carica di espulsione: -TCMotorSelPan.equalsIgnoreCase.None = Nessun TCMotorSelPan.lbl.NumberofsecondsorNone = (Numero di secondi o \"Nessuno\") TCMotorSelPan.lbl.Designation = Classe: TCMotorSelPan.lbl.Totalimpulse = Impulso totale: diff --git a/core/resources/l10n/messages_ja.properties b/core/resources/l10n/messages_ja.properties index cbd557d13..13931f989 100644 --- a/core/resources/l10n/messages_ja.properties +++ b/core/resources/l10n/messages_ja.properties @@ -1029,7 +1029,6 @@ TCMotorSelPan.lbl.Motormountdia = \u30E2\u30FC\u30BF\u30FC\u30DE\u30A6\u30F3\u3 TCMotorSelPan.lbl.Search = \u691C\u7D22\uFF1A TCMotorSelPan.lbl.Selectthrustcurve = \u63A8\u529B\u5C65\u6B74\uFF1A TCMotorSelPan.lbl.Ejectionchargedelay = Ejection charge delay: -TCMotorSelPan.equalsIgnoreCase.None = None TCMotorSelPan.lbl.NumberofsecondsorNone = (Number of seconds or \"None\") TCMotorSelPan.lbl.Designation = \u8A18\u53F7 TCMotorSelPan.lbl.Totalimpulse = \u30C8\u30FC\u30BF\u30EB\u30A4\u30F3\u30D1\u30EB\u30B9\uFF1A diff --git a/core/resources/l10n/messages_nl.properties b/core/resources/l10n/messages_nl.properties index 916df1a5d..a67093f35 100644 --- a/core/resources/l10n/messages_nl.properties +++ b/core/resources/l10n/messages_nl.properties @@ -1260,7 +1260,6 @@ TCMotorSelPan.MotorMountDimensions = Motorbevestiging afmetingen: TCMotorSelPan.lbl.Search = Zoek: TCMotorSelPan.lbl.Selectthrustcurve = Selecteer stuwkrachtcurve: TCMotorSelPan.lbl.Ejectionchargedelay = Vertraging schietlading: -TCMotorSelPan.equalsIgnoreCase.None = Geen TCMotorSelPan.lbl.NumberofsecondsorNone = (Aantal seconden of \"Geen\") TCMotorSelPan.lbl.Designation = Benaming TCMotorSelPan.lbl.Totalimpulse = Totale impuls: diff --git a/core/resources/l10n/messages_pl.properties b/core/resources/l10n/messages_pl.properties index 3cbcf4637..543cdb9b8 100644 --- a/core/resources/l10n/messages_pl.properties +++ b/core/resources/l10n/messages_pl.properties @@ -943,7 +943,6 @@ ComponentInfo.EngineBlock = Blokada silnika unieruchamia silnik wewn\u01 TCMotorSelPan.lbl.Search = Szukaj: TCMotorSelPan.lbl.Selectthrustcurve = Wybierz krzyw\u0105 si\u0142y ci\u0105gu: TCMotorSelPan.lbl.Ejectionchargedelay = Op\u017Anienie odpalenia \u0142adunku odrzucaj\u0105cego: - TCMotorSelPan.equalsIgnoreCase.None = \u017Badne TCMotorSelPan.lbl.NumberofsecondsorNone = (liczba sekund lub \"Brak\") TCMotorSelPan.lbl.Designation = Oznaczenie: TCMotorSelPan.lbl.Totalimpulse = Ca\u0142kowity impuls: diff --git a/core/resources/l10n/messages_pt.properties b/core/resources/l10n/messages_pt.properties index 49a283c54..8cb858eaa 100644 --- a/core/resources/l10n/messages_pt.properties +++ b/core/resources/l10n/messages_pt.properties @@ -1084,7 +1084,6 @@ TCMotorSelPan.SHOW_DESCRIPTIONS.desc2 = Mostrar motores com um di\u00e2metro m TCMotorSelPan.SHOW_DESCRIPTIONS.desc3 = Mostrar motores com um di\u00e2metro igual ao da montagem do motor TCMotorSelPan.checkbox.hideSimilar = Esconder as curvas de impulso muito semelhantes TCMotorSelPan.delayBox.None = Nenhum -TCMotorSelPan.equalsIgnoreCase.None = Nenhum TCMotorSelPan.lbl.Avgthrust = Empuxo m\u00e9dio: TCMotorSelPan.lbl.Burntime = Tempo de queima: TCMotorSelPan.lbl.Datapoints = Pontos de dados: diff --git a/core/resources/l10n/messages_ru.properties b/core/resources/l10n/messages_ru.properties index b5f3bc151..ff9fb718f 100644 --- a/core/resources/l10n/messages_ru.properties +++ b/core/resources/l10n/messages_ru.properties @@ -1307,7 +1307,6 @@ TCMotorSelPan.MotorMountDimensions = \u0420\u0430\u0437\u043C\u0435\u0440\u044B TCMotorSelPan.lbl.Search = \u041F\u043E\u0438\u0441\u043A: TCMotorSelPan.lbl.Selectthrustcurve = \u0412\u044B\u0431\u043E\u0440 \u043F\u0440\u043E\u0444\u0438\u043B\u044F \u0442\u044F\u0433\u0438: TCMotorSelPan.lbl.Ejectionchargedelay = \u0417\u0430\u0434\u0435\u0440\u0436\u043A\u0430 \u0432\u044B\u0431\u0440\u043E\u0441\u0430 \u0437\u0430\u0440\u044F\u0434\u0430: -TCMotorSelPan.equalsIgnoreCase.None = \u041D\u0435\u0442 TCMotorSelPan.lbl.NumberofsecondsorNone = (\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0441\u0435\u043A\u0443\u043D\u0434 \u0438\u043B\u0438 "\u041D\u0435\u0442") TCMotorSelPan.lbl.Designation = \u041E\u0431\u043E\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435: TCMotorSelPan.lbl.Totalimpulse = \u041E\u0431\u0449\u0438\u0439 \u0438\u043C\u043F\u0443\u043B\u044C\u0441: diff --git a/core/resources/l10n/messages_uk_UA.properties b/core/resources/l10n/messages_uk_UA.properties index 90ed7630a..4ee5519ba 100644 --- a/core/resources/l10n/messages_uk_UA.properties +++ b/core/resources/l10n/messages_uk_UA.properties @@ -1102,7 +1102,6 @@ TCMotorSelPan.MotorMountDimensions = Motor mount dimensions: TCMotorSelPan.lbl.Search = Search: TCMotorSelPan.lbl.Selectthrustcurve = Select thrust curve: TCMotorSelPan.lbl.Ejectionchargedelay = Ejection charge delay: -TCMotorSelPan.equalsIgnoreCase.None = None TCMotorSelPan.lbl.NumberofsecondsorNone = (Number of seconds or \"None\") TCMotorSelPan.lbl.Designation = Designation: TCMotorSelPan.lbl.Totalimpulse = Total impulse: diff --git a/core/resources/l10n/messages_zh_CN.properties b/core/resources/l10n/messages_zh_CN.properties index 149708f5d..230b4b75f 100644 --- a/core/resources/l10n/messages_zh_CN.properties +++ b/core/resources/l10n/messages_zh_CN.properties @@ -1189,7 +1189,6 @@ TCMotorSelPan.checkbox.hideUsed = \u9690\u85CF\u5DF2\u4F7F\u7528\u7684\u TCMotorSelPan.checkbox.limitdiameter = \u76F4\u5F84\u4E0D\u8D85\u8FC7\u5F53\u524D\u53D1\u52A8\u673A\u5EA7\u76F4\u5F84 TCMotorSelPan.checkbox.limitlength = \u957F\u5EA6\u4E0D\u8D85\u8FC7\u5F53\u524D\u53D1\u52A8\u673A\u5EA7\u957F\u5EA6 TCMotorSelPan.delayBox.None = \u65E0 -TCMotorSelPan.equalsIgnoreCase.None = \u65E0 TCMotorSelPan.lbl.Avgthrust = \u5E73\u5747\u63A8\u529B: TCMotorSelPan.lbl.Burntime = \u71C3\u70E7\u65F6\u95F4: TCMotorSelPan.lbl.Datapoints = \u6570\u636E\u70B9: diff --git a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java index 117d2ab7c..5e538125a 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java @@ -185,7 +185,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec return; } //// None - if (sel.equalsIgnoreCase(trans.get("TCMotorSelPan.equalsIgnoreCase.None"))) { + if (sel.equalsIgnoreCase(trans.get("TCMotorSelPan.delayBox.None"))) { selectedDelay = Motor.PLUGGED_DELAY; } else { try {