From 6423610f0145cc952230222c83da4428c2b3fea5 Mon Sep 17 00:00:00 2001 From: James Crook Date: Fri, 10 Jul 2015 09:28:24 +0100 Subject: [PATCH] Bug 1061 - Chinese (Simplified) Missing Previously we looked at wxLocale language names for matches to our names. The change to use the language set in the installer reversed this. However looking up zh (which is Chinese) in wxLocale yields zh_TW. So instead we now look up zh_CN. --- src/Languages.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Languages.cpp b/src/Languages.cpp index 76d00e1b5..08a85d233 100644 --- a/src/Languages.cpp +++ b/src/Languages.cpp @@ -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; @@ -164,6 +166,8 @@ void GetLanguages(wxArrayString &langCodes, wxArrayString &langNames) wxT(INSTALL_PREFIX)), audacityPathList); + // For each language in our list we look for a corresponding entry in + // wxLocale. for (LangHash::iterator i = localLanguageName.begin(); i != localLanguageName.end(); i++) @@ -234,10 +238,10 @@ void GetLanguages(wxArrayString &langCodes, wxArrayString &langNames) // Sort - unsigned int j; - for(j=0; j