X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Futil.cpp;h=41139dd5e7c35f8f341c99ba6421d65434a5064c;hp=4c1a22f2ea47f6a78ee96924aa905f6c6806ded6;hb=8ff5e8deb3662e1b540574e8f7a07d39edcf737e;hpb=b5385b3ddf6f0e8df8f0af7275b59dcc1fcd0ed1

diff --git a/src/common/util.cpp b/src/common/util.cpp
index 4c1a22f2..41139dd5 100644
--- a/src/common/util.cpp
+++ b/src/common/util.cpp
@@ -18,11 +18,13 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include "util.h"
+#include "global.h"
+
 #include <QCoreApplication>
 #include <QDebug>
 #include <QTextCodec>
-
-#include "util.h"
+#include <QTranslator>
 
 class QMetaMethod;
 
@@ -104,7 +106,6 @@ bool readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVariant &item) {
 uint editingDistance(const QString &s1, const QString &s2) {
   uint n = s1.size()+1;
   uint m = s2.size()+1;
-  //uint matrix[n][m];
   QVector< QVector< uint > >matrix(n,QVector<uint>(m,0));
 
   for(uint i = 0; i < n; i++)
@@ -142,12 +143,18 @@ QByteArray methodName(const QMetaMethod &method) {
 }
 
 QDir quasselDir() {
-  // kinda ugly, but I currently see no other way to do that
+  QString quasselDir;
+  if(Global::parser.isSet("datadir")) {
+    quasselDir = Global::parser.value("datadir");
+  } else {
 #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)) {
@@ -159,22 +166,42 @@ QDir quasselDir() {
   return qDir;
 }
 
+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);
+
+  QCoreApplication::removeTranslator(qtTranslator);
+  QCoreApplication::removeTranslator(quasselTranslator);
+
+  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);
+}
 
 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(", ");
 }