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

Merge branch 'local' of git://github.com/honzapatCZ/FlaxEngine into honzapatCZ-local

Browse Source 
# Conflicts:
#	Source/Editor/Windows/Assets/LocalizedStringTableWindow.cs
#	Source/Engine/Localization/Localization.cpp
#	Source/Engine/Localization/LocalizedStringTable.h
This commit is contained in:
Wojciech Figat
2021-12-09 11:31:06 +01:00
parent 1a001613a9 4be0888776
commit 9c7b66ba70
7 changed files with 119 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@ public:
CultureInfo CurrentCulture;
CultureInfo CurrentLanguage;
Array<AssetReference<LocalizedStringTable>> LocalizedStringTables;
Array<AssetReference<LocalizedStringTable>> FallbackStringTables;
LocalizationService()
: EngineService(TEXT("Localization"), -500)
@@ -28,6 +29,42 @@ public:
void OnLocalizationChanged();
const String& Get(const String& id, int32 index, const String& fallback) const
{
if (id.IsEmpty())
return fallback;
// Try current tables
for (auto& e : LocalizedStringTables)
{
const auto table = e.Get();
const auto messages = table ? table->Entries.TryGet(id) : nullptr;
if (messages && messages->Count() > index)
return messages->At(index);
}
// Try fallback tables for current tables
for (auto& e : LocalizedStringTables)
{
const auto table = e.Get();
const auto fallbackTable = table ? table->FallbackTable.Get() : nullptr;
const auto messages = fallbackTable ? fallbackTable->Entries.TryGet(id) : nullptr;
if (messages && messages->Count() > index)
return messages->At(index);
}
// Try fallback language tables
for (auto& e : FallbackStringTables)
{
const auto table = e.Get();
const auto messages = table ? table->Entries.TryGet(id) : nullptr;
if (messages && messages->Count() > index)
return messages->At(index);
}
return fallback;
}
bool Init() override;
};
@@ -46,6 +83,7 @@ void LocalizationSettings::Apply()
void LocalizationSettings::Deserialize(DeserializeStream& stream, ISerializeModifier* modifier)
{
DESERIALIZE(LocalizedStringTables);
DESERIALIZE(DefaultFallbackLanguage);
}
LocalizedString::LocalizedString(const LocalizedString& other)
@@ -119,10 +157,12 @@ void LocalizationService::OnLocalizationChanged()
PROFILE_CPU();
Instance.LocalizedStringTables.Clear();
Instance.FallbackStringTables.Clear();
const StringView en(TEXT("en"));
// Collect all localization tables into mapping locale -> tables
auto& settings = *LocalizationSettings::Get();
Dictionary<String, Array<AssetReference<LocalizedStringTable>, InlinedAllocation<8>>> tables;
Dictionary<String, Array<AssetReference<LocalizedStringTable>, InlinedAllocation<32>>> tables;
for (auto& e : settings.LocalizedStringTables)
{
auto table = e.Get();
@@ -142,9 +182,13 @@ void LocalizationService::OnLocalizationChanged()
table = tables.TryGet(parentLanguage.GetName());
if (!table)
{
// Fallback to English
const CultureInfo english("en");
table = tables.TryGet(english.GetName());
// Fallback to Default
table = tables.TryGet(settings.DefaultFallbackLanguage);
if (!table)
{
// Fallback to English
table = tables.TryGet(en);
}
}
}
@@ -162,6 +206,17 @@ void LocalizationService::OnLocalizationChanged()
}
LOG(Info, "Using localization for {0}", locale);
Instance.LocalizedStringTables.Add(table->Get(), table->Count());
if (locale != settings.DefaultFallbackLanguage || locale != en)
{
// Cache fallback language tables to support additional text resolving in case of missing entries in the current language
table = tables.TryGet(settings.DefaultFallbackLanguage);
if (!table)
table = tables.TryGet(en);
if (table)
{
Instance.FallbackStringTables.Add(table->Get(), table->Count());
}
}
}
#if PLATFORM_ANDROID
@@ -193,8 +248,12 @@ void LocalizationService::OnLocalizationChanged()
{
std::locale::global(std::locale(localeName));
}
catch (std::runtime_error const&) {}
catch (...) {}
catch (std::runtime_error const&)
{
}
catch (...)
{
}
}
#endif
@@ -258,68 +317,12 @@ void Localization::SetCurrentLanguageCulture(const CultureInfo& value)
String Localization::GetString(const String& id, const String& fallback)
{
const String* result = nullptr;
for (auto& e : Instance.LocalizedStringTables)
{
const auto table = e.Get();
const auto messages = table ? table->Entries.TryGet(id) : nullptr;
if (messages && messages->Count() != 0)
{
result = &messages->At(0);
break;
}
}
if (!result)
{
// Try using fallback tables
for (auto& e : Instance.LocalizedStringTables)
{
const auto table = e.Get();
const auto fallbackTable = table ? table->FallbackTable.Get() : nullptr;
const auto messages = fallbackTable ? fallbackTable->Entries.TryGet(id) : nullptr;
if (messages && messages->Count() != 0)
{
result = &messages->At(0);
break;
}
}
}
if (!result)
result = &fallback;
return *result;
return Instance.Get(id, 0, fallback);
}
String Localization::GetPluralString(const String& id, int32 n, const String& fallback)
{
CHECK_RETURN(n >= 1, fallback);
n--;
const String* result = nullptr;
for (auto& e : Instance.LocalizedStringTables)
{
const auto table = e.Get();
const auto messages = table ? table->Entries.TryGet(id) : nullptr;
if (messages && messages->Count() > n)
{
result = &messages->At(n);
break;
}
}
if (!result)
{
// Try using fallback tables
for (auto& e : Instance.LocalizedStringTables)
{
const auto table = e.Get();
const auto fallbackTable = table ? table->FallbackTable.Get() : nullptr;
const auto messages = fallbackTable ? fallbackTable->Entries.TryGet(id) : nullptr;
if (messages && messages->Count() > n)
{
result = &messages->At(n);
break;
}
}
}
if (!result)
result = &fallback;
return String::Format(result->GetText(), n);
CHECK_RETURN(n >= 1, String::Format(fallback.GetText(), n));
const String& format = Instance.Get(id, n - 1, fallback);
return String::Format(format.GetText(), n);
}