chat: fix crash at startup due to missing en_US translation (nomic-ai…

…#2816) Signed-off-by: Jared Van Bortel <[email protected]>
ldsxp · Aug 8, 2024 · 6957706 · 6957706
1 parent a910d65
commit 6957706
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/gpt4all-chat/CMakeLists.txt b/gpt4all-chat/CMakeLists.txt
@@ -229,6 +229,7 @@ qt_add_qml_module(chat
 )
 
 if (GPT4ALL_TRANSLATIONS)
+    target_compile_definitions(chat PRIVATE GPT4ALL_USE_TRANSLATIONS)
     qt_add_translations(chat
         TS_FILES
         ${CMAKE_SOURCE_DIR}/translations/gpt4all_en_US.ts

diff --git a/gpt4all-chat/mysettings.cpp b/gpt4all-chat/mysettings.cpp
@@ -632,6 +632,7 @@ void MySettings::setLanguageAndLocale(const QString &bcp47Name)
     else
         locale = QLocale(l);
 
+#ifdef GPT4ALL_USE_TRANSLATIONS
     // If we previously installed a translator, then remove it
     if (m_translator) {
         if (!qGuiApp->removeTranslator(m_translator.get())) {
@@ -661,6 +662,7 @@ void MySettings::setLanguageAndLocale(const QString &bcp47Name)
             m_translator.reset();
         }
     }
+#endif
 
     // Finally, set the locale whether we have a translation or not
     QLocale::setDefault(locale);