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

Merge remote-tracking branch 'origin/master' into 1.6

Browse Source 
# Conflicts:
#	Source/Editor/CustomEditors/Dedicated/UIControlEditor.cs
This commit is contained in:
Wojtek Figat
2023-05-08 22:22:32 +02:00
parent 69cdb1268a 8edc154501
commit 80e6853f44
11 changed files with 103 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Engine/Platform/Linux/LinuxPlatform.cpp
View File

@@ -2048,12 +2048,12 @@ bool LinuxPlatform::Init()
// Get user locale string
setlocale(LC_ALL, "");
const char* locale = setlocale(LC_CTYPE, NULL);
if (strcmp(locale, "C") == 0)
locale = "";
UserLocale = String(locale);
if (UserLocale.FindLast('.') != -1)
UserLocale = UserLocale.Left(UserLocale.Find('.'));
UserLocale.Replace('_', '-');
if (UserLocale == TEXT("C"))
UserLocale = TEXT("en");
// Get computer name string
gethostname(buffer, UNIX_APP_BUFF_SIZE);