diff --git a/ewfVerify/src/org/sleuthkit/autopsy/ewfverify/Bundle.properties b/ewfVerify/src/org/sleuthkit/autopsy/ewfverify/Bundle.properties index aab0a6e9e9..5c4538697a 100755 --- a/ewfVerify/src/org/sleuthkit/autopsy/ewfverify/Bundle.properties +++ b/ewfVerify/src/org/sleuthkit/autopsy/ewfverify/Bundle.properties @@ -7,10 +7,16 @@ EwfVerifyIngestModule.process.noStoredHash=Image {0} does not have stored hash. EwfVerifyIngestModule.process.startingImg=Starting {0} EwfVerifyIngestModule.process.errGetSizeOfImg=Error getting size of {0}. Image will not be processed. EwfVerifyIngestModule.process.errReadImgAtChunk=Error reading {0} at chunk {1} -EwfVerifyIngestModule.init.exception.failGetMd5=Failed to get MD5 algorithm EwfVerifyIngestModule.complete.verified=\ verified EwfVerifyIngestModule.complete.notVerified=\ not verified EwfVerifyIngestModule.complete.verifResultsHead=

E01 Verification Results for {0}

EwfVerifyIngestModule.complete.resultLi=
  • Result\:{0}
  • EwfVerifyIngestModule.complete.calcHashLi=
  • Calculated hash\: {0}
  • EwfVerifyIngestModule.complete.storedHashLi=
  • Stored hash\: {0}
  • +EwfVerifyIngestModule.startUp.exception.failGetMd5=Failed to get MD5 algorithm +EwfVerifyIngestModule.shutDown.verified=\ verified +EwfVerifyIngestModule.shutDown.notVerified=\ not verified +EwfVerifyIngestModule.shutDown.verifyResultsHeader=

    EWF Verification Results for {0}

    +EwfVerifyIngestModule.shutDown.resultLi=
  • Result\:{0}
  • +EwfVerifyIngestModule.shutDown.calcHashLi=
  • Calculated hash\: {0}
  • +EwfVerifyIngestModule.shutDown.storedHashLi=
  • Stored hash\: {0}
  • diff --git a/ewfVerify/src/org/sleuthkit/autopsy/ewfverify/EwfVerifyIngestModule.java b/ewfVerify/src/org/sleuthkit/autopsy/ewfverify/EwfVerifyIngestModule.java index 5d039fe304..96b447fde7 100755 --- a/ewfVerify/src/org/sleuthkit/autopsy/ewfverify/EwfVerifyIngestModule.java +++ b/ewfVerify/src/org/sleuthkit/autopsy/ewfverify/EwfVerifyIngestModule.java @@ -73,7 +73,8 @@ public class EwfVerifyIngestModule extends IngestModuleAdapter implements DataSo messageDigest = MessageDigest.getInstance("MD5"); } catch (NoSuchAlgorithmException ex) { logger.log(Level.WARNING, "Error getting md5 algorithm", ex); - throw new RuntimeException("Failed to get MD5 algorithm"); + throw new RuntimeException( + NbBundle.getMessage(this.getClass(), "EwfVerifyIngestModule.startUp.exception.failGetMd5")); } } else { messageDigest.reset(); @@ -175,11 +176,17 @@ public class EwfVerifyIngestModule extends IngestModuleAdapter implements DataSo public void shutDown(boolean ingestJobCancelled) { logger.log(Level.INFO, "complete() {0}", EwfVerifierModuleFactory.getModuleName()); if (skipped == false) { - String msg = verified ? " verified" : " not verified"; - String extra = "

    EWF Verification Results for " + imgName + "

    "; - extra += "
  • Result:" + msg + "
  • "; - extra += "
  • Calculated hash: " + calculatedHash + "
  • "; - extra += "
  • Stored hash: " + storedHash + "
  • "; + String msg = ""; + if (verified) { + msg = NbBundle.getMessage(this.getClass(), "EwfVerifyIngestModule.shutDown.verified"); + } else { + msg = NbBundle.getMessage(this.getClass(), "EwfVerifyIngestModule.shutDown.notVerified"); + } + String extra = NbBundle + .getMessage(this.getClass(), "EwfVerifyIngestModule.shutDown.verifyResultsHeader", imgName); + extra += NbBundle.getMessage(this.getClass(), "EwfVerifyIngestModule.shutDown.resultLi", msg); + extra += NbBundle.getMessage(this.getClass(), "EwfVerifyIngestModule.shutDown.calcHashLi", calculatedHash); + extra += NbBundle.getMessage(this.getClass(), "EwfVerifyIngestModule.shutDown.storedHashLi", storedHash); services.postMessage(IngestMessage.createMessage( MessageType.INFO, EwfVerifierModuleFactory.getModuleName(), imgName + msg, extra)); logger.log(Level.INFO, "{0}{1}", new Object[]{imgName, msg}); }