birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed temporary migration code to replace 'key' entry in names files

Browse Source 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
This commit is contained in:
lsemp3d
2021-11-23 12:07:52 -08:00
parent d614857da3
commit 91076dbf79
2 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp
+2 -12
View File
@@ -68,12 +68,7 @@ namespace GraphCanvas
// if there is a "base" member within the object, then use it, otherwise use the index // if there is a "base" member within the object, then use it, otherwise use the index
if (array[i].IsObject()) if (array[i].IsObject())
{ {
if (array[i].HasMember(Schema::Field::deprecated_key)) if (array[i].HasMember(Schema::Field::key))
{
AZStd::string innerKey = array[i].FindMember(Schema::Field::deprecated_key)->value.GetString();
itemKey.append(AZStd::string::format(".%s", innerKey.c_str()));
}
else if (array[i].HasMember(Schema::Field::key))
{ {
AZStd::string innerKey = array[i].FindMember(Schema::Field::key)->value.GetString(); AZStd::string innerKey = array[i].FindMember(Schema::Field::key)->value.GetString();
itemKey.append(AZStd::string::format(".%s", innerKey.c_str())); itemKey.append(AZStd::string::format(".%s", innerKey.c_str()));
@@ -126,12 +121,7 @@ namespace GraphCanvas
AZStd::string keyStr; AZStd::string keyStr;
rapidjson::Value::ConstMemberIterator keyValue; rapidjson::Value::ConstMemberIterator keyValue;
if (entry.HasMember(Schema::Field::deprecated_key)) if (entry.HasMember(Schema::Field::key))
{
keyValue = entry.FindMember(Schema::Field::deprecated_key);
keyStr = keyValue->value.GetString();
}
else if (entry.HasMember(Schema::Field::key))
{ {
keyValue = entry.FindMember(Schema::Field::key); keyValue = entry.FindMember(Schema::Field::key);
keyStr = keyValue->value.GetString(); keyStr = keyValue->value.GetString();
Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.h
+4 -6
View File
@@ -28,12 +28,10 @@ namespace GraphCanvas
{ {
namespace Field namespace Field
{ {
// Moved away from "key" due to some strict filtering on secrets inline constexpr char key[] = "base";
static constexpr char deprecated_key[] = "key"; inline constexpr char context[] = "context";
static constexpr char key[] = "base"; inline constexpr char variant[] = "variant";
static constexpr char context[] = "context"; inline constexpr char entries[] = "entries";
static constexpr char variant[] = "variant";
static constexpr char entries[] = "entries";
} }
} }
} }