projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Yearly copyright bump :)
[quassel.git]
/
src
/
common
/
util.cpp
diff --git
a/src/common/util.cpp
b/src/common/util.cpp
index
e978a7f
..
9e9bf88
100644
(file)
--- a/
src/common/util.cpp
+++ b/
src/common/util.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
8
by the Quassel Project *
+ * Copyright (C) 2005-0
9
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-150,11
+150,6
@@
uint editingDistance(const QString &s1, const QString &s2) {
return matrix[n-1][m-1];
}
return matrix[n-1][m-1];
}
-QByteArray methodName(const QMetaMethod &method) {
- QByteArray sig(method.signature());
- return sig.left(sig.indexOf("("));
-}
-
QDir quasselDir() {
QString quasselDir;
if(Quassel::isOptionSet("datadir")) {
QDir quasselDir() {
QString quasselDir;
if(Quassel::isOptionSet("datadir")) {
@@
-200,7
+195,9
@@
void loadTranslation(const QLocale &locale) {
if(locale.language() == QLocale::C)
return;
if(locale.language() == QLocale::C)
return;
- qtTranslator->load(QString("%2/qt_%1").arg(locale.name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath)));
+ bool success = qtTranslator->load(QString(":i18n/qt_%1").arg(locale.name()));
+ if(!success)
+ qtTranslator->load(QString("%2/qt_%1").arg(locale.name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath)));
quasselTranslator->load(QString(":i18n/quassel_%1").arg(locale.name()));
}
quasselTranslator->load(QString(":i18n/quassel_%1").arg(locale.name()));
}