[SCM] Audacity debian packaging branch, master, updated. debian/1.3.7-3-44-g222419e

[bdrung-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 616fb7b9342cbd73230dc265d30bb91b60eb1e40
Author: Benjamin Drung <bdrung at gmail.com>
Date:   Tue Sep 8 13:05:24 2009 +0200

    Respect locales/$LANG (Closes: #481424, LP: #292168).

diff --git a/debian/patches/lang.patch b/debian/patches/lang.patch
new file mode 100644
index 0000000..49b81bf
--- /dev/null
+++ b/debian/patches/lang.patch
@@ -0,0 +1,86 @@
+Description: respect locales/$LANG
+Bug-Debian: http://bugs.debian.org/481424
+Bug-Ubuntu: https://launchpad.net/bugs/292168
+Forwarded: yes
+Author: Benjamin Drung <bdrung at ubuntu.com>
+diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp
+index 4f239a9..54d8d8d 100644
+--- a/src/AudacityApp.cpp
++++ b/src/AudacityApp.cpp
+@@ -71,6 +71,7 @@ It handles initialization and termination by subclassing wxApp.
+ #include "FreqWindow.h"
+ #include "Internat.h"
+ #include "LangChoice.h"
++#include "Languages.h"
+ #include "Prefs.h"
+ #include "Project.h"
+ #include "Screenshot.h"
+@@ -940,9 +941,8 @@ bool AudacityApp::OnInit()
+ 
+    wxString lang = gPrefs->Read(wxT("/Locale/Language"), wxT(""));
+ 
+-   // Pop up a dialog the first time the program is run
+    if (lang == wxT(""))
+-      lang = ChooseLanguage(NULL);
++      lang = GetSystemLanguageCode();
+ 
+ #ifdef NOT_RQD
+ //TIDY-ME: (CleanSpeech) Language prompt??
+@@ -954,7 +954,6 @@ bool AudacityApp::OnInit()
+ //lda   if (lang == "")
+ //lda      lang = ChooseLanguage(NULL);
+ #endif
+-   gPrefs->Write(wxT("/Locale/Language"), lang);
+ 
+    mLocale = NULL;
+    InitLang( lang );
+diff --git a/src/Languages.cpp b/src/Languages.cpp
+index 0d60479..7761d24 100644
+--- a/src/Languages.cpp
++++ b/src/Languages.cpp
+@@ -222,6 +222,10 @@ void GetLanguages(wxArrayString &langCodes, wxArrayString &langNames)
+ 
+    tempNames.Sort();
+ 
++   // Add system language
++   langNames.Add(wxT("System"));
++   langCodes.Add(wxT(""));
++
+    for(j=0; j<tempNames.GetCount(); j++) {
+       langNames.Add(tempNames[j]);
+       langCodes.Add(reverseHash[tempNames[j]]);
+diff --git a/src/prefs/EffectsPrefs.cpp b/src/prefs/EffectsPrefs.cpp
+index 1eba2ec..4bb7788 100644
+--- a/src/prefs/EffectsPrefs.cpp
++++ b/src/prefs/EffectsPrefs.cpp
+@@ -118,6 +118,8 @@ bool EffectsPrefs::Apply()
+ 
+    // If language has changed, we want to change it now, not on the next reboot.
+    wxString lang = gPrefs->Read(wxT("/Locale/Language"), wxT(""));
++   if (lang == wxT(""))
++      lang = GetSystemLanguageCode();
+    wxGetApp().InitLang(lang);
+ 
+    return true;
+diff --git a/src/prefs/GUIPrefs.cpp b/src/prefs/GUIPrefs.cpp
+index 3d293a1..66c8edb 100644
+--- a/src/prefs/GUIPrefs.cpp
++++ b/src/prefs/GUIPrefs.cpp
+@@ -113,7 +113,7 @@ void GUIPrefs::PopulateOrExchange(ShuttleGui & S)
+ 
+          S.TieChoice(_("Language:"),
+                      wxT("/Locale/Language"),
+-                     wxT("en"),
++                     wxT(""),
+                      mLangNames,
+                      mLangCodes);
+          S.SetSizeHints(mLangNames);
+@@ -161,6 +161,8 @@ bool GUIPrefs::Apply()
+ 
+    // If language has changed, we want to change it now, not on the next reboot.
+    wxString lang = gPrefs->Read(wxT("/Locale/Language"), wxT(""));
++   if (lang == wxT(""))
++      lang = GetSystemLanguageCode();
+    wxGetApp().InitLang(lang);
+ 
+    return true;

-- 
Audacity debian packaging