You've already forked UnrealEngineUWP
mirror of
https://github.com/izzy2lost/UnrealEngineUWP.git
synced 2026-03-26 18:15:20 -07:00
Fixed undesired conditional logic that skipped some logic necessary for live culture swapping when in certain configurations such as shipping. Enabled use of culture switch on commandline in all configurations.
[CL 2619262 by Saul Abreu in Main branch]
This commit is contained in:
Saul Abreu
committed by
sabreu@phosphorgames.com
sabreu@phosphorgames.com
parent
1a35d6ed17
commit
ee8bbfb65c
@@ -46,84 +46,81 @@ void EndInitTextLocalization()
|
||||
GConfig->SetString(TEXT("Internationalization"), TEXT("Culture"), *RequestedCultureName, GEngineIni);
|
||||
}
|
||||
}
|
||||
// Use culture override specified on commandline.
|
||||
else if (FParse::Value(FCommandLine::Get(), TEXT("CULTURE="), RequestedCultureName))
|
||||
{
|
||||
//UE_LOG(LogInit, Log, TEXT("Overriding culture %s w/ command-line option".), *CultureName);
|
||||
}
|
||||
else
|
||||
#if !UE_BUILD_SHIPPING
|
||||
// Use culture override specified on commandline.
|
||||
if (FParse::Value(FCommandLine::Get(), TEXT("CULTURE="), RequestedCultureName))
|
||||
#if WITH_EDITOR
|
||||
// See if we've been provided a culture override in the editor
|
||||
if(GConfig->GetString( TEXT("Internationalization"), TEXT("Culture"), RequestedCultureName, GEditorSettingsIni ))
|
||||
{
|
||||
//UE_LOG(LogInit, Log, TEXT("Overriding culture %s w/ command-line option".), *CultureName);
|
||||
//UE_LOG(LogInit, Log, TEXT("Overriding culture %s w/ editor configuration."), *CultureName);
|
||||
}
|
||||
else
|
||||
#endif // !UE_BUILD_SHIPPING
|
||||
#if WITH_EDITOR
|
||||
// See if we've been provided a culture override in the editor
|
||||
if(GConfig->GetString( TEXT("Internationalization"), TEXT("Culture"), RequestedCultureName, GEditorSettingsIni ))
|
||||
#endif // WITH_EDITOR
|
||||
// Use culture specified in engine configuration.
|
||||
if(GConfig->GetString( TEXT("Internationalization"), TEXT("Culture"), RequestedCultureName, GEngineIni ))
|
||||
{
|
||||
//UE_LOG(LogInit, Log, TEXT("Overriding culture %s w/ editor configuration."), *CultureName);
|
||||
//UE_LOG(LogInit, Log, TEXT("Overriding culture %s w/ engine configuration."), *CultureName);
|
||||
}
|
||||
else
|
||||
#endif // WITH_EDITOR
|
||||
// Use culture specified in engine configuration.
|
||||
if(GConfig->GetString( TEXT("Internationalization"), TEXT("Culture"), RequestedCultureName, GEngineIni ))
|
||||
{
|
||||
RequestedCultureName = I18N.GetDefaultCulture()->GetName();
|
||||
}
|
||||
|
||||
FString TargetCultureName = RequestedCultureName;
|
||||
{
|
||||
TArray<FString> LocalizationPaths;
|
||||
if(ShouldLoadEditor)
|
||||
{
|
||||
//UE_LOG(LogInit, Log, TEXT("Overriding culture %s w/ engine configuration."), *CultureName);
|
||||
LocalizationPaths += FPaths::GetEditorLocalizationPaths();
|
||||
}
|
||||
if(ShouldLoadGame)
|
||||
{
|
||||
LocalizationPaths += FPaths::GetGameLocalizationPaths();
|
||||
}
|
||||
LocalizationPaths += FPaths::GetEngineLocalizationPaths();
|
||||
|
||||
// Validate the locale has data or fallback to one that does.
|
||||
TArray< FCultureRef > AvailableCultures;
|
||||
I18N.GetCulturesWithAvailableLocalization(LocalizationPaths, AvailableCultures, false);
|
||||
|
||||
FString ValidCultureName;
|
||||
ValidCultureName.Empty();
|
||||
FCulturePtr TargetCulture = I18N.GetCulture(TargetCultureName);
|
||||
if (TargetCulture.IsValid())
|
||||
{
|
||||
TArray<FString> PrioritizedParentCultureNames = TargetCulture->GetPrioritizedParentCultureNames();
|
||||
for (const FString& CultureName : PrioritizedParentCultureNames)
|
||||
{
|
||||
FCulturePtr ValidCulture = I18N.GetCulture(CultureName);
|
||||
if (ValidCulture.IsValid() && AvailableCultures.Contains(ValidCulture.ToSharedRef()))
|
||||
{
|
||||
ValidCultureName = CultureName;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(!ValidCultureName.IsEmpty())
|
||||
{
|
||||
if(RequestedCultureName != ValidCultureName)
|
||||
{
|
||||
// Make the user aware that the localization data belongs to a parent culture.
|
||||
UE_LOG(LogTextLocalizationManager, Log, TEXT("No specific translations for ('%s') exist, so ('%s') translations will be used."), *RequestedCultureName, *ValidCultureName);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
RequestedCultureName = I18N.GetDefaultCulture()->GetName();
|
||||
// Fallback to English.
|
||||
UE_LOG(LogTextLocalizationManager, Log, TEXT("No translations for ('%s') exist, falling back to 'en' for localization and internationalization data."), *RequestedCultureName);
|
||||
TargetCultureName = TEXT("en");
|
||||
}
|
||||
}
|
||||
|
||||
FString TargetCultureName = RequestedCultureName;
|
||||
{
|
||||
TArray<FString> LocalizationPaths;
|
||||
if(ShouldLoadEditor)
|
||||
{
|
||||
LocalizationPaths += FPaths::GetEditorLocalizationPaths();
|
||||
}
|
||||
if(ShouldLoadGame)
|
||||
{
|
||||
LocalizationPaths += FPaths::GetGameLocalizationPaths();
|
||||
}
|
||||
LocalizationPaths += FPaths::GetEngineLocalizationPaths();
|
||||
|
||||
// Validate the locale has data or fallback to one that does.
|
||||
TArray< FCultureRef > AvailableCultures;
|
||||
I18N.GetCulturesWithAvailableLocalization(LocalizationPaths, AvailableCultures, false);
|
||||
|
||||
FString ValidCultureName;
|
||||
ValidCultureName.Empty();
|
||||
FCulturePtr TargetCulture = I18N.GetCulture(TargetCultureName);
|
||||
if (TargetCulture.IsValid())
|
||||
{
|
||||
TArray<FString> PrioritizedParentCultureNames = TargetCulture->GetPrioritizedParentCultureNames();
|
||||
for (const FString& CultureName : PrioritizedParentCultureNames)
|
||||
{
|
||||
FCulturePtr ValidCulture = I18N.GetCulture(CultureName);
|
||||
if (ValidCulture.IsValid() && AvailableCultures.Contains(ValidCulture.ToSharedRef()))
|
||||
{
|
||||
ValidCultureName = CultureName;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(!ValidCultureName.IsEmpty())
|
||||
{
|
||||
if(RequestedCultureName != ValidCultureName)
|
||||
{
|
||||
// Make the user aware that the localization data belongs to a parent culture.
|
||||
UE_LOG(LogTextLocalizationManager, Log, TEXT("No specific translations for ('%s') exist, so ('%s') translations will be used."), *RequestedCultureName, *ValidCultureName);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Fallback to English.
|
||||
UE_LOG(LogTextLocalizationManager, Log, TEXT("No translations for ('%s') exist, falling back to 'en' for localization and internationalization data."), *RequestedCultureName);
|
||||
TargetCultureName = TEXT("en");
|
||||
}
|
||||
}
|
||||
|
||||
I18N.SetCurrentCulture(TargetCultureName);
|
||||
I18N.SetCurrentCulture(TargetCultureName);
|
||||
}
|
||||
|
||||
FTextLocalizationManager::Get().LoadLocalizationResourcesForCulture(I18N.GetCurrentCulture()->GetName(), ShouldLoadEditor, ShouldLoadGame);
|
||||
@@ -362,53 +359,48 @@ FTextDisplayStringRef FTextLocalizationManager::GetDisplayString(const FString&
|
||||
|
||||
const FTextDisplayStringRef UnlocalizedString = MakeShareable( new FString( SourceString ? **SourceString : TEXT("") ) );
|
||||
|
||||
// If live-culture-swap is enabled or the system is uninitialized - make entries so that they can be updated when system is initialized or a culture swap occurs.
|
||||
CA_SUPPRESS(6236)
|
||||
CA_SUPPRESS(6316)
|
||||
if( !(bIsInitialized) || ENABLE_LOC_TESTING )
|
||||
#if ENABLE_LOC_TESTING
|
||||
if( (bShouldLEETIFYAll || bShouldLEETIFYUnlocalizedString) && SourceString )
|
||||
{
|
||||
FInternationalization::Leetify(*UnlocalizedString);
|
||||
if(*UnlocalizedString == *SourceString)
|
||||
{
|
||||
#if ENABLE_LOC_TESTING
|
||||
if( (bShouldLEETIFYAll || bShouldLEETIFYUnlocalizedString) && SourceString )
|
||||
{
|
||||
FInternationalization::Leetify(*UnlocalizedString);
|
||||
if(*UnlocalizedString == *SourceString)
|
||||
{
|
||||
UE_LOG(LogTextLocalizationManager, Warning, TEXT("Leetify failed to alter a string (%s)."), **SourceString );
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
if ( UnlocalizedString->IsEmpty() )
|
||||
{
|
||||
if ( !bIsInitialized )
|
||||
{
|
||||
*(UnlocalizedString) = AccessedStringBeforeLocLoadedErrorMsg;
|
||||
}
|
||||
}
|
||||
|
||||
FDisplayStringLookupTable::FDisplayStringEntry NewEntry(
|
||||
#if ENABLE_LOC_TESTING
|
||||
bShouldLEETIFYAll /*bIsLocalized*/
|
||||
#else
|
||||
false /*bIsLocalized*/
|
||||
#endif
|
||||
, TEXT("")
|
||||
, SourceString ? FCrc::StrCrc32(**SourceString) : 0 /*SourceStringHash*/
|
||||
, UnlocalizedString /*String*/
|
||||
);
|
||||
|
||||
if( !LiveKeyTable )
|
||||
{
|
||||
LiveKeyTable = &(DisplayStringLookupTable.NamespacesTable.Add( Namespace, FDisplayStringLookupTable::FKeysTable() ));
|
||||
}
|
||||
|
||||
LiveKeyTable->Add( Key, NewEntry );
|
||||
|
||||
NamespaceKeyLookupTable.Add(NewEntry.DisplayString, FNamespaceKeyEntry(Namespace, Key));
|
||||
|
||||
UE_LOG(LogTextLocalizationManager, Warning, TEXT("Leetify failed to alter a string (%s)."), **SourceString );
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
return UnlocalizedString;
|
||||
if ( UnlocalizedString->IsEmpty() )
|
||||
{
|
||||
if ( !bIsInitialized )
|
||||
{
|
||||
*(UnlocalizedString) = AccessedStringBeforeLocLoadedErrorMsg;
|
||||
}
|
||||
}
|
||||
|
||||
// Make entries so that they can be updated when system is initialized or a culture swap occurs.
|
||||
FDisplayStringLookupTable::FDisplayStringEntry NewEntry(
|
||||
#if ENABLE_LOC_TESTING
|
||||
bShouldLEETIFYAll /*bIsLocalized*/
|
||||
#else
|
||||
false /*bIsLocalized*/
|
||||
#endif
|
||||
, TEXT("")
|
||||
, SourceString ? FCrc::StrCrc32(**SourceString) : 0 /*SourceStringHash*/
|
||||
, UnlocalizedString /*String*/
|
||||
);
|
||||
|
||||
if( !LiveKeyTable )
|
||||
{
|
||||
LiveKeyTable = &(DisplayStringLookupTable.NamespacesTable.Add( Namespace, FDisplayStringLookupTable::FKeysTable() ));
|
||||
}
|
||||
|
||||
LiveKeyTable->Add( Key, NewEntry );
|
||||
|
||||
NamespaceKeyLookupTable.Add(NewEntry.DisplayString, FNamespaceKeyEntry(Namespace, Key));
|
||||
|
||||
|
||||
return UnlocalizedString;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user