GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'master' into local

Browse Source
This commit is contained in:
Nejcraft
2021-08-23 20:40:37 +02:00
committed by GitHub
parent d493eb9ada 79b7e76777
commit 67d5fc6a2a
79 changed files with 21230 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Engine/Localization/Localization.cpp
View File

@@ -294,7 +294,7 @@ String Localization::GetPluralString(const String& id, int32 n, const String& fa
return fallback;
CHECK_RETURN(n >= 1, fallback);
n--;
StringView result;
const String* result = nullptr;
for (auto& e : Instance.LocalizedStringTables)
{
const auto table = e.Get();
@@ -310,7 +310,7 @@ String Localization::GetPluralString(const String& id, int32 n, const String& fa
result = table->GetPluralString(id, n);
}
}
if (result.IsEmpty())
result = fallback;
return String::Format(result.GetText(), n);
if (!result)
result = &fallback;
return String::Format(result->GetText(), n);
}