Translations p2 (#848)

* adding in the basics of translations! * working on making it actually work * translation working! * fixing merge conflicts
eteran · Jan 18, 2024 · e942bc9 · e942bc9
1 parent b686a49
commit e942bc9
Show file tree

Hide file tree

Showing 5 changed files with 2,481 additions and 1,479 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -3,7 +3,8 @@
         "*.go": "go",
         "*.json": "json",
         "system_error": "cpp",
-        "*.tcc": "cpp"
+        "*.tcc": "cpp",
+        "atomic": "cpp"
     },
     "cSpell.words": [
         "CLASSINFO",

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -9,6 +9,7 @@ find_package(Qt5 5.0.0 REQUIRED Widgets Xml XmlPatterns Svg LinguistTools)
 
 qt5_add_translation(QM_FILES
 	# add translation files in /src/res/translations here
+	res/translations/edb_zh_CN.ts
 )
 
 # Create translations QRC file - translations.qrc

diff --git a/src/main.cpp b/src/main.cpp
@@ -194,23 +194,6 @@ int start_debugger(const LaunchArguments &launch_args) {
 	}
 }
 
-/**
- * @brief load_translations
- */
-void load_translations() {
-	// load some translations
-	QTranslator qtTranslator;
-	if (qtTranslator.load(QLocale(), QLatin1String("qtbase"), QLatin1String("_"), QLibraryInfo::location(QLibraryInfo::TranslationsPath))) {
-		qApp->installTranslator(&qtTranslator);
-	}
-
-	QTranslator translator;
-	// look up e.g. :/translations/edb_{lang}.qm
-	if (translator.load(QLocale(), QLatin1String("edb"), QLatin1String("_"), QLatin1String(":/translations"))) {
-		qApp->installTranslator(&translator);
-	}
-}
-
 // See QtCreator: src/libs/utils/theme/theme.cpp
 
 // If you copy QPalette, default values stay at default, even if that default is different
@@ -322,7 +305,19 @@ int main(int argc, char *argv[]) {
 	QApplication::setApplicationName("edb");
 	QApplication::setApplicationVersion(EDB_VERSION_STRING);
 
-	load_translations();
+	// load some translations
+	QTranslator qtTranslator;
+	if (qtTranslator.load(QLocale(), QLatin1String("qtbase"), QLatin1String("_"), QLibraryInfo::location(QLibraryInfo::TranslationsPath))) {
+		app.installTranslator(&qtTranslator);
+	}
+
+	QTranslator translator;
+	// look up e.g. :/translations/edb_{lang}.qm
+	if (translator.load(QLocale(), QLatin1String("edb"), QLatin1String("_"), QLatin1String(":/translations"))) {
+		qDebug() << "Translations loaded successfully for " << QLocale().bcp47Name();
+		app.installTranslator(&translator);
+	}
+
 
 	// look for some plugins..
 	load_plugins(edb::v1::config().plugin_path);