Merge pull request #6576 from Scoppio/fix/i18n

fix: moved the i18n to mhq i18n

Author: IllianiCBT

MekHQ/src/mekhq/campaign/autoresolve/AutoResolveMethod.java

@@ -27,7 +27,6 @@
  */
 package mekhq.campaign.autoresolve;
 
-import megamek.common.internationalization.Internationalization;
 import mekhq.utilities.MHQInternationalization;
 
 import java.util.Optional;
@@ -44,7 +43,7 @@ public enum AutoResolveMethod {
 
     AutoResolveMethod(final String name, final String toolTipText) {
         this.name = MHQInternationalization.getText(name);
-        this.toolTipText = Internationalization.getText(toolTipText);
+        this.toolTipText = MHQInternationalization.getText(toolTipText);
     }
 
     public String getToolTipText() {

MekHQ/src/mekhq/gui/dialog/helpDialogs/AutoResolveBehaviorSettingsHelpDialog.java

@@ -32,7 +32,7 @@
 import javax.swing.JFrame;
 
 import megamek.client.ui.dialogs.helpDialogs.AbstractHelpDialog;
-import megamek.common.internationalization.Internationalization;
+import mekhq.utilities.MHQInternationalization;
 
 public class AutoResolveBehaviorSettingsHelpDialog extends AbstractHelpDialog {
 
@@ -42,8 +42,8 @@ public class AutoResolveBehaviorSettingsHelpDialog extends AbstractHelpDialog {
      * @param frame  parent frame
      */
     public AutoResolveBehaviorSettingsHelpDialog(final JFrame frame) {
-        super(frame, Internationalization.getText("AutoResolveBehaviorSettingsDialog.title"),
-            Internationalization.getText("AutoResolveBehaviorSettingsDialog.autoResolveHelpPath"));
+        super(frame, MHQInternationalization.getText("AutoResolveBehaviorSettingsDialog.title"),
+              MHQInternationalization.getText("AutoResolveBehaviorSettingsDialog.autoResolveHelpPath"));
 
         setMinimumSize(new Dimension(400, 400));
         setModalExclusionType(ModalExclusionType.TOOLKIT_EXCLUDE);

MekHQ/src/mekhq/utilities/MHQInternationalization.java

@@ -45,7 +45,7 @@
  * It makes use of some short names to make it easier to use since it is used in many places
  */
 public class MHQInternationalization {
-    private static String MISSING_RESOURCE_TAG = "!";
+    private static final String MISSING_RESOURCE_TAG = "!";
 
     private final String defaultBundle;
     private final ConcurrentHashMap<String, ResourceBundle> resourceBundles = new ConcurrentHashMap<>();