Update of /cvsroot/audacity/audacity-src/src
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7008/src
Modified Files:
AudacityApp.cpp Languages.cpp
Log Message:
Patch from Debian/Ubuntu: honor system language, don't prompt on first run.
Index: Languages.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Languages.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- Languages.cpp 20 Oct 2009 23:08:26 -0000 1.37
+++ Languages.cpp 20 Jan 2010 01:58:32 -0000 1.38
@@ -223,6 +223,10 @@
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]]);
Index: AudacityApp.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AudacityApp.cpp,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -d -r1.254 -r1.255
--- AudacityApp.cpp 11 Nov 2009 08:40:55 -0000 1.254
+++ AudacityApp.cpp 20 Jan 2010 01:58:32 -0000 1.255
@@ -70,6 +70,7 @@
#include "GStreamerLoader.h"
#include "Internat.h"
#include "LangChoice.h"
+#include "Languages.h"
#include "Prefs.h"
#include "Project.h"
#include "Screenshot.h"
@@ -1024,9 +1025,8 @@
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??
@@ -1038,7 +1038,6 @@
//lda if (lang == "")
//lda lang = ChooseLanguage(NULL);
#endif
- gPrefs->Write(wxT("/Locale/Language"), lang);
mLocale = NULL;
InitLang( lang );
------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
