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

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.

src/AudacityApp.cpp

@@ -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
+   // the LANG environment variable with U.S. English for now.
-   // chosen.
+   wxSetEnv(wxT("LANG"), wxT("en_US.UTF-8"));
-   wxSetEnv(wxT("LANG"), canon);
 #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++)

src/widgets/numformatter.cpp

@@ -39,77 +39,6 @@
 // local helpers
 // ----------------------------------------------------------------------------
 
-namespace
-{
-
-// Contains information about the locale which was used to initialize our
-// cached values of the decimal and thousands separators. Notice that it isn't
-// enough to store just wxLocale because the user code may call setlocale()
-// directly and storing just C locale string is not enough because we can use
-// the OS API directly instead of the CRT ones on some platforms. So just store
-// both.
-class LocaleId
-{
-public:
-    LocaleId()
-    {
-#if wxUSE_INTL
-        m_wxloc = NULL;
-#endif // wxUSE_INTL
-        m_cloc = NULL;
-    }
-
-    ~LocaleId()
-    {
-        Free();
-    }
-
-#if wxUSE_INTL
-    // Return true if this is the first time this function is called for this
-    // object or if the program locale has changed since the last time it was
-    // called. Otherwise just return false indicating that updating locale-
-    // dependent information is not necessary.
-    bool NotInitializedOrHasChanged()
-    {
-        wxLocale * const wxloc = wxGetLocale();
-        const char * const cloc = setlocale(LC_ALL, NULL);
-        if ( m_wxloc || m_cloc )
-        {
-            if ( m_wxloc == wxloc && strcmp(m_cloc, cloc) == 0 )
-                return false;
-
-            Free();
-        }
-        //else: Not initialized yet.
-
-        m_wxloc = wxloc;
-        m_cloc = strdup(cloc);
-
-        return true;
-    }
-#endif // wxUSE_INTL
-
-private:
-    void Free()
-    {
-#if wxUSE_INTL
-        free(m_cloc);
-#endif // wxUSE_INTL
-    }
-
-#if wxUSE_INTL
-    // Non-owned pointer to wxLocale which was used.
-    wxLocale *m_wxloc;
-#endif // wxUSE_INTL
-
-    // Owned pointer to the C locale string.
-    char *m_cloc;
-
-//    wxDECLARE_NO_COPY_CLASS(LocaleId);
-};
-
-} // anonymous namespace
-
 // ============================================================================
 // NumberFormatter implementation
 // ============================================================================
@@ -121,36 +50,16 @@ private:
 wxChar NumberFormatter::GetDecimalSeparator()
 {
 #if wxUSE_INTL
-    // Notice that while using static variable here is not MT-safe, the worst
+   struct lconv *info = localeconv();
-    // that can happen is that we redo the initialization if we're called
+   wxString s = info ? wxString::FromUTF8(info->decimal_point) : wxT(".");
-    // concurrently from more than one thread so it's not a real problem.
+   if (s.empty())
-    static wxChar s_decimalSeparator = 0;
-
-    // Remember the locale which was current when we initialized, we must redo
-    // the initialization if the locale changed.
-    static LocaleId s_localeUsedForInit;
-
-    if ( s_localeUsedForInit.NotInitializedOrHasChanged() )
-    {
-        const wxString
-            s = wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER);
-        if ( s.empty() )
    {
       // We really must have something for decimal separator, so fall
       // back to the C locale default.
-            s_decimalSeparator = '.';
+      s = wxT(".");
-        }
-        else
-        {
-            // To the best of my knowledge there are no locales like this.
-            wxASSERT_MSG( s.length() == 1,
-                          wxT("Multi-character decimal separator?") );
-
-            s_decimalSeparator = s[0];
-        }
    }
 
-    return s_decimalSeparator;
+   return s[0];
 #else // !wxUSE_INTL
    return wxT('.');
 #endif // wxUSE_INTL/!wxUSE_INTL
@@ -159,53 +68,15 @@ wxChar NumberFormatter::GetDecimalSeparator()
 bool NumberFormatter::GetThousandsSeparatorIfUsed(wxChar *sep)
 {
 #if wxUSE_INTL
-    static wxChar s_thousandsSeparator = 0;
+   struct lconv *info = localeconv();
-    static LocaleId s_localeUsedForInit;
+   wxString s = info ? wxString::FromUTF8(info->thousands_sep) : wxT("");
 
-    if ( s_localeUsedForInit.NotInitializedOrHasChanged() )
+   if (s.IsEmpty())
    {
-#if defined(__WXMSW__)
-       wxUint32 lcid = LOCALE_USER_DEFAULT;
-
-       if (wxGetLocale())
-       {
-          const wxLanguageInfo *info = wxLocale::GetLanguageInfo(wxGetLocale()->GetLanguage());
-           if (info)
-           {                         ;
-               lcid = MAKELCID(MAKELANGID(info->WinLang, info->WinSublang),
-                                        SORT_DEFAULT);
-           }
-       }
-
-       wxString s;
-       wxChar buffer[256];
-       buffer[0] = wxT('\0');
-       size_t count = GetLocaleInfo(lcid, LOCALE_STHOUSAND, buffer, 256);
-       if (!count)
-           s << wxT(",");
-       else
-           s << buffer;
-#else
-        wxString
-          s = wxLocale::GetInfo(wxLOCALE_THOUSANDS_SEP, wxLOCALE_CAT_NUMBER);
-#endif
-        if ( !s.empty() )
-        {
-            wxASSERT_MSG( s.length() == 1,
-                          wxT("Multi-character thousands separator?") );
-
-            s_thousandsSeparator = s[0];
-        }
-        //else: Unlike above it's perfectly fine for the thousands separator to
-        //      be empty if grouping is not used, so just leave it as 0.
-    }
-
-    if ( !s_thousandsSeparator )
       return false;
+   }
 
-    if ( sep )
+   *sep = s[0];
-        *sep = s_thousandsSeparator;
-
    return true;
 #else // !wxUSE_INTL
     wxUnusedVar(sep);