From 12c13e1661d7ef2a020a2a76bb32b073c8468e78 Mon Sep 17 00:00:00 2001
From: Mark McKinnon <mark.mckinnon@davenport.edu>
Date: Mon, 10 Aug 2020 10:16:46 -0400
Subject: [PATCH] Add Browser Names to Bundle

Add Browser Names to Bundle so that they can be translated if need be
---
 .../autopsy/recentactivity/Bundle.properties     |  7 +++++++
 .../recentactivity/Bundle.properties-MERGED      |  7 +++++++
 .../sleuthkit/autopsy/recentactivity/Chrome.java | 16 ++++++++--------
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties
index cec93716dc..52823aa9f3 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties
@@ -2,6 +2,13 @@ OpenIDE-Module-Display-Category=Ingest Module
 OpenIDE-Module-Long-Description=Recent Activity ingest module.\n\n\The module extracts useful information about the recent user activity on the disk image being ingested, such as:\n\n- Recently open documents,\n- Web activity (sites visited, stored cookies, book marked sites, search engine queries, file downloads),\n- Recently attached devices,\n- Installed programs.\n\nThe module currently supports Windows only disk images.\nThe plugin is also fully functional when deployed on Windows version of Autopsy.
 OpenIDE-Module-Name=RecentActivity
 OpenIDE-Module-Short-Description=Recent Activity finder ingest module
+Browser.name.Microsoft.Edge=Microsoft Edge
+Browser.name.Yandex=Yandex
+Browser.name.Opera=Opera
+Browser.name.SalamWeb=SalamWeb
+Browser.name.UC.Browser=UC Browser
+Browser.name.Brave=Brave
+Browser.name.Google.Chrome=Google Chrome
 Chrome.moduleName=Chrome
 Chrome.getHistory.errMsg.errGettingFiles=Error when trying to get Chrome history files.
 Chrome.getHistory.errMsg.couldntFindAnyFiles=Could not find any allocated Chrome history files.
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
index 839ccdd039..5b5a1ea6e5 100755
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
@@ -75,6 +75,13 @@ OpenIDE-Module-Display-Category=Ingest Module
 OpenIDE-Module-Long-Description=Recent Activity ingest module.\n\nThe module extracts useful information about the recent user activity on the disk image being ingested, such as:\n\n- Recently open documents,\n- Web activity (sites visited, stored cookies, book marked sites, search engine queries, file downloads),\n- Recently attached devices,\n- Installed programs.\n\nThe module currently supports Windows only disk images.\nThe plugin is also fully functional when deployed on Windows version of Autopsy.
 OpenIDE-Module-Name=RecentActivity
 OpenIDE-Module-Short-Description=Recent Activity finder ingest module
+Browser.name.Microsoft.Edge=Microsoft Edge
+Browser.name.Yandex=Yandex
+Browser.name.Opera=Opera
+Browser.name.SalamWeb=SalamWeb
+Browser.name.UC.Browser=UC Browser
+Browser.name.Brave=Brave
+Browser.name.Google.Chrome=Google Chrome
 Chrome.moduleName=Chrome
 Chrome.getHistory.errMsg.errGettingFiles=Error when trying to get Chrome history files.
 Chrome.getHistory.errMsg.couldntFindAnyFiles=Could not find any allocated Chrome history files.
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java
index 524511a308..38eac6b8ec 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java
@@ -84,15 +84,15 @@ class Chrome extends Extract {
     private final Logger logger = Logger.getLogger(this.getClass().getName());
     private Content dataSource;
     private IngestJobContext context;
-    
+
     private static final Map<String, String> BROWSERS_MAP = ImmutableMap.<String, String>builder()  
-            .put("Microsoft Edge", "Microsoft/Edge") 
-            .put("Yandex Browser", "YandexBrowser") 
-            .put("Opera", "Opera Software") 
-            .put("SalamWeb", "SalamWeb") 
-            .put("UC Browser", "UCBrowser")
-            .put("Brave", "BraveSoftware")
-            .put("Google Chrome", "Chrome")
+            .put(NbBundle.getMessage(Chrome.class, "Browser.name.Microsoft.Edge"), "Microsoft/Edge") 
+            .put(NbBundle.getMessage(Chrome.class, "Browser.name.Yandex"), "YandexBrowser") 
+            .put(NbBundle.getMessage(Chrome.class, "Browser.name.Opera"), "Opera Software") 
+            .put(NbBundle.getMessage(Chrome.class, "Browser.name.SalamWeb"), "SalamWeb") 
+            .put(NbBundle.getMessage(Chrome.class, "Browser.name.UC.Browser"), "UCBrowser")
+            .put(NbBundle.getMessage(Chrome.class, "Browser.name.Brave"), "BraveSoftware")
+            .put(NbBundle.getMessage(Chrome.class, "Browser.name.Google.Chrome"), "Chrome")
             .build();