From 7dd92d9f5a190eefa8582a6c30aa6951f1552a78 Mon Sep 17 00:00:00 2001
From: Leland Lucius <github@homerow.net>
Date: Thu, 4 Jun 2015 16:35:46 -0500
Subject: [PATCH] Ensure user languages are added before any other language
 handling

---
 src/AudacityApp.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp
index adffbdde7..e1fcdbc87 100644
--- a/src/AudacityApp.cpp
+++ b/src/AudacityApp.cpp
@@ -974,13 +974,6 @@ void AudacityApp::InitLang( const wxString & lang )
    if( mLocale )
       delete mLocale;
 
-   // Define languanges for which we have translations, but that are not yet
-   // supported by wxWidgets.
-   for (size_t i = 0, cnt = WXSIZEOF(userLangs); i < cnt; i++)
-   {
-      wxLocale::AddLanguage(userLangs[i]);
-   }
-
    wxString canon = lang;
 
 #if defined(__WXMAC__)
@@ -1251,6 +1244,16 @@ bool AudacityApp::OnInit()
                          wxGetUserId().c_str());
 #endif //__WXMAC__
 
+   // Define languanges for which we have translations, but that are not yet
+   // supported by wxWidgets.
+   //
+   // TODO:  The whole Language initialization really need to be reworked.
+   //        It's all over the place.
+   for (size_t i = 0, cnt = WXSIZEOF(userLangs); i < cnt; i++)
+   {
+      wxLocale::AddLanguage(userLangs[i]);
+   }
+
    // Initialize preferences and language
    InitPreferences();