Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-02-25 07:31:14 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into wx3 is necessary,

Browse Source
This commit is contained in:
Leland Lucius
2015-07-11 19:23:49 -05:00
parent c6dffaaaa4 7d3e4a16d6
commit a9184af222
7 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Languages.cpp
View File

@@ -156,7 +156,9 @@ void GetLanguages(wxArrayString &langCodes, wxArrayString &langNames)
localLanguageName[wxT("tr")] = wxT("Turkce");
localLanguageName[wxT("uk")] = wxT("Ukrainska");
localLanguageName[wxT("vi")] = wxT("Vietnamese");
localLanguageName[wxT("zh")] = wxT("Chinese (Simplified)");
// If we look up zh in wxLocale we get zh_TW hence we MUST look
// for zh_CN.
localLanguageName[wxT("zh_CN")] = wxT("Chinese (Simplified)");
localLanguageName[wxT("zh_TW")] = wxT("Chinese (Traditional)");
wxArrayString audacityPathList = wxGetApp().audacityPathList;
@@ -167,6 +169,8 @@ void GetLanguages(wxArrayString &langCodes, wxArrayString &langNames)
audacityPathList);
#endif
// For each language in our list we look for a corresponding entry in
// wxLocale.
for (LangHash::iterator i = localLanguageName.begin();
i != localLanguageName.end();
i++)
@@ -237,10 +241,10 @@ void GetLanguages(wxArrayString &langCodes, wxArrayString &langNames)
// Sort
unsigned int j;
for(j=0; j<tempNames.GetCount(); j++)
for(j=0; j<tempNames.GetCount(); j++){
reverseHash[tempNames[j]] = tempCodes[j];
}
tempNames.Sort();