Merge pull request #8342 from IllianiBird/fixedTypoInMRMS

Fix: Fixed Typo in Mass Repair, Mass Salvage Reporting

Author: HammerGS

MekHQ/resources/mekhq/resources/MRMS.properties

@@ -141,3 +141,5 @@ Completed.title=Completed
 Completed.text=Mass Repair complete
 Completed.repairCount.text=- {0} repair action performed
 Completed.repairCountPlural.text=- {0} repair actions performed
+inProgress.one=There is still {0}<b>1</b>{1} part that is not being worked on.
+inProgress.many=There are still {0}<b>{1}</b>{2} parts that are not being worked on.

MekHQ/src/mekhq/service/mrms/MRMSService.java

@@ -32,6 +32,11 @@
  */
 package mekhq.service.mrms;
 
+import static mekhq.utilities.MHQInternationalization.getFormattedTextAt;
+import static mekhq.utilities.ReportingUtilities.CLOSING_SPAN_TAG;
+import static mekhq.utilities.ReportingUtilities.getWarningColor;
+import static mekhq.utilities.ReportingUtilities.spanOpeningWithCustomColor;
+
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -71,6 +76,8 @@
 public class MRMSService {
     private static final MMLogger LOGGER = MMLogger.create(MRMSService.class);
 
+    private static final String RESOURCE_BUNDLE = "mekhq.resources.MRMSService";
+    @Deprecated(since = "0.50.10")
     private static final ResourceBundle resources = ResourceBundle.getBundle("mekhq.resources.MRMS",
           MekHQ.getMHQOptions().getLocale());
 
@@ -211,14 +218,12 @@ public static String performSingleUnitMRMS(Campaign campaign, Unit unit) {
             parts = filterParts(parts, null, techs, campaign);
 
             if (!parts.isEmpty()) {
+                String color = spanOpeningWithCustomColor(getWarningColor());
                 if (parts.size() == 1) {
-                    campaign.addReport("<font color='" + ReportingUtilities.getNegativeColor()
-                                             + "'>There in still 1 part that is not being worked on.</font>");
+                    campaign.addReport(getFormattedTextAt(RESOURCE_BUNDLE, "inProgress.one", color, CLOSING_SPAN_TAG));
                 } else {
-                    campaign.addReport(String.format(
-                          "<font color='" + ReportingUtilities.getNegativeColor()
-                                + "'>There are still %s parts that are not being worked on.</font>",
-                          parts.size()));
+                    campaign.addReport(getFormattedTextAt(RESOURCE_BUNDLE, "inProgress.many", color, parts.size(),
+                          CLOSING_SPAN_TAG));
                 }
             }
         }
@@ -371,7 +376,7 @@ public static void mrmsUnits(Campaign campaign, List<Unit> units, MRMSConfigured
                 if (count > 0) {
                     if (count == 1) {
                         campaign.addReport("<font color='" + ReportingUtilities.getNegativeColor()
-                                                 + "'>There in still 1 part that is not being worked on.</font>");
+                                                 + "'>There is still 1 part that is not being worked on.</font>");
                     } else {
                         campaign.addReport(String.format(
                               "<font color='" + ReportingUtilities.getNegativeColor()
@@ -646,14 +651,14 @@ private static MRMSUnitAction performUnitMassTechAction(Campaign campaign, Unit
                         if (unfixable) {
                             campaign.addReport(String.format(
                                   "<font color='" +
-                                        ReportingUtilities.getWarningColor()
+                                        getWarningColor()
                                         +
                                         "'>Found an unfixable limb (%s) on %s which contains %s parts. Going to remove all parts and scrap the limb before proceeding with other repairs.</font>",
                                   loc.getName(), unit.getName(), countOfPartsPerLocation.get(locId)));
                         } else {
                             campaign.addReport(String.format(
                                   "<font color='" +
-                                        ReportingUtilities.getWarningColor()
+                                        getWarningColor()
                                         +
                                         "'>Found missing location (%s) on %s which contains %s parts. Going to remove all parts before proceeding with other repairs.</font>",
                                   loc != null ? loc.getName() : Integer.toString(locId), unit.getName(),