mirror of
https://github.com/g4klx/MMDVMHost
synced 2025-12-24 01:25:41 +08:00
Merge pull request #115 from g0wfv/LocaleFix
Fix DMR unable to log into master due to locale issues
This commit is contained in:
@@ -752,7 +752,7 @@ void CHD44780::clockInt(unsigned int ms)
|
||||
Time = localtime(¤tTime);
|
||||
}
|
||||
|
||||
setlocale(LC_ALL,"");
|
||||
setlocale(LC_TIME,"");
|
||||
strftime(m_buffer1, 128, "%X", Time); // Time
|
||||
strftime(m_buffer2, 128, "%x", Time); // Date
|
||||
|
||||
|
||||
@@ -246,7 +246,7 @@ void CNextion::clockInt(unsigned int ms)
|
||||
else
|
||||
Time = ::localtime(¤tTime);
|
||||
|
||||
setlocale(LC_ALL,"");
|
||||
setlocale(LC_TIME,"");
|
||||
char text[50U];
|
||||
strftime(text, 50, "t2.txt=\"%x %X\"", Time);
|
||||
sendCommand(text);
|
||||
|
||||
Reference in New Issue
Block a user