Merge pull request #3306 from Windchild292/dev_Windchild_DuplicateRet…

…irementReports Swapping to a Single Retirement Campaign Report
MegaMek · May 29, 2022 · 78f0802 · 78f0802
2 parents c52210f + f35709d
commit 78f0802
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/MekHQ/resources/mekhq/resources/Personnel.properties b/MekHQ/resources/mekhq/resources/Personnel.properties
@@ -569,4 +569,3 @@ recoveredPoW.report=%s has been rescued from the enemy after being captured
 returnedFromLeave.report=%s has returned from leave
 returnedFromAWOL.report=%s has returned from their unauthorized leave
 rehired.report=%s has returned to active duty
-retired.report=Retired from active duty
diff --git a/MekHQ/src/mekhq/campaign/Campaign.java b/MekHQ/src/mekhq/campaign/Campaign.java
@@ -685,7 +685,6 @@ public boolean applyRetirement(Money totalPayout, Map<UUID, UUID> unitAssignment
                 for (UUID pid : getRetirementDefectionTracker().getRetirees()) {
                     if (getPerson(pid).getStatus().isActive()) {
                         getPerson(pid).changeStatus(this, getLocalDate(), PersonnelStatus.RETIRED);
-                        addReport(getPerson(pid).getFullName() + " has retired.");
                     }
 
                     if (getRetirementDefectionTracker().getPayout(pid).getRecruitRole().isCivilian()) {

diff --git a/MekHQ/src/mekhq/campaign/personnel/Person.java b/MekHQ/src/mekhq/campaign/personnel/Person.java
@@ -954,8 +954,7 @@ public void changeStatus(final Campaign campaign, final LocalDate today,
                 setRetirement(null);
                 break;
             case RETIRED:
-                campaign.addReport(String.format(resources.getString("retired.report"),
-                        getHyperlinkedFullTitle()));
+                campaign.addReport(String.format(status.getReportText(), getHyperlinkedFullTitle()));
                 ServiceLogger.retired(this, today);
                 if (campaign.getCampaignOptions().isUseRetirementDateTracking()) {
                     setRetirement(today);