Changeset 1139:9754005a7e70

Timestamp:

04/21/24 08:49:36 (7 months ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

The number of infants does not count towards the total number of passengers, but cannot be more than the number of adults (re #386)

Files:

• locale/en/mlx.po (modified) (1 diff)
• locale/hu/mlx.po (modified) (1 diff)
• src/mlx/gui/flight.py (modified) (3 diffs)

locale/en/mlx.po

@@ -649 +649 @@
 msgid "payload_help_many_pax"
 msgstr "Too many passengers (maximum: %d)."
+
+msgid "payload_help_many_infants"
+msgstr "Too many infants (maximum: %d)."
 
 msgid "payload_crew"

locale/hu/mlx.po

@@ -653 +653 @@
 msgid "payload_help_many_pax"
 msgstr "Túl sok utas (legfeljebb %d lehet)."
+
+msgid "payload_help_many_infants"
+msgstr "Túl sok csecsemő (legfeljebb %d lehet)."
 
 msgid "payload_crew"

src/mlx/gui/flight.py

@@ -2705 +2705 @@
         changed."""
         bookedFlight = self._wizard._bookedFlight
-        numPassengers = \
-            self._numPassengers.get_int() + \
-            self._numChildren.get_int() + \
-            self._numInfants.get_int()
-        minCabinCrew = 0 if numPassengers==0 else \
+        numPassengers = self._numPassengers.get_int()
+        numSeatsOccupied = numPassengers + self._numChildren.get_int()
+        minCabinCrew = 0 if numSeatsOccupied==0 else \
             (bookedFlight.maxPassengers // 50) + 1
 
@@ -2724 +2722 @@
         self._crewLabel.set_use_underline(True)
 
-        tooManyPassengers = numPassengers>bookedFlight.maxPassengers
-        if tooManyPassengers:
+        tooManyPassengers = numSeatsOccupied>bookedFlight.maxPassengers
+        tooManyInfants = self._numInfants.get_int() > numPassengers
+        if tooManyPassengers or tooManyInfants:
             self._paxLabel.set_markup("<b><span foreground=\"red\">" +
                                       xstr("payload_pax") +
                                       "</span></b>")
-            extraHelp.append(xstr("payload_help_many_pax") % (bookedFlight.maxPassengers,))
         else:
             self._paxLabel.set_text(xstr("payload_pax"))
+
+        if tooManyPassengers:
+            extraHelp.append(xstr("payload_help_many_pax") %
+                             (bookedFlight.maxPassengers,))
+        elif tooManyInfants:
+            extraHelp.append(xstr("payload_help_many_infants") %
+                             (numPassengers,))
+
         self._paxLabel.set_use_underline(True)
 
@@ -2740 +2746 @@
         self.setHelp(hlp)
 
-        self._button.set_sensitive(enoughCrew and not tooManyPassengers)
-
+        self._button.set_sensitive(enoughCrew and not tooManyPassengers and
+                                   not tooManyInfants)
 
         self._updateCalculatedZFW()