fixed localization support

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@372 90c681e8-e032-0410-971d-27865f9a5e38

8 files changed, 24 insertions, 12 deletions

diff --git a/src/plugins/General/dbuscontrol/dbuscontrolfactory.cpp b/src/plugins/General/dbuscontrol/dbuscontrolfactory.cpp
index 912301bc7..f3ad105b7 100644
--- a/src/plugins/General/dbuscontrol/dbuscontrolfactory.cpp
+++ b/src/plugins/General/dbuscontrol/dbuscontrolfactory.cpp
@@ -50,9 +50,12 @@ void DBUSControlFactory::showAbout(QWidget *parent)
                         tr("Writen by: Ilya Kotov <forkotov02@hotmail.ru>"));
 }
 
-QTranslator *DBUSControlFactory::createTranslator(QObject *)
+QTranslator *DBUSControlFactory::createTranslator(QObject *parent)
 {
-    return 0;
+    QTranslator *translator = new QTranslator(parent);
+    QString locale = QLocale::system().name();
+    translator->load(QString(":/dbuscontrol_plugin_") + locale);
+    return translator;
 }
 
 Q_EXPORT_PLUGIN(DBUSControlFactory)
diff --git a/src/plugins/General/notifier/CMakeLists.txt b/src/plugins/General/notifier/CMakeLists.txt
index 8738100d1..76400d1e9 100644
--- a/src/plugins/General/notifier/CMakeLists.txt
+++ b/src/plugins/General/notifier/CMakeLists.txt
@@ -35,9 +35,9 @@ SET(libnotifier_MOC_HDRS
     popupwidget.h
 )
 
-SET(libnotifier_RCCS translations/translations.qrc)
-
-SET(libnotifier_RCCS notifier_images.qrc)
+SET(libnotifier_RCCS 
+    translations/translations.qrc
+    notifier_images.qrc)
 
 QT4_ADD_RESOURCES(libnotifier_RCC_SRCS ${libnotifier_RCCS})
 
diff --git a/src/plugins/General/notifier/notifierfactory.cpp b/src/plugins/General/notifier/notifierfactory.cpp
index 17a667f0a..5ef3ac325 100644
--- a/src/plugins/General/notifier/notifierfactory.cpp
+++ b/src/plugins/General/notifier/notifierfactory.cpp
@@ -51,9 +51,12 @@ void NotifierFactory::showAbout(QWidget *parent)
                         tr("Writen by: Ilya Kotov <forkotov02@hotmail.ru>"));
 }
 
-QTranslator *NotifierFactory::createTranslator(QObject*)
+QTranslator *NotifierFactory::createTranslator(QObject *parent)
 {
-    return 0;
+    QTranslator *translator = new QTranslator(parent);
+    QString locale = QLocale::system().name();
+    translator->load(QString(":/notifier_plugin_") + locale);
+    return translator;
 }
 
 Q_EXPORT_PLUGIN(NotifierFactory)
diff --git a/src/plugins/General/scrobbler/scrobblerfactory.cpp b/src/plugins/General/scrobbler/scrobblerfactory.cpp
index 7a8c2f333..21a3b522b 100644
--- a/src/plugins/General/scrobbler/scrobblerfactory.cpp
+++ b/src/plugins/General/scrobbler/scrobblerfactory.cpp
@@ -51,9 +51,12 @@ void ScrobblerFactory::showAbout(QWidget *parent)
                         tr("Writen by: Ilya Kotov <forkotov02@hotmail.ru>"));
 }
 
-QTranslator *ScrobblerFactory::createTranslator(QObject*)
+QTranslator *ScrobblerFactory::createTranslator(QObject *parent)
 {
-    return 0;
+    QTranslator *translator = new QTranslator(parent);
+    QString locale = QLocale::system().name();
+    translator->load(QString(":/scrobbler_plugin_") + locale);
+    return translator;
 }
 
 Q_EXPORT_PLUGIN(ScrobblerFactory)
diff --git a/src/plugins/General/statusicon/CMakeLists.txt b/src/plugins/General/statusicon/CMakeLists.txt
index 7f5ea5bbd..c76318ec3 100644
--- a/src/plugins/General/statusicon/CMakeLists.txt
+++ b/src/plugins/General/statusicon/CMakeLists.txt
@@ -33,9 +33,9 @@ SET(libstatusicon_MOC_HDRS
     statusicon.h
 )
 
-SET(libstatusicon_RCCS translations/translations.qrc)
-
-SET(libstatusicon_RCCS images/tray_images.qrc)
+SET(libstatusicon_RCCS 
+    translations/translations.qrc
+    images/tray_images.qrc)
 
 QT4_ADD_RESOURCES(libstatusicon_RCC_SRCS ${libstatusicon_RCCS})
 
diff --git a/src/qmmp/effect.cpp b/src/qmmp/effect.cpp
index fe4222bb6..0d61a4905 100644
--- a/src/qmmp/effect.cpp
+++ b/src/qmmp/effect.cpp
@@ -86,6 +86,7 @@ static void checkFactories()
             {
                 factories->append(factory);
                 files << pluginsDir.absoluteFilePath(fileName);
+                qApp->installTranslator(factory->createTranslator(qApp));
             }
         }
     }
diff --git a/src/qmmp/visual.cpp b/src/qmmp/visual.cpp
index 4347626de..0c234a5a8 100644
--- a/src/qmmp/visual.cpp
+++ b/src/qmmp/visual.cpp
@@ -60,6 +60,7 @@ static void checkFactories()
             {
                 factories->append(factory);
                 files << pluginsDir.absoluteFilePath(fileName);
+                qApp->installTranslator(factory->createTranslator(qApp));
             }
         }
     }
diff --git a/src/qmmpui/general.cpp b/src/qmmpui/general.cpp
index e3153c534..3ed2e0843 100644
--- a/src/qmmpui/general.cpp
+++ b/src/qmmpui/general.cpp
@@ -56,6 +56,7 @@ static void checkFactories()
             {
                 factories->append(factory);
                 files << pluginsDir.absoluteFilePath(fileName);
+                qApp->installTranslator(factory->createTranslator(qApp));
             }
         }
     }