Simplify locale data path setting...

common/paths.cpp

@@ -249,6 +249,16 @@ wxString PATHS::GetStockTemplatesPath()
 }
 
 
+wxString PATHS::GetLocaleDataPath()
+{
+    wxString path;
+
+    path = GetStockDataPath() + wxT( "/internat" );
+
+    return path;
+}
+
+
 wxString PATHS::GetStockPluginsPath()
 {
     wxFileName fn;

common/pgm_base.cpp

@@ -57,6 +57,7 @@
 #include <settings/settings_manager.h>
 #include <systemdirsappend.h>
 #include <trace_helpers.h>
+#include <paths.h>
 
 
 /**
@@ -544,48 +545,7 @@ void PGM_BASE::SetLanguageIdentifier( int menu_id )
 
 void PGM_BASE::SetLanguagePath()
 {
-    SEARCH_STACK    guesses;
+    wxLocale::AddCatalogLookupPathPrefix( PATHS::GetLocaleDataPath() );
-
-    SystemDirsAppend( &guesses );
-
-    // Add our internat dir to the wxLocale catalog of paths
-    for( unsigned i = 0; i < guesses.GetCount(); i++ )
-    {
-        wxFileName fn( guesses[i], wxEmptyString );
-
-        // Append path for Windows and unix KiCad package install
-        fn.AppendDir( "share" );
-        fn.AppendDir( "internat" );
-
-        if( fn.IsDirReadable() )
-        {
-            wxLogTrace( traceLocale, "Adding locale lookup path: " + fn.GetPath() );
-            wxLocale::AddCatalogLookupPathPrefix( fn.GetPath() );
-        }
-
-        // Append path for unix standard install
-        fn.RemoveLastDir();
-        fn.AppendDir( "kicad" );
-        fn.AppendDir( "internat" );
-
-        if( fn.IsDirReadable() )
-        {
-            wxLogTrace( traceLocale, "Adding locale lookup path: " + fn.GetPath() );
-            wxLocale::AddCatalogLookupPathPrefix( fn.GetPath() );
-        }
-
-        // Append path for macOS install
-        fn.RemoveLastDir();
-        fn.RemoveLastDir();
-        fn.RemoveLastDir();
-        fn.AppendDir( "internat" );
-
-        if( fn.IsDirReadable() )
-        {
-            wxLogTrace( traceLocale, "Adding locale lookup path: " + fn.GetPath() );
-            wxLocale::AddCatalogLookupPathPrefix( fn.GetPath() );
-        }
-    }
 
     if( wxGetEnv( wxT( "KICAD_RUN_FROM_BUILD_DIR" ), nullptr ) )
     {

include/paths.h

@@ -126,6 +126,11 @@ public:
      */
     static wxString GetStockTemplatesPath();
 
+    /**
+     * Gets the locales translation data path
+     */
+    static wxString GetLocaleDataPath();
+
     /**
      * Gets the stock (install) 3d viewer plugins path
      */