Merge pull request #5680 from IllianiCBT/datePicker_warning

HammerGS · web-flow · commit afa1d92989e5 · 2025-01-06T18:40:47.000-07:00
Added Warning for Campaign Dates Before 2470
diff --git a/MekHQ/resources/mekhq/resources/DateChooser.properties b/MekHQ/resources/mekhq/resources/DateChooser.properties
@@ -30,7 +30,9 @@ friday.text=Fri
 saturday.text=Sat
 sunday.text=Sun
 dayPicker.tooltip=Click on a day to choose it
-dateField.text=Click on the date to edit it
+dateField.text=<html><div style='text-align: center;'><b>Campaigns prior to 2470 are not supported.</b>\
+  <br>\
+  <br>Click on the date to edit it.</div></html>
 confirmDate.text=Confirm Date
 
 # createEraButtons
diff --git a/MekHQ/src/mekhq/gui/dialog/DateChooser.java b/MekHQ/src/mekhq/gui/dialog/DateChooser.java
@@ -200,7 +200,7 @@ private void initialize(Component owner, LocalDate date) {
         contentPane.add(dayGrid, BorderLayout.CENTER);
 
         // Create the date label
-        JLabel dateLabel = new JLabel(resources.getString("dateField.text"), JLabel.CENTER);
+        JLabel dateLabel = new JLabel(String.format(resources.getString("dateField.text")));
 
         // Set up the date input text field with the current campaign date.
         dateField = new JFormattedTextField(this.date);
@@ -566,10 +566,11 @@ public void keyReleased(KeyEvent event) {}
      */
     private boolean updateDateFromDateField() {
         LocalDate newDate = parseDate(dateField.getText());
+
         if (newDate == null) {
-            JOptionPane.showMessageDialog(this,
+            JOptionPane.showMessageDialog(null,
                 "Invalid Date Format\nTry: yyyy-MM-dd", "Date Format",
-                    JOptionPane.WARNING_MESSAGE);
+                JOptionPane.WARNING_MESSAGE);
             return false;
         }
 
