From 20d55c62670ce0a6986bd93bc8f2fa2e7616e477 Mon Sep 17 00:00:00 2001
From: lumberyard-employee-dm
 <56135373+lumberyard-employee-dm@users.noreply.github.com>
Date: Fri, 17 Dec 2021 16:31:39 -0600
Subject: [PATCH] Fixed the translation error messages for GraphCanvas

It was unconditionally logging an AZ_Warning and AZ_Error if a
translation entry with the same key was added to the database.
This didn't account for the same key and value being added to the
database, so loading the same translation file twice would result in
error messages for each entry.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
---
 .../Code/Source/Translation/TranslationDatabase.cpp       | 8 +++++---
 .../Code/Source/Translation/TranslationSerializer.cpp     | 7 ++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Gems/GraphCanvas/Code/Source/Translation/TranslationDatabase.cpp b/Gems/GraphCanvas/Code/Source/Translation/TranslationDatabase.cpp
index 0b5029de63..448f69adfa 100644
--- a/Gems/GraphCanvas/Code/Source/Translation/TranslationDatabase.cpp
+++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationDatabase.cpp
@@ -163,9 +163,11 @@ namespace GraphCanvas
             }
             else
             {
-                AZStd::string warning = AZStd::string::format("Unable to store key: %s with value: %s because that key already exists with value: %s", entry.first.c_str(), entry.second.c_str(), m_database[entry.first].c_str());
-                AZ_Warning("TranslationSerializer", false, warning.c_str());
-                warnings = true;
+                const bool valueMatches = entry.second == m_database[entry.first];
+                AZ_Warning("TranslationDatabase", valueMatches,
+                    R"(Unable to store key: "%s" with value: "%s" because that key already exists with value: "%s")",
+                    entry.first.c_str(), entry.second.c_str(), m_database[entry.first].c_str());
+                warnings = !valueMatches;
             }
         }
 
diff --git a/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp b/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp
index 754267b27d..72cbfbb9e8 100644
--- a/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp
+++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp
@@ -24,11 +24,12 @@ namespace GraphCanvas
             }
             else
             {
-                const AZStd::string& existingValue = translationDbItr->second;
+                [[maybe_unused]] const AZStd::string& existingValue = translationDbItr->second;
 
                 // There is a name collision
-                const AZStd::string error = AZStd::string::format("Unable to store key: %s with value: %s because that key already exists with value: %s (proposed: %s)", baseKey.c_str(), it.GetString(), existingValue.c_str(), it.GetString());
-                AZ_Error("TranslationSerializer", false, error.c_str());
+                AZ_Error("TranslationSerializer", existingValue == it.GetString(),
+                    R"(Unable to store key: "%s" with value: "%s" because that key already exists with value: "%s" (proposed: "%s"))",
+                    baseKey.c_str(), it.GetString(), existingValue.c_str(), it.GetString());
             }
         }
         else if (it.IsObject())