Merge pull request #4411 from IllianiCBT/education_removeDaysToWeeksD…

…isplay Removed 'durationWeeks' Text from Education Tooltip
MegaMek · Jul 16, 2024 · 5d4451d · 5d4451d
2 parents 103efce + a7f26e6
commit 5d4451d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/MekHQ/resources/mekhq/resources/Education.properties b/MekHQ/resources/mekhq/resources/Education.properties
@@ -4,7 +4,6 @@ educationLevel.text=Education Level:
 nothingToLearn.text=nothing to learn
 tuition.text=Tuition:
 duration.text=Duration:
-durationWeeks.text=weeks
 durationDays.text=days
 durationAge.text=until %s years old
 distance.text=Travel Time:

diff --git a/MekHQ/src/mekhq/campaign/personnel/education/Academy.java b/MekHQ/src/mekhq/campaign/personnel/education/Academy.java
@@ -926,11 +926,7 @@ public String getTooltip(Campaign campaign, List<Person> personnel, int courseIn
                     .append("</b> ").append(' ').append(String.format(resources.getString("durationAge.text"), ageMax)).append("<br>");
         } else {
             tooltip.append("<b>").append(resources.getString("duration.text")).append("</b> ");
-            if ((durationDays / 7) < 1) {
-                tooltip.append(durationDays).append(' ').append(resources.getString("durationDays.text")).append("<br>");
-            } else {
-                tooltip.append(durationDays / 7).append(' ').append(resources.getString("durationWeeks.text")).append("<br>");
-            }
+            tooltip.append(durationDays).append(' ').append(resources.getString("durationDays.text")).append("<br>");
         }
 
         // we need to do a little extra work to get travel time, to cover academies with multiple campuses