wxTranslations::AddCatalog() returns false for msgid language if it's different from system language

[taler21]

In wxWidgets-3.2.3 there is a regression that was introduced with commit d178223.

wxTranslations::AddCatalog() now returns false if the selected language:

• is that of the "msgid" strings in source code AND
• is different to the system language AND
• has no available catalog (which is perfectly fine for the msgid language)

This issue can be reproduced in the internat sample with the following modifications:

diff --git "a/samples/internat/internat.cpp" "b/samples/internat/internat.cpp"
index 53ca7ebbb1..d575fccc93 100644
--- "a/samples/internat/internat.cpp"
+++ "b/samples/internat/internat.cpp"
@@ -212,6 +212,14 @@ bool MyApp::OnInit()
         langDesc = langInfo ? langInfo->Description
                             : wxString("the default system language");
 
+    const wxLanguage msgIdLang = wxLANGUAGE_ENGLISH_US;
+
+    const wxLanguageInfo* const
+            msgIdLangInfo = wxUILocale::GetLanguageInfo( msgIdLang );
+    const wxString
+            msgIdLangDesc = msgIdLangInfo ? msgIdLangInfo->Description
+                                          : wxString("the msgid language");
+/*
     if ( m_setLocale == Locale_Ask )
     {
         m_setLocale = wxMessageBox
@@ -227,7 +235,7 @@ bool MyApp::OnInit()
     }
 
     if ( m_setLocale == Locale_Set )
-    {
+*/  {
         if ( !wxUILocale::UseDefault() )
         {
             wxLogWarning("Failed to initialize the default system locale.");
@@ -245,13 +253,14 @@ bool MyApp::OnInit()
 
         // Create the object for message translation and set it up for global use.
         wxTranslations* const trans = new wxTranslations();
+        trans->SetLanguage( msgIdLang );
         wxTranslations::Set(trans);
 
         // Initialize the catalogs we'll be using.
-        if ( !trans->AddCatalog("internat") )
+        if ( !trans->AddCatalog("internat", msgIdLang ) )
         {
             wxLogError(_("Couldn't find/load 'internat' catalog for %s."),
-                       langDesc);
+                       msgIdLangDesc);
         }
 
         // Now try to add wxstd.mo so that loading "NOTEXIST.ING" file will produce

Platform and version information

• wxWidgets version you use: 3.2.3
• wxWidgets port you use: wxMSW
• OS and its version: Windows 10

[vadz]

Thanks for noticing and reporting this (and sorry for breaking it)!

I believe the fix is to avoid checking the languages available on the current system entirely when the language to use is explicitly specified (i.e. when not using wxLANGUAGE_DEFAULT), which is what #24037 does now. Could you please let me know if applying this to 3.2 fixes the problem for you? TIA!

[taler21]

Yes, that fixes the issue. Thanks!