Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #115 from g0wfv/LocaleFix

Browse source 
Fix DMR unable to log into master due to locale issues
This commit is contained in:
Jonathan Naylor 2016-07-03 05:55:51 +01:00 committed by GitHub
parent ef0ebb4d49 b565400b24
commit e3a799f21e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
HD44780.cpp
View file

@ -752,7 +752,7 @@ void CHD44780::clockInt(unsigned int ms)
Time = localtime(&currentTime);
}
setlocale(LC_ALL,"");
setlocale(LC_TIME,"");
strftime(m_buffer1, 128, "%X", Time); // Time
strftime(m_buffer2, 128, "%x", Time); // Date

2
Nextion.cpp
View file

@ -246,7 +246,7 @@ void CNextion::clockInt(unsigned int ms)
else
Time = ::localtime(&currentTime);
setlocale(LC_ALL,"");
setlocale(LC_TIME,"");
char text[50U];
strftime(text, 50, "t2.txt=\"%x %X\"", Time);
sendCommand(text);