2 files changed, 27 insertions, 17 deletions
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp
index 13b2175..223f3ae 100644
--- a/Swift/QtUI/QtSwift.cpp
+++ b/Swift/QtUI/QtSwift.cpp
@@ -73,24 +73,27 @@ namespace Swift{
 
 po::options_description QtSwift::getOptionsDescription() {
 	po::options_description result("Options");
 	result.add_options()
 		("debug", "Turn on debug logging")
 		("help", "Show this help message")
 		("version", "Show version information")
 		("netbook-mode", "Use netbook mode display (unsupported)")
 		("no-tabs", "Don't manage chat windows in tabs (unsupported)")
 		("latency-debug", "Use latency debugging (unsupported)")
 		("multi-account", po::value<int>()->default_value(1), "Number of accounts to open windows for (unsupported)")
 		("start-minimized", "Don't show the login/roster window at startup")
+#if QT_VERSION >= 0x040800
+		("language", po::value<std::string>(), "Use a specific language, instead of the system-wide one")
+#endif
 		;
 	return result;
 }
 
 XMLSettingsProvider* QtSwift::loadSettingsFile(const QString& fileName) {
 	QFile configFile(fileName);
 	if (configFile.exists() && configFile.open(QIODevice::ReadOnly)) {
 		QString xmlString;
 		while (!configFile.atEnd()) {
 			QByteArray line = configFile.readLine();
 			xmlString += line + "\n";
 		}
diff --git a/Swift/QtUI/main.cpp b/Swift/QtUI/main.cpp
index 9c99394..d02cce6 100644
--- a/Swift/QtUI/main.cpp
+++ b/Swift/QtUI/main.cpp
@@ -11,55 +11,39 @@
 #include <iostream>
 #include <QApplication>
 #include <QTextCodec>
 #include <QTranslator>
 #include <QLocale>
 #include <QStringList>
 
 #include <Swift/Controllers/Translator.h>
 #include <Swift/Controllers/ApplicationInfo.h>
 #include <Swift/Controllers/BuildVersion.h>
 #include <SwifTools/Application/PlatformApplicationPathProvider.h>
 #include <SwifTools/CrashReporter.h>
+#include <stdlib.h>
 
 #include "QtSwift.h"
 #include "QtTranslator.h"
 #include "QtSwiftUtil.h"
 
 int main(int argc, char* argv[]) {
 	QApplication app(argc, argv);
 
 	Swift::PlatformApplicationPathProvider applicationPathProvider(SWIFT_APPLICATION_NAME);
 
 	Swift::CrashReporter crashReporter(applicationPathProvider.getDataDir() / "crashes");
 
 	QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
 
-	// Translation
-	QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
-	boost::filesystem::path someTranslationPath = applicationPathProvider.getResourcePath("/translations/swift_en.qm");
-
-	QTranslator qtTranslator;
-	if (!someTranslationPath.empty()) {
-#if QT_VERSION >= 0x040800
-		qtTranslator.load(QLocale::system(), QString(SWIFT_APPLICATION_NAME).toLower(), "_", someTranslationPath.parent_path().string().c_str());
-#else
-		//std::cout << "Loading " << std::string(QLocale::system().name().toUtf8()) << std::endl;
-		qtTranslator.load(QString(SWIFT_APPLICATION_NAME).toLower() + "_" + QLocale::system().name(), someTranslationPath.parent_path().string().c_str());
-#endif
-	}
-	app.installTranslator(&qtTranslator);
-	QtTranslator swiftTranslator;
-	Swift::Translator::setInstance(&swiftTranslator);
-
 	// Parse program options
 	boost::program_options::options_description desc = Swift::QtSwift::getOptionsDescription();
 	boost::program_options::variables_map vm;
 	try {
 		boost::program_options::store(boost::program_options::parse_command_line(argc, argv, desc), vm);
 	} catch (const boost::program_options::unknown_option& option) {
 #if BOOST_VERSION >= 104200
 		std::cout << "Ignoring unknown option " << option.get_option_name() << " but continuing." <<  std::endl;
 #else
 		std::cout << "Error: " << option.what() << " (continuing)" <<  std::endl;
 #endif
 	}
@@ -68,19 +52,42 @@ int main(int argc, char* argv[]) {
 		std::cout << SWIFT_APPLICATION_NAME << " is an instant messaging client for the XMPP network." << std::endl;
 		std::cout << std::endl;
 		std::cout << "Usage: " << argv[0] << " [OPTIONS]..." << std::endl;
 		std::cout << std::endl;
 		std::cout << desc << std::endl;
 		return 1;
 	}
 	if (vm.count("version") > 0) {
 		std::cout << SWIFT_APPLICATION_NAME << " " << buildVersion << std::endl;
 		return 0;
 	}
 
+	// Translation
+	QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
+	boost::filesystem::path someTranslationPath = applicationPathProvider.getResourcePath("/translations/swift_en.qm");
+
+	QTranslator qtTranslator;
+	if (!someTranslationPath.empty()) {
+#if QT_VERSION >= 0x040800
+		if (vm.count("language") > 0) {
+			qtTranslator.load(QString(SWIFT_APPLICATION_NAME).toLower() + "_" + P2QSTRING(vm["language"].as<std::string>()), someTranslationPath.parent_path().string().c_str());
+		}
+		else {
+			qtTranslator.load(QLocale::system(), QString(SWIFT_APPLICATION_NAME).toLower(), "_", someTranslationPath.parent_path().string().c_str());
+		}
+#else
+		//std::cout << "Loading " << std::string(QLocale::system().name().toUtf8()) << std::endl;
+		qtTranslator.load(QString(SWIFT_APPLICATION_NAME).toLower() + "_" + QLocale::system().name(), someTranslationPath.parent_path().string().c_str());
+#endif
+	}
+	app.installTranslator(&qtTranslator);
+	QtTranslator swiftTranslator;
+	Swift::Translator::setInstance(&swiftTranslator);
+
+
 	Swift::QtSwift swift(vm);
 	int result = app.exec();
 
 	Swift::Translator::setInstance(NULL);
 
 	return result;
 }