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

5
Source/Editor/CustomEditors/Editors/LocalizedStringEditor.cs
View File

@@ -176,7 +176,6 @@ namespace FlaxEditor.CustomEditors.Editors
allKeys.Add(e.Key);
}
}
_valueElement.TextBox.SetTextAsUser(null);
string newKey = null;
if (string.IsNullOrEmpty(_idElement.Text))
{
@@ -216,17 +215,19 @@ namespace FlaxEditor.CustomEditors.Editors
var newValue = _valueElement.Text;
Editor.Log(newKey + (newValue != null ? " = " + newValue : string.Empty));
var locales = settings.LocalizedStringTables.GroupBy(x => x.Locale);
var defaultLocale = settings.LocalizedStringTables[0].Locale;
foreach (var locale in locales)
{
var table = locale.First();
var entries = table.Entries;
if (table.Locale == "en")
if (table.Locale == defaultLocale)
entries[newKey] = new[] { newValue };
else
entries[newKey] = new[] { string.Empty };
table.Entries = entries;
table.Save();
}
_valueElement.TextBox.SetTextAsUser(null);
_idElement.TextBox.SetTextAsUser(newKey);
Profiler.EndEvent();
}