Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-21 08:27:13 +01:00
Code Issues Releases Wiki Activity

Hopefully this will "fix" the Serbian (Cyrillic) issues on OSX.

Browse Source 
Since I ran out of time, I put OSX back to the way it was in
2.1.0...forced locale to en_US.  Heck, I'm not sure there is
a "real" fix anyway.

At least, the problem languages appear to be happy now, even
when using the validators.
This commit is contained in:
Leland Lucius
2015-06-07 08:03:18 -05:00
parent b1591b5767
commit a1edf31c99
2 changed files with 24 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/AudacityApp.cpp
View File

@@ -971,36 +971,24 @@ wxLanguageInfo userLangs[] =
void AudacityApp::InitLang( const wxString & lang )
{
if( mLocale )
if (mLocale)
delete mLocale;
wxString canon = lang;
#if defined(__WXMAC__)
// This should be reviewed again during the wx3 conversion.
// On OSX, the eventual call to setlocale() will fail to completely
// set the locale causing printf() and kin to still use the period
// as the decimal separator when the locale specifies something
// else.
const wxLanguageInfo *info = wxLocale::FindLanguageInfo(lang);
if (info) {
canon = info->CanonicalName;
}
// On OSX, if the LANG environment variable isn't set when
// using a language like Japanese, an assertion will trigger
// because conversion to Japanese from "?" doesn't return a
// valid length, so make OSX happy by defining/overriding
// the LANG environment variable with what the user has
// chosen.
wxSetEnv(wxT("LANG"), canon);
// the LANG environment variable with U.S. English for now.
wxSetEnv(wxT("LANG"), wxT("en_US.UTF-8"));
#endif
#if wxCHECK_VERSION(3,0,0)
mLocale = new wxLocale(wxT(""), canon, wxT(""), true);
mLocale = new wxLocale(wxT(""), lang, wxT(""), true);
#else
mLocale = new wxLocale(wxT(""), canon, wxT(""), true, true);
mLocale = new wxLocale(wxT(""), lang, wxT(""), true, true);
#endif
for(unsigned int i=0; i<audacityPathList.GetCount(); i++)