Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2012-02-29 10:04:34 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2012-02-29 10:04:34 (GMT) |
| commit | 4086a006e2dc9f5f723fad4fdccd7bff7b4f0683 (patch) | |
| tree | e0151745306f8d89bd761b42ebb2d388b9e86995 /Swift | |
| parent | 751d68d1fb5f2916554d82a4945499631a70c07d (diff) | |
| download | swift-contrib-4086a006e2dc9f5f723fad4fdccd7bff7b4f0683.zip swift-contrib-4086a006e2dc9f5f723fad4fdccd7bff7b4f0683.tar.bz2 | |
Temporary workaround for translations being used instead of English
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/QtUI/main.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Swift/QtUI/main.cpp b/Swift/QtUI/main.cpp index bb1c662..c8f7705 100644 --- a/Swift/QtUI/main.cpp +++ b/Swift/QtUI/main.cpp @@ -1,71 +1,75 @@ /* * Copyright (c) 2010 Kevin Smith * Licensed under the GNU General Public License v3. * See Documentation/Licenses/GPLv3.txt for more information. */ #include <boost/program_options/options_description.hpp> #include <boost/program_options/variables_map.hpp> #include <boost/program_options.hpp> #include <boost/version.hpp> #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 "QtSwift.h" #include "QtTranslator.h" +#include "QtSwiftUtil.h" int main(int argc, char* argv[]) { QApplication app(argc, argv); QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); // Translation QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8")); boost::filesystem::path someTranslationPath = Swift::PlatformApplicationPathProvider(SWIFT_APPLICATION_NAME).getResourcePath("/translations/swift_nl.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()); + if (QLocale::system().uiLanguages().first() != "en") { + 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 } boost::program_options::notify(vm); if (vm.count("help") > 0) { 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; } |