dprevot/php-sqlsrv
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed locale issue

Browse source
This commit is contained in:
David Puglielli 2019-05-11 13:35:12 -07:00
parent ffd9849750
commit 06ff53daa8
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
source/shared/localizationimpl.cpp
View file

@ -280,9 +280,25 @@ bool EncodingConverter::Initialize()
using namespace std;
SystemLocale::SystemLocale( const char * localeName )
: m_pLocale( new std::locale(localeName) )
, m_uAnsiCP(CP_UTF8)
: m_uAnsiCP(CP_UTF8)
, m_pLocale(NULL)
{
const char* DEFAULT_LOCALE = "en_US.UTF-8";
try
{
m_pLocale = new std::locale(localeName);
}
catch(const std::exception& e)
{
localeName = DEFAULT_LOCALE;
}
if(!m_pLocale)
m_pLocale = new std::locale(localeName);
// Mapping from locale charset to codepage
struct LocaleCP
{
const char* localeName;
@ -331,8 +347,7 @@ const SystemLocale & SystemLocale::Singleton()
#if !defined(__GNUC__) || defined(NO_THREADSAFE_STATICS)
#error "Relying on GCC's threadsafe initialization of local statics."
#endif
// get locale from environment and set as default
static const SystemLocale s_Default(setlocale(LC_ALL, NULL));
static const SystemLocale s_Default(setlocale(LC_CTYPE, NULL));
return s_Default;
}