From e96a90181e667c6e2bd6060ebfa58829daf7b2fc Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Thu, 2 Mar 2006 16:00:51 +0000 Subject: [PATCH] convert UTF-8 language names to active code page before displaying --- stepmania/src/smpackage/CreateLanguageDlg.cpp | 3 ++- stepmania/src/smpackage/LanguagesDlg.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/stepmania/src/smpackage/CreateLanguageDlg.cpp b/stepmania/src/smpackage/CreateLanguageDlg.cpp index 7647926df3..b512b618be 100644 --- a/stepmania/src/smpackage/CreateLanguageDlg.cpp +++ b/stepmania/src/smpackage/CreateLanguageDlg.cpp @@ -41,7 +41,8 @@ BOOL CreateLanguageDlg::OnInitDialog() FOREACH_CONST( const LanguageInfo*, v, i ) { RString s = SMPackageUtil::GetLanguageDisplayString((*i)->szIsoCode); - m_comboLanguages.AddString( s ); + RString sLanguage = ConvertUTF8ToACP( s ); + m_comboLanguages.AddString( sLanguage ); } ASSERT( !v.empty() ); m_comboLanguages.SetCurSel( 0 ); diff --git a/stepmania/src/smpackage/LanguagesDlg.cpp b/stepmania/src/smpackage/LanguagesDlg.cpp index fb768c0e96..827afb7245 100644 --- a/stepmania/src/smpackage/LanguagesDlg.cpp +++ b/stepmania/src/smpackage/LanguagesDlg.cpp @@ -100,7 +100,8 @@ void LanguagesDlg::OnSelchangeListThemes() FOREACH_CONST( RString, vs, s ) { RString sIsoCode = GetFileNameWithoutExtension(*s); - m_listLanguages.AddString( SMPackageUtil::GetLanguageDisplayString(sIsoCode) ); + RString sLanguage = SMPackageUtil::GetLanguageDisplayString(sIsoCode); + m_listLanguages.AddString( ConvertUTF8ToACP(sLanguage) ); } if( !vs.empty() ) m_listLanguages.SetSel( 0 );