Pulled new static strings.

Marked a few static strings with NON-NLS.
This commit is contained in:
Nick Davis 2014-04-22 14:29:14 -04:00
parent 33236d6065
commit dfe3ad2233
3 changed files with 43 additions and 18 deletions

View File

@ -65,3 +65,14 @@ IngestMessagePanel.sortByComboBox.model.time=Time
IngestMessagePanel.sortByComboBox.model.priority=Priority IngestMessagePanel.sortByComboBox.model.priority=Priority
IngestMessagesToolbar.customizeButton.toolTipText=Ingest Messages IngestMessagesToolbar.customizeButton.toolTipText=Ingest Messages
IngestMessageTopComponent.initComponents.name=Ingest Inbox IngestMessageTopComponent.initComponents.name=Ingest Inbox
IngestManager.StartIngestJobsTask.run.startupErr.dlgMsg=Unable to start up one or more ingest modules, ingest job cancelled.
IngestManager.StartIngestJobsTask.run.startupErr.dlgSolution=Please disable the failed modules or fix the errors and then restart ingest\
by right clicking on the data source and selecting Run Ingest Modules.
IngestManager.StartIngestJobsTask.run.startupErr.dlgErrorList=Errors\:\
\
{0}
IngestManager.StartIngestJobsTask.run.startupErr.dlgTitle=Ingest Failure
IngestManager.StartIngestJobsTask.run.progress.msg1=Data source ingest tasks for {0}
IngestManager.StartIngestJobsTask.run.progress.msg2=Data source ingest tasks for {0}
IngestManager.StartIngestJobsTask.run.progress.msg3=Data source ingest tasks for {0}
IngestManager.StartIngestJobsTask.run.progress.msg4=Data source ingest tasks for {0}

View File

@ -132,16 +132,16 @@ public final class IngestJobLauncher {
for (String name : settingNames) { for (String name : settingNames) {
// Map some old core module names to the current core module names. // Map some old core module names to the current core module names.
switch (name) { switch (name) {
case "Thunderbird Parser": case "Thunderbird Parser": //NON-NLS
case "MBox Parser": case "MBox Parser": //NON-NLS
moduleNames.add("Email Parser"); moduleNames.add("Email Parser"); //NON-NLS
break; break;
case "File Extension Mismatch Detection": case "File Extension Mismatch Detection": //NON-NLS
moduleNames.add("Extension Mismatch Detector"); moduleNames.add("Extension Mismatch Detector"); //NON-NLS
break; break;
case "EWF Verify": case "EWF Verify": //NON-NLS
case "E01 Verify": case "E01 Verify": //NON-NLS
moduleNames.add("E01 Verifier"); moduleNames.add("E01 Verifier"); //NON-NLS
break; break;
default: default:
moduleNames.add(name); moduleNames.add(name);

View File

@ -405,13 +405,19 @@ public class IngestManager {
moduleStartUpErrors.append("\n"); moduleStartUpErrors.append("\n");
} }
StringBuilder notifyMessage = new StringBuilder(); StringBuilder notifyMessage = new StringBuilder();
notifyMessage.append("Unable to start up one or more ingest modules, ingest job cancelled.\n"); notifyMessage.append(NbBundle.getMessage(this.getClass(),
notifyMessage.append("Please disable the failed modules or fix the errors and then restart ingest\n"); "IngestManager.StartIngestJobsTask.run.startupErr.dlgMsg"));
notifyMessage.append("by right clicking on the data source and selecting Run Ingest Modules.\n"); notifyMessage.append("\n");
notifyMessage.append("Errors:\n\n"); notifyMessage.append(NbBundle.getMessage(this.getClass(),
notifyMessage.append(moduleStartUpErrors.toString()); "IngestManager.StartIngestJobsTask.run.startupErr.dlgSolution"));
notifyMessage.append("\n");
notifyMessage.append(NbBundle.getMessage(this.getClass(),
"IngestManager.StartIngestJobsTask.run.startupErr.dlgErrorList",
moduleStartUpErrors.toString()));
notifyMessage.append("\n\n"); notifyMessage.append("\n\n");
JOptionPane.showMessageDialog(null, notifyMessage.toString(), "Ingest Failure", JOptionPane.ERROR_MESSAGE); JOptionPane.showMessageDialog(null, notifyMessage.toString(),
NbBundle.getMessage(this.getClass(),
"IngestManager.StartIngestJobsTask.run.startupErr.dlgTitle"), JOptionPane.ERROR_MESSAGE);
// Jettison the ingest job and move on to the next one. // Jettison the ingest job and move on to the next one.
synchronized (IngestManager.this) { synchronized (IngestManager.this) {
@ -423,14 +429,22 @@ public class IngestManager {
// Queue the data source ingest tasks for the ingest job. // Queue the data source ingest tasks for the ingest job.
final String inputName = dataSource.getName(); final String inputName = dataSource.getName();
progress.progress("Data source ingest tasks for " + inputName, workUnitsCompleted); progress.progress(
NbBundle.getMessage(this.getClass(), "IngestManager.StartIngestJobsTask.run.progress.msg1",
inputName), workUnitsCompleted);
scheduler.getDataSourceIngestScheduler().queueForIngest(ingestJob); scheduler.getDataSourceIngestScheduler().queueForIngest(ingestJob);
progress.progress("Data source ingest tasks for " + inputName, ++workUnitsCompleted); progress.progress(
NbBundle.getMessage(this.getClass(), "IngestManager.StartIngestJobsTask.run.progress.msg2",
inputName), ++workUnitsCompleted);
// Queue the file ingest tasks for the ingest job. // Queue the file ingest tasks for the ingest job.
progress.progress("Data source ingest tasks for " + inputName, workUnitsCompleted); progress.progress(
NbBundle.getMessage(this.getClass(), "IngestManager.StartIngestJobsTask.run.progress.msg3",
inputName), workUnitsCompleted);
scheduler.getFileIngestScheduler().queueForIngest(ingestJob); scheduler.getFileIngestScheduler().queueForIngest(ingestJob);
progress.progress("Data source ingest tasks for " + inputName, ++workUnitsCompleted); progress.progress(
NbBundle.getMessage(this.getClass(), "IngestManager.StartIngestJobsTask.run.progress.msg4",
inputName), ++workUnitsCompleted);
if (!Thread.currentThread().isInterrupted()) { if (!Thread.currentThread().isInterrupted()) {
startIngestTasks(); startIngestTasks();