minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Use narrow_to_wide in gettext instead of os dependent conversion fct

This commit is contained in:
sapier 2014-04-06 10:39:32 +02:00
parent ea0df3e4cb
commit a230e1e736
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gettext.h
View File

@ -48,6 +48,10 @@ void init_gettext(const char *path,std::string configured_language,int argc, cha
void init_gettext(const char *path,std::string configured_language);
#endif
extern std::wstring narrow_to_wide(const std::string& mbs);
#include "util/numeric.h"
/******************************************************************************/
inline wchar_t* chartowchar_t(const char *str)
{
@ -66,7 +70,10 @@ inline wchar_t* chartowchar_t(const char *str)
#else
size_t l = strlen(str)+1;
nstr = new wchar_t[l];
mbstowcs(nstr, str, l);
std::wstring intermediate = narrow_to_wide(str);
memset(nstr,0,l);
memcpy(nstr,intermediate.c_str(),l*sizeof(wchar_t));
#endif
return nstr;