X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fquassel.cpp;h=08652abe1ebb17db50097635ef76f1913ae23847;hp=e74d60590318bc06652ff2c8e28fd66fc925fe9e;hb=ace46ddca3818d63d8de9ff481038bda8f5cf982;hpb=64d5732f4e6ce84dd73dfb1a72c1fbb568a3fe0a

diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index e74d6059..08652abe 100644
--- a/src/common/quassel.cpp
+++ b/src/common/quassel.cpp
@@ -336,10 +336,17 @@ QString Quassel::findDataFilePath(const QString &fileName) {
   return QString();
 }
 
-void Quassel::loadTranslation(const QLocale &locale) {
+QStringList Quassel::scriptDirPaths() {
+  QStringList res(configDirPath() + "scripts/");
+  foreach(QString path, dataDirPaths())
+    res << path + "scripts/";
+  return res;
+}
+
+QString Quassel::translationDirPath() {
   if(_translationDirPath.isEmpty()) {
     // We support only one translation dir; fallback mechanisms wouldn't work else.
-    // This means that if we have a $data/i18n dir, the internal :/i18n resource won't be considered.
+    // This means that if we have a $data/translations dir, the internal :/i18n resource won't be considered.
     foreach(const QString &dir, dataDirPaths()) {
       if(QFile::exists(dir + "translations/")) {
         _translationDirPath = dir + "translations/";
@@ -349,7 +356,10 @@ void Quassel::loadTranslation(const QLocale &locale) {
     if(_translationDirPath.isEmpty())
       _translationDirPath = ":/i18n/";
   }
+  return _translationDirPath;
+}
 
+void Quassel::loadTranslation(const QLocale &locale) {
   QTranslator *qtTranslator = QCoreApplication::instance()->findChild<QTranslator *>("QtTr");
   QTranslator *quasselTranslator = QCoreApplication::instance()->findChild<QTranslator *>("QuasselTr");
 
@@ -369,8 +379,8 @@ void Quassel::loadTranslation(const QLocale &locale) {
   if(locale.language() == QLocale::C)
     return;
 
-  bool success = qtTranslator->load(QString("qt_%1").arg(locale.name()), _translationDirPath);
+  bool success = qtTranslator->load(QString("qt_%1").arg(locale.name()), translationDirPath());
   if(!success)
     qtTranslator->load(QString("qt_%1").arg(locale.name()), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
-  quasselTranslator->load(QString("quassel_%1").arg(locale.name()), _translationDirPath);
+  quasselTranslator->load(QString("quassel_%1").arg(locale.name()), translationDirPath());
 }