From 46a4c4d84d38ab7ed7e99409f954a941848c7d3e Mon Sep 17 00:00:00 2001
From: Leland Lucius <github@homerow.net>
Date: Tue, 26 May 2015 01:52:54 -0500
Subject: [PATCH] Second attempt at fixing bug #947

---
 src/AudacityApp.cpp          | 6 ++++--
 src/widgets/numformatter.cpp | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 src/widgets/numformatter.cpp

diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp
index 982e0e53b..a42140293 100755
--- a/src/AudacityApp.cpp
+++ b/src/AudacityApp.cpp
@@ -966,7 +966,9 @@ void AudacityApp::InitLang( const wxString & lang )
 //
 //     2013-09-13:  I've checked this again and it is still required.  Still
 //                  no idea why.
-#if defined(__WXMAC__)
+//     2015-05-26:  Disabled the hack since it prevents use of locale specific
+//                  formatting (like comma as decimal separator).
+#if defined(__WXMAC__disabled)
    wxString oldval;
    bool existed;
 
@@ -980,7 +982,7 @@ void AudacityApp::InitLang( const wxString & lang )
    mLocale = new wxLocale(wxT(""), lang, wxT(""), true, true);
 #endif
 
-#if defined(__WXMAC__)
+#if defined(__WXMAC__disabled)
    if (existed) {
       wxSetEnv(wxT("LANG"), oldval);
    }
diff --git a/src/widgets/numformatter.cpp b/src/widgets/numformatter.cpp
old mode 100644
new mode 100755
index 844a01dae..6d776bf1a
--- a/src/widgets/numformatter.cpp
+++ b/src/widgets/numformatter.cpp
@@ -120,7 +120,7 @@ private:
 
 wxChar NumberFormatter::GetDecimalSeparator()
 {
-#if defined(WE_DO_NOT_CHANGE_THE_LOCALE_SO_PERIOD_IS_ALWAYS_THE_SEPERATOR) //wxUSE_INTL 
+#if wxUSE_INTL 
     // Notice that while using static variable here is not MT-safe, the worst
     // that can happen is that we redo the initialization if we're called
     // concurrently from more than one thread so it's not a real problem.
@@ -158,7 +158,7 @@ wxChar NumberFormatter::GetDecimalSeparator()
 
 bool NumberFormatter::GetThousandsSeparatorIfUsed(wxChar *sep)
 {
-#if defined(WE_DO_NOT_CHANGE_THE_LOCALE_SO_NO_SEPERATOR) //wxUSE_INTL
+#if wxUSE_INTL
     static wxChar s_thousandsSeparator = 0;
     static LocaleId s_localeUsedForInit;