haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a side effect of our LOCALE_IO by using setlocale( LC_NUMERIC, "C" ) instead of setlocale( LC_ALL, "C" ) 

LC_NUMERIC is the right option to use in LOCALE_IO because only the floating point separator must be modified
When using LC_ALL, the Env var expansion wxGetEnv() was not working when the env var contains non ascii7 codes after a call to LOCALE_IO.
When using setlocale( LC_NUMERIC, "C" ) in LOCALE_IO, wxGetEnv() works fine.

Fixes: lp:1795990
https://bugs.launchpad.net/kicad/+bug/1795990
This commit is contained in:
jean-pierre charras 2018-10-07 16:07:10 +02:00
parent 34ea79eddb
commit de793aa43d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/common.cpp
View File

@ -65,9 +65,9 @@ LOCALE_IO::LOCALE_IO()
if( m_c_count++ == 0 )
{
// Store the user locale name, to restore this locale later, in dtor
m_user_locale = setlocale( LC_ALL, 0 );
m_user_locale = setlocale( LC_NUMERIC, nullptr );
// Switch the locale to C locale, to read/write files with fp numbers
setlocale( LC_ALL, "C" );
setlocale( LC_NUMERIC, "C" );
}
}
@ -78,7 +78,7 @@ LOCALE_IO::~LOCALE_IO()
if( --m_c_count == 0 )
{
// revert to the user locale
setlocale( LC_ALL, m_user_locale.c_str() );
setlocale( LC_NUMERIC, m_user_locale.c_str() );
}
}

2
common/pgm_base.cpp
View File

@ -713,7 +713,7 @@ bool PGM_BASE::SetLanguage( bool first_time )
if( result != dtst )
// string to double encode/decode does not work! Bug detected:
// Disable floating point localization:
setlocale( LC_ALL, "C" );
setlocale( LC_NUMERIC, "C" );
if( !m_locale->IsLoaded( dictionaryName ) )
m_locale->AddCatalog( dictionaryName );