From a0d8f1617449e20a258a9acdff88b15189e2079b Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Thu, 21 Jan 2021 11:33:50 -0500
Subject: [PATCH] CVT Fixed persona message

---
 .../communications/relationships/Bundle.properties-MERGED    | 5 +----
 .../autopsy/communications/relationships/SummaryViewer.java  | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED
index b70541a494..7ab1592b9c 100755
--- a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED
@@ -35,12 +35,8 @@ MessageViewer_viewMessage_all=All
 MessageViewer_viewMessage_calllogs=Call Logs
 MessageViewer_viewMessage_selected=Selected
 MessageViewer_viewMessage_unthreaded=Unthreaded
-# {0} - PersonaAccount count
 RelationshipsNodeUtilities_Tooltip_suffix=(1 of {0})
-# {0} - Contact Name
-# {1} - Persona Name
 RelationshipsNodeUtilities_Tooltip_Template=Contact: {0} - Persona: {1}
-# {0} - accountIdentifer
 SummaryPersonaPane_not_account_in_cr=Unable to find an account with identifier {0} in the Central Repository.
 SummaryViewer.countsPanel.border.title=Communications
 OutlineViewPanel.messageLabel.text=<Control Disabled>
@@ -59,6 +55,7 @@ SummaryViewer_Device_Account_Description=This account was referenced by a device
 SummaryViewer_Fetching_References=<Fetching File References>
 SummaryViewer_FileRef_Message=<Select a single account to see File References>
 SummaryViewer_FileRefNameColumn_Title=Path
+SummaryViewer_Persona_CR_Message=<Enable Central Repository to view Personas>
 SummaryViewer_Persona_Message=<Enable Central Repository to view Personas>
 SummaryViewer_Select_account_for_persona=<Select a single account to see Persona(s)>
 SummaryViewer_TabTitle=Summary
diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java
index 4cf917eac1..ae263c08b2 100755
--- a/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java
+++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java
@@ -205,7 +205,7 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
 
     @Messages({
         "SummaryViewer_Fetching_References=<Fetching File References>",
-        "SummaryViewer_Persona_Message=<Enable Central Repository to view Personas>"
+        "SummaryViewer_Persona_CR_Message=<Enable Central Repository to view Personas>"
     })
     private void updateOtherAccountInfo(final Account account) {
         SummaryPanelWorker worker = new SummaryPanelWorker(account) {
@@ -228,7 +228,7 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
                     if (CentralRepository.isEnabled()) {
                         ((SummaryPersonaPane) personaPanel).updatePersonaList(account, results.getCRAccount(), personaList);
                     } else {
-                        ((SummaryPersonaPane) personaPanel).setMessage("Bundle.SummaryViewer_Persona_Message()");
+                        ((SummaryPersonaPane) personaPanel).setMessage(Bundle.SummaryViewer_Persona_CR_Message());
                         ((SummaryPersonaPane) personaPanel).showMessagePanel();
                     }