GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 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

8
Source/Engine/Localization/LocalizationSettings.h
View File

@@ -11,7 +11,7 @@
/// </summary>
API_CLASS(sealed, Namespace="FlaxEditor.Content.Settings") class FLAXENGINE_API LocalizationSettings : public SettingsBase
{
DECLARE_SCRIPTING_TYPE_MINIMAL(LocalizationSettings);
DECLARE_SCRIPTING_TYPE_MINIMAL(LocalizationSettings);
public:
/// <summary>
/// The list of the string localization tables used by the game.
@@ -19,6 +19,12 @@ public:
API_FIELD()
Array<AssetReference<LocalizedStringTable>> LocalizedStringTables;
/// <summary>
/// The default fallback language to use if localization system fails to pick the system locale language (eg. en-GB).
/// </summary>
API_FIELD()
String DefaultFallbackLanguage;
public:
/// <summary>
/// Gets the instance of the settings asset (default value if missing). Object returned by this method is always loaded with valid data to use.