From be37370c3597432899ce454a3c294837eff6a1a9 Mon Sep 17 00:00:00 2001 From: Dale Schultz Date: Thu, 28 Mar 2019 20:40:43 -0400 Subject: [PATCH] internationalize DS2LearningTableValues Class --- .../DS2LearningTableValues.properties | 11 ++++ .../DS2LearningTableValues_fr_CA.properties | 11 ++++ .../learning/DS2LearningTableValues.java | 50 ++++++++++--------- 3 files changed, 48 insertions(+), 24 deletions(-) create mode 100644 i18n/com/romraider/logger/ecu/comms/learning/DS2LearningTableValues.properties create mode 100644 i18n/com/romraider/logger/ecu/comms/learning/DS2LearningTableValues_fr_CA.properties diff --git a/i18n/com/romraider/logger/ecu/comms/learning/DS2LearningTableValues.properties b/i18n/com/romraider/logger/ecu/comms/learning/DS2LearningTableValues.properties new file mode 100644 index 00000000..9663b4db --- /dev/null +++ b/i18n/com/romraider/logger/ecu/comms/learning/DS2LearningTableValues.properties @@ -0,0 +1,11 @@ +DEFNOTFOUND = ECU definition file not found or undefined. Adaptation\nTable Values cannot be properly retrieved until an ECU\ndefinition is defined in the Editor's Definition Manager. +DEFMISSING = ECU Definition Missing +GETAFVALUES = Retrieving vehicle info & A/F values ... +GETKNOCKRANGES = Retrieving Knock Load ranges ... +GETRPMRANGES = Retrieving Knock RPM ranges ... +GETTABLEKNOCK = Retrieving Table {0} Knock values ... +ERRTABLEKNOCK = Error retrieving Knock data values, missing Knock reference +ADAPTSUCCESS = Adaptation Table Values retrieved successfully. +ERRADAPT = Unable to retrieve current ECU adaptation values +ERRCONNECT = {0}\nError performing Adaptation Table Values read.\nCheck the following:\n* Logger has successfully connected to the ECU\n* Correct COM port is selected (if not Openport 2)\n* Cable is connected properly\n* Ignition is ON +ATV = Adaptation Table Values diff --git a/i18n/com/romraider/logger/ecu/comms/learning/DS2LearningTableValues_fr_CA.properties b/i18n/com/romraider/logger/ecu/comms/learning/DS2LearningTableValues_fr_CA.properties new file mode 100644 index 00000000..c79db6bc --- /dev/null +++ b/i18n/com/romraider/logger/ecu/comms/learning/DS2LearningTableValues_fr_CA.properties @@ -0,0 +1,11 @@ +DEFNOTFOUND = Fichier de définition de l'ECU non trouvé ou non défini. Les\nvaleurs de la table d'adaptation ne peuvent pas être récupérées\ncorrectement tant qu'une définition d'écus n'a pas été définie dans le\ngestionnaire de définitions de l'éditeur. +DEFMISSING = Définition de l'ECU manquante +GETAFVALUES = Récupération des informations du véhicule et des valeurs A / F ... +GETKNOCKRANGES = Récupération des plages de charge de frappe ... +GETRPMRANGES = Récupération des gammes de RPM de Knock ... +GETTABLEKNOCK = Récupération des valeurs de Knock du tableau {0} ... +ERRTABLEKNOCK = Erreur lors de la récupération des valeurs de données Knock, référence Knock manquante +ADAPTSUCCESS = Valeurs de la table d'adaptation récupérées avec succès. +ERRADAPT = Impossible de récupérer les valeurs d'adaptation actuelles du calculateur +ERRCONNECT = {0}\nErreur lors de la lecture des valeurs du tableau d\u2019adaptation.\nVérifiez les points suivants:\n* L''enregistreur s''est connecté avec succès à l''ECU\n* Le port COM correct est sélectionné (si ce n''est pas Openport 2)\n* Le câble est connecté correctement\n* Le contact est allumé +ATV = Tableau des valeurs d'adaptation diff --git a/src/main/java/com/romraider/logger/ecu/comms/learning/DS2LearningTableValues.java b/src/main/java/com/romraider/logger/ecu/comms/learning/DS2LearningTableValues.java index e289bd3a..2c9a6b52 100644 --- a/src/main/java/com/romraider/logger/ecu/comms/learning/DS2LearningTableValues.java +++ b/src/main/java/com/romraider/logger/ecu/comms/learning/DS2LearningTableValues.java @@ -1,6 +1,6 @@ /* * RomRaider Open-Source Tuning, Logging and Reflashing - * Copyright (C) 2006-2018 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 @@ -24,6 +24,7 @@ import static javax.swing.JOptionPane.ERROR_MESSAGE; import static javax.swing.JOptionPane.WARNING_MESSAGE; import static javax.swing.JOptionPane.showMessageDialog; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -31,6 +32,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.ResourceBundle; import javax.swing.SwingWorker; @@ -61,6 +63,7 @@ import com.romraider.logger.ecu.ui.paramlist.ParameterListTableModel; import com.romraider.logger.ecu.ui.paramlist.ParameterRow; import com.romraider.logger.ecu.ui.swing.tools.DS2LearningTableValuesResultsPanel; import com.romraider.util.ParamChecker; +import com.romraider.util.ResourceUtil; /** * This class manages the building of ECU queries and retrieving the data to @@ -72,6 +75,8 @@ public final class DS2LearningTableValues extends SwingWorker private static final Logger LOGGER = Logger.getLogger(DS2LearningTableValues.class); + private static final ResourceBundle rb = new ResourceUtil().getBundle( + DS2LearningTableValues.class.getName()); private static final String[] AF_RANGE_NAMES = new String[]{" ", "Additive Adaptation", "Multiplicative Adaptation"}; @@ -114,10 +119,9 @@ public final class DS2LearningTableValues extends SwingWorker Document document = null; if (ecuDef.getEcuDefFile() == null) { showMessageDialog(logger, - "ECU definition file not found or undefined. Adaptation\n" + - "Table Values cannot be properly retrieved until an ECU\n" + - "defintion is defined in the Editor's Definition Manager.", - "ECU Defintion Missing", WARNING_MESSAGE); + rb.getString("DEFNOTFOUND"), + rb.getString("DEFMISSING"), + WARNING_MESSAGE); return null; } else { @@ -134,7 +138,7 @@ public final class DS2LearningTableValues extends SwingWorker final boolean logging = logger.isLogging(); if (logging) logger.stopLogging(); - String message = "Retrieving vehicle info & A/F values..."; + String message = rb.getString("GETAFVALUES"); messageListener.reportMessage(message); buildVehicleInfoMap(ecuDef); @@ -145,7 +149,7 @@ public final class DS2LearningTableValues extends SwingWorker try { Collection queries = buildLearningQueries(); - LOGGER.info(message); + LOGGER.info("Retrieving vehicle info & A/F values ..."); connection.sendAddressReads( queries, settings.getDestinationTarget(), @@ -157,13 +161,13 @@ public final class DS2LearningTableValues extends SwingWorker processEcuQueryResponses((List) queries); - message = "Retrieving Knock Load ranges..."; + message = rb.getString("GETKNOCKRANGES"); messageListener.reportMessage(message); String[] flkcLoad = new String[0]; queries.clear(); queries = getTableAxisRanges(document, ecuDef, KNK_LOAD_TABLE_NAMES); if (queries != null && !queries.isEmpty()) { - LOGGER.info(message); + LOGGER.info("Retrieving Knock Load ranges ..."); connection.sendAddressReads( queries, settings.getDestinationTarget(), @@ -172,13 +176,13 @@ public final class DS2LearningTableValues extends SwingWorker flkcLoad = formatRanges(queries, "%.0f"); } - message = "Retrieving Knock RPM ranges..."; + message = rb.getString("GETRPMRANGES"); messageListener.reportMessage(message); String[] flkcRpm = new String[0]; queries.clear(); queries = getTableAxisRanges(document, ecuDef, KNK_RPM_TABLE_NAMES); if (queries != null && !queries.isEmpty()) { - LOGGER.info(message); + LOGGER.info("Retrieving Knock RPM ranges ..."); connection.sendAddressReads( queries, settings.getDestinationTarget(), @@ -206,10 +210,12 @@ public final class DS2LearningTableValues extends SwingWorker } } } - message = String.format("Retrieving Table %d Knock values...", + message = MessageFormat.format( + rb.getString("GETTABLEKNOCK"), (k/64+1)); messageListener.reportMessage(message); - LOGGER.info(message); + LOGGER.info(String.format("Retrieving Table %d Knock values ...", + (k/64+1))); connection.sendAddressReads( queries, settings.getDestinationTarget(), @@ -220,13 +226,13 @@ public final class DS2LearningTableValues extends SwingWorker } } else { - message = String.format("Error retrieving Knock data values, missing Knock reference"); + message = rb.getString("ERRTABLEKNOCK"); messageListener.reportMessage(message); - LOGGER.error(message); + LOGGER.error("Error retrieving Knock data values, missing Knock reference"); } messageListener.reportMessage( - "Adaptation Table Values retrieved successfully."); + rb.getString("ADAPTSUCCESS")); final DS2LearningTableValuesResultsPanel results = new DS2LearningTableValuesResultsPanel( logger, vehicleInfo, @@ -243,16 +249,12 @@ public final class DS2LearningTableValues extends SwingWorker } catch (Exception e) { messageListener.reportError( - "Unable to retrieve current ECU adapation values"); + rb.getString("ERRADAPT")); LOGGER.error(message + " Error retrieving values", e); showMessageDialog(logger, - message + - "\nError performing Adaptation Table Values read.\n" + - "Check the following:\n" + - "* Logger has successfully conencted to the ECU\n" + - "* Correct COM port is selected (if not Openport 2)\n" + - "* Cable is connected properly\n* Ignition is ON\n", - "Adaptation Table Values", + MessageFormat.format( + rb.getString("ERRCONNECT"), message), + rb.getString("ATV"), ERROR_MESSAGE); } return null;