fixed language detection

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

8 files changed, 11 insertions, 11 deletions

diff --git a/src/plugins/General/fileops/fileopsfactory.cpp b/src/plugins/General/fileops/fileopsfactory.cpp
index 09bf0d919..a99e65deb 100644
--- a/src/plugins/General/fileops/fileopsfactory.cpp
+++ b/src/plugins/General/fileops/fileopsfactory.cpp
@@ -55,7 +55,7 @@ void FileOpsFactory::showAbout(QWidget *parent)
 QTranslator *FileOpsFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/fileops_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/General/hal/halfactory.cpp b/src/plugins/General/hal/halfactory.cpp
index 513f8642a..4c7cfd04b 100644
--- a/src/plugins/General/hal/halfactory.cpp
+++ b/src/plugins/General/hal/halfactory.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <QtGui>
-
+#include <qmmp/qmmp.h>
 #include "settingsdialog.h"
 #include "halplugin.h"
 #include "halfactory.h"
@@ -57,7 +57,7 @@ void HalFactory::showAbout(QWidget *parent)
 QTranslator *HalFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/hal_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/General/hotkey/hotkeyfactory.cpp b/src/plugins/General/hotkey/hotkeyfactory.cpp
index afe694fe8..2c469f74f 100644
--- a/src/plugins/General/hotkey/hotkeyfactory.cpp
+++ b/src/plugins/General/hotkey/hotkeyfactory.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <QtGui>
-
+#include <qmmp/qmmp.h>
 #include "settingsdialog.h"
 #include "hotkeymanager.h"
 #include "hotkeyfactory.h"
@@ -56,7 +56,7 @@ void HotkeyFactory::showAbout(QWidget *parent)
 QTranslator *HotkeyFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/hotkey_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/General/lyrics/lyricsfactory.cpp b/src/plugins/General/lyrics/lyricsfactory.cpp
index 5f9c29bf2..5fef65803 100644
--- a/src/plugins/General/lyrics/lyricsfactory.cpp
+++ b/src/plugins/General/lyrics/lyricsfactory.cpp
@@ -56,7 +56,7 @@ void LyricsFactory::showAbout(QWidget *parent)
 QTranslator *LyricsFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/lyrics_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/General/mpris/mprisfactory.cpp b/src/plugins/General/mpris/mprisfactory.cpp
index 6b27fb33d..0d8ae0a28 100644
--- a/src/plugins/General/mpris/mprisfactory.cpp
+++ b/src/plugins/General/mpris/mprisfactory.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <QtGui>
-
+#include <qmmp/qmmp.h>
 #include "mpris.h"
 #include "mprisfactory.h"
 
@@ -54,7 +54,7 @@ void MPRISFactory::showAbout(QWidget *parent)
 QTranslator *MPRISFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/mpris_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/General/notifier/notifierfactory.cpp b/src/plugins/General/notifier/notifierfactory.cpp
index f0da9352a..a1095fccf 100644
--- a/src/plugins/General/notifier/notifierfactory.cpp
+++ b/src/plugins/General/notifier/notifierfactory.cpp
@@ -55,7 +55,7 @@ void NotifierFactory::showAbout(QWidget *parent)
 QTranslator *NotifierFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/notifier_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/General/scrobbler/scrobblerfactory.cpp b/src/plugins/General/scrobbler/scrobblerfactory.cpp
index 69b3d9b82..6491b8b98 100644
--- a/src/plugins/General/scrobbler/scrobblerfactory.cpp
+++ b/src/plugins/General/scrobbler/scrobblerfactory.cpp
@@ -55,7 +55,7 @@ void ScrobblerFactory::showAbout(QWidget *parent)
 QTranslator *ScrobblerFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/scrobbler_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/General/statusicon/statusiconfactory.cpp b/src/plugins/General/statusicon/statusiconfactory.cpp
index dae733dc7..129414cc6 100644
--- a/src/plugins/General/statusicon/statusiconfactory.cpp
+++ b/src/plugins/General/statusicon/statusiconfactory.cpp
@@ -55,7 +55,7 @@ void StatusIconFactory::showAbout(QWidget *parent)
 QTranslator *StatusIconFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/statusicon_plugin_") + locale);
     return translator;
 }