summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-02-29 21:05:33 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-02-29 21:05:33 (GMT)
commit80b09214a500bc3c81c59fed8966aa8a7d4a89e6 (patch)
tree8e2279f971092a9cb1a676a754ead903cbfe9946
parentf62374272e53d91914aa9a1ab8ec1318048aa219 (diff)
downloadswift-contrib-80b09214a500bc3c81c59fed8966aa8a7d4a89e6.zip
swift-contrib-80b09214a500bc3c81c59fed8966aa8a7d4a89e6.tar.bz2
Add default translation file for english.
-rw-r--r--Swift/QtUI/main.cpp4
-rw-r--r--Swift/Translations/swift_en.ts4
2 files changed, 5 insertions, 3 deletions
diff --git a/Swift/QtUI/main.cpp b/Swift/QtUI/main.cpp
index c8f7705..e04ad92 100644
--- a/Swift/QtUI/main.cpp
+++ b/Swift/QtUI/main.cpp
@@ -3,73 +3,71 @@
* 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
- if (QLocale::system().uiLanguages().first() != "en") {
- qtTranslator.load(QLocale::system(), QString(SWIFT_APPLICATION_NAME).toLower(), "_", someTranslationPath.parent_path().string().c_str());
- }
+ 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;
}
diff --git a/Swift/Translations/swift_en.ts b/Swift/Translations/swift_en.ts
new file mode 100644
index 0000000..07a7469
--- /dev/null
+++ b/Swift/Translations/swift_en.ts
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0">
+</TS>