Update of /cvsroot/audacity/audacity-src/src/prefs
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7008/src/prefs
Modified Files:
EffectsPrefs.cpp GUIPrefs.cpp
Log Message:
Patch from Debian/Ubuntu: honor system language, don't prompt on first run.
Index: EffectsPrefs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/EffectsPrefs.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- EffectsPrefs.cpp 18 Oct 2009 08:07:20 -0000 1.4
+++ EffectsPrefs.cpp 20 Jan 2010 01:58:32 -0000 1.5
@@ -126,6 +126,8 @@
// 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;
Index: GUIPrefs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/GUIPrefs.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- GUIPrefs.cpp 18 Oct 2009 08:02:15 -0000 1.84
+++ GUIPrefs.cpp 20 Jan 2010 01:58:33 -0000 1.85
@@ -113,7 +113,7 @@
S.TieChoice(_("&Language:"),
wxT("/Locale/Language"),
- wxT("en"),
+ wxT(""),
mLangNames,
mLangCodes);
S.SetSizeHints(mLangNames);
@@ -161,6 +161,8 @@
// 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;
------------------------------------------------------------------------------
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
