From f3aac201e2fcb08f68f187aacb43d9be26b9c475 Mon Sep 17 00:00:00 2001
From: Dale Schultz <dschultzca@yahoo.ca>
Date: Sat, 21 Dec 2019 20:18:25 -0500
Subject: [PATCH] Internationalize ReadCodesManagerImpl Class

---
 .../readcodes/ReadCodesManagerImpl.properties |  3 +++
 .../comms/readcodes/ReadCodesManagerImpl.java | 23 +++++++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)
 create mode 100644 i18n/com/romraider/logger/ecu/comms/readcodes/ReadCodesManagerImpl.properties

diff --git a/i18n/com/romraider/logger/ecu/comms/readcodes/ReadCodesManagerImpl.properties b/i18n/com/romraider/logger/ecu/comms/readcodes/ReadCodesManagerImpl.properties
new file mode 100644
index 00000000..45075c5e
--- /dev/null
+++ b/i18n/com/romraider/logger/ecu/comms/readcodes/ReadCodesManagerImpl.properties
@@ -0,0 +1,3 @@
+READCODES = Reading {0} DTC codes ...
+COMPLETE = Reading {0} DTC codes ... complete
+FAILED = Unable to read {0} DTC codes - check correct serial port has been selected, cable is connected and ignition is on.
diff --git a/src/main/java/com/romraider/logger/ecu/comms/readcodes/ReadCodesManagerImpl.java b/src/main/java/com/romraider/logger/ecu/comms/readcodes/ReadCodesManagerImpl.java
index 9002b549..e319aaf6 100644
--- a/src/main/java/com/romraider/logger/ecu/comms/readcodes/ReadCodesManagerImpl.java
+++ b/src/main/java/com/romraider/logger/ecu/comms/readcodes/ReadCodesManagerImpl.java
@@ -1,6 +1,6 @@
 /*
  * RomRaider Open-Source Tuning, Logging and Reflashing
- * Copyright (C) 2006-2014 RomRaider.com
+ * Copyright (C) 2006-2019 RomRaider.com
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,9 +22,11 @@ package com.romraider.logger.ecu.comms.readcodes;
 import static com.romraider.logger.ecu.comms.io.connection.LoggerConnectionFactory.getConnection;
 import static com.romraider.util.ParamChecker.checkNotNull;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.ResourceBundle;
 
 import org.apache.log4j.Logger;
 
@@ -37,11 +39,14 @@ import com.romraider.logger.ecu.comms.query.EcuQueryImpl;
 import com.romraider.logger.ecu.definition.EcuSwitch;
 import com.romraider.logger.ecu.ui.MessageListener;
 import com.romraider.logger.ecu.ui.swing.tools.ReadCodesResultsPanel;
+import com.romraider.util.ResourceUtil;
 import com.romraider.util.SettingsManager;
 
 public final class ReadCodesManagerImpl implements ReadCodesManager {
     private static final Logger LOGGER =
             Logger.getLogger(ReadCodesManagerImpl.class);
+    private static final ResourceBundle rb = new ResourceUtil().getBundle(
+            ReadCodesManagerImpl.class.getName());
     private final MessageListener messageListener;
     private final EcuLogger logger;
     private final List<EcuSwitch> dtcodes;
@@ -77,15 +82,15 @@ public final class ReadCodesManagerImpl implements ReadCodesManager {
         }
 
         final Settings settings = SettingsManager.getSettings();
-        final String target = settings.getDestinationTarget().getName();
+        final String target = settings.getDestinationTarget().getName().toUpperCase();
         try {
             final LoggerConnection connection = getConnection(
                     settings.getLoggerProtocol(),
                     settings.getLoggerPort(),
                     settings.getLoggerConnectionProperties());
             try {
-                messageListener.reportMessage(
-                        "Reading " + target + " DTC codes...");
+                messageListener.reportMessage(MessageFormat.format(
+                        rb.getString("READCODES"), target));
                 final Collection<EcuQuery> querySet = new ArrayList<EcuQuery>();
                 for (int i = 0; i < queries.size(); i += 150) {
                     for (int j = i; (j < i + 150) && (j < queries.size()); j++) {
@@ -97,8 +102,8 @@ public final class ReadCodesManagerImpl implements ReadCodesManager {
                             new PollingStateImpl());
                     querySet.clear();
                 }
-                messageListener.reportMessage(
-                        "Reading " + target + " DTC codes...complete.");
+                messageListener.reportMessage(MessageFormat.format(
+                        rb.getString("COMPLETE"), target));
 
                 double result = 0;
                 final ArrayList<EcuQuery> dtcSet = new ArrayList<EcuQuery>();
@@ -130,10 +135,8 @@ public final class ReadCodesManagerImpl implements ReadCodesManager {
             }
         }
         catch (Exception e) {
-            messageListener.reportMessage(
-                    "Unable to read " + target + " DTC " +
-                            " codes - check correct serial port has been selected," +
-                    " cable is connected and ignition is on.");
+            messageListener.reportMessage(MessageFormat.format(
+                    rb.getString("FAILED"), target));
             LOGGER.error("Error reading " + target + " DTC codes", e);
 
             return 0;