ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i18n improvements (no more need for iconv)

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4427 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2010-01-11 03:12:35 +00:00
parent 23947aafc1
commit 081b0a295d
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/utils/translation.cpp
View File

@ -314,7 +314,10 @@ Translations::Translations()
setlocale(LC_MESSAGES, ""); setlocale(LC_MESSAGES, "");
#endif #endif
bindtextdomain (PACKAGE, file_manager->getTranslationDir().c_str()); bindtextdomain (PACKAGE, file_manager->getTranslationDir().c_str());
bind_textdomain_codeset(PACKAGE, "UTF-8"); if (sizeof(wchar_t) == 32) bind_textdomain_codeset(PACKAGE, "UTF-32");
else if (sizeof(wchar_t) == 16) bind_textdomain_codeset(PACKAGE, "UTF-16");
else assert(false);
//bind_textdomain_codeset(PACKAGE, "iso-8859-1"); //bind_textdomain_codeset(PACKAGE, "iso-8859-1");
textdomain (PACKAGE); textdomain (PACKAGE);
#endif #endif
@ -336,15 +339,31 @@ wchar_t* w_gettext(const char* original)
const char* original_t = original; const char* original_t = original;
#endif #endif
wchar_t* out_ptr = utf8_to_wchar_t(original_t); /*
// print
for (int n=0;; n+=4)
{
std::cout << original_t[n] << " (" << (unsigned int)(original_t[n]) << "), "
<< original_t[n+1] << " (" << (unsigned int)(original_t[n+1]) << "), "
<< original_t[n+2] << " (" << (unsigned int)(original_t[n+2]) << "), "
<< original_t[n+3] << " (" << (unsigned int)(original_t[n+3]) << ")\n";
if (original_t[n] | original_t[n+1] | original_t[n+2] | original_t[n+3] == 0) break;
}
*/
//wchar_t* out_ptr = utf8_to_wchar_t(original_t);
wchar_t* out_ptr = (wchar_t*)original_t;
/*
if (out_ptr == NULL) if (out_ptr == NULL)
{ {
std::cerr << " ERROR in w_gettext! could not be converted to wchar_t.\n"; std::cerr << " ERROR in w_gettext! could not be converted to wchar_t.\n";
} }
*/
std::wcout << L" translation : " << irr::core::stringc(out_ptr).c_str() << std::endl; std::wcout << L" translation : " << out_ptr << std::endl;
fprintf(stdout, "translation is '%s'.\n", irr::core::stringc(out_ptr).c_str()); //std::wcout << L" translation : " << irr::core::stringc(out_ptr).c_str() << std::endl;
//fprintf(stdout, "translation is '%s'.\n", irr::core::stringc(out_ptr).c_str());
return out_ptr; return out_ptr;