X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Futil.cpp;h=c267d0bf82f0d8ec7ec42f39aed5350791471d81;hp=9bd17d9488083a6d3d45f668af0b4eebfe638c62;hb=8273224500228157351f21d14f113d9d2904eae8;hpb=665faa937a52fc6175741292737c4a52875b4f75

diff --git a/src/common/util.cpp b/src/common/util.cpp
index 9bd17d94..c267d0bf 100644
--- a/src/common/util.cpp
+++ b/src/common/util.cpp
@@ -22,9 +22,12 @@
 
 #include <QCoreApplication>
 #include <QDebug>
+#include <QLibraryInfo>
 #include <QTextCodec>
 #include <QTranslator>
 
+#include "quassel.h"
+
 class QMetaMethod;
 
 QString nickFromMask(QString mask) {
@@ -47,6 +50,17 @@ bool isChannelName(QString str) {
   return QString("#&!+").contains(str[0]);
 }
 
+QString stripFormatCodes(QString str) {
+  str.remove(QRegExp("\x03(\\d\\d?(,\\d\\d?)?)?"));
+  str.remove('\x02');
+  str.remove('\x0f');
+  str.remove('\x12');
+  str.remove('\x16');
+  str.remove('\x1d');
+  str.remove('\x1f');
+  return str;
+}
+
 QString decodeString(const QByteArray &input, QTextCodec *codec) {
   // First, we check if it's utf8. It is very improbable to encounter a string that looks like
   // valid utf8, but in fact is not. This means that if the input string passes as valid utf8, it
@@ -123,7 +137,7 @@ uint editingDistance(const QString &s1, const QString &s2) {
 	min = deleteChar;
       else
 	min = insertChar;
-      
+
       if(s1[i-1] == s2[j-1]) {
 	uint inheritChar = matrix[i-1][j-1];
 	if(inheritChar < min)
@@ -142,12 +156,19 @@ QByteArray methodName(const QMetaMethod &method) {
 }
 
 QDir quasselDir() {
-  // kinda ugly, but I currently see no other way to do that
+  QString quasselDir;
+  if(Quassel::isOptionSet("datadir")) {
+    quasselDir = Quassel::optionValue("datadir");
+  } else {
+    // FIXME use QDesktopServices
 #ifdef Q_OS_WIN32
-  QString quasselDir = qgetenv("APPDATA") + "/quassel/";
+    quasselDir = qgetenv("APPDATA") + "/quassel/";
+#elif defined Q_WS_MAC
+    quasselDir = QDir::homePath() + "/Library/Application Support/Quassel/";
 #else
-  QString quasselDir = QDir::homePath() + "/.quassel/";
+    quasselDir = QDir::homePath() + "/.quassel/";
 #endif
+  }
 
   QDir qDir(quasselDir);
   if(!qDir.exists(quasselDir)) {
@@ -162,39 +183,44 @@ QDir quasselDir() {
 void loadTranslation(const QLocale &locale) {
   QTranslator *qtTranslator = QCoreApplication::instance()->findChild<QTranslator *>("QtTr");
   QTranslator *quasselTranslator = QCoreApplication::instance()->findChild<QTranslator *>("QuasselTr");
-  Q_ASSERT(qtTranslator);
-  Q_ASSERT(quasselTranslator);
 
-  QLocale::setDefault(locale);
+  if(!qtTranslator) {
+    qtTranslator = new QTranslator(qApp);
+    qtTranslator->setObjectName("QtTr");
+    qApp->installTranslator(qtTranslator);
+  }
+  if(!quasselTranslator) {
+    quasselTranslator = new QTranslator(qApp);
+    quasselTranslator->setObjectName("QuasselTr");
+    qApp->installTranslator(quasselTranslator);
+  }
 
-  QCoreApplication::removeTranslator(qtTranslator);
-  QCoreApplication::removeTranslator(quasselTranslator);
+  QLocale::setDefault(locale);
 
   if(locale.language() == QLocale::C)
     return;
-  
-  qtTranslator->load(QString(":i18n/qt_%1").arg(locale.name()));
-  quasselTranslator->load(QString(":i18n/quassel_%1").arg(locale.name()));
 
-  QCoreApplication::installTranslator(qtTranslator);
-  QCoreApplication::installTranslator(quasselTranslator);
+  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()));
 }
 
 QString secondsToString(int timeInSeconds) {
     QList< QPair<int, QString> > timeUnit;
-    timeUnit.append(qMakePair(365*60*60, QCoreApplication::translate("Quassel::secondsToString()", "year")));
+    timeUnit.append(qMakePair(365*24*60*60, QCoreApplication::translate("Quassel::secondsToString()", "year")));
     timeUnit.append(qMakePair(24*60*60, QCoreApplication::translate("Quassel::secondsToString()", "day")));
     timeUnit.append(qMakePair(60*60, QCoreApplication::translate("Quassel::secondsToString()", "h")));
     timeUnit.append(qMakePair(60, QCoreApplication::translate("Quassel::secondsToString()", "min")));
     timeUnit.append(qMakePair(1, QCoreApplication::translate("Quassel::secondsToString()", "sec")));
 
-    QString returnString;
+    QStringList returnString;
     for(int i=0; i < timeUnit.size(); i++) {
       int n = timeInSeconds / timeUnit[i].first;
       if(n > 0) {
-        returnString += QString("%1 %2 ").arg(QString::number(n), timeUnit[i].second);
+        returnString += QString("%1 %2").arg(QString::number(n), timeUnit[i].second);
       }
       timeInSeconds = timeInSeconds % timeUnit[i].first;
     }
-    return returnString;
+    return returnString.join(", ");
 }