Read wikipedia locale fro config file.

NOTE: Wikipedia fetching/locale code is NOT complete!!!!

context/view.cpp

@@ -24,6 +24,7 @@
 #include "view.h"
 #include "spinner.h"
 #include "networkaccessmanager.h"
+#include "settings.h"
 #include <QLabel>
 #include <QTextBrowser>
 #include <QImage>
@@ -59,10 +60,7 @@ View::View(QWidget *parent)
     layout->addItem(new QSpacerItem(1, fontMetrics().height()/4, QSizePolicy::Fixed, QSizePolicy::Fixed));
     text->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setEditable(false);
-    locale=qgetenv("CANTATA_LOCALE");
-    if (locale.isEmpty()) {
-        locale="en";
-    }
+    locale=Settings::self()->wikipediaLocale();
 }
 
 void View::clear()

gui/settings.cpp

@@ -452,9 +452,9 @@ QStringList Settings::lyricProviders()
     return GET_STRINGLIST("lyricProviders", def);
 }
 
-QString Settings::infoProvider()
+QString Settings::wikipediaLocale()
 {
-    return GET_STRING("infoProvider", QString());
+    return GET_STRING("wikipediaLocale", "en");
 }
 
 
@@ -857,9 +857,9 @@ void Settings::saveLyricProviders(const QStringList &v)
     SET_VALUE_MOD(lyricProviders)
 }
 
-void Settings::saveInfoProvider(const QString &v)
+void Settings::saveWikipediaLocale(const QString &v)
 {
-    SET_VALUE_MOD(infoProvider)
+    SET_VALUE_MOD(wikipediaLocale)
 }
 
 void Settings::savePage(const QString &v)

gui/settings.h

@@ -125,7 +125,7 @@ public:
     bool groupSingle();
     bool groupMultiple();
     QStringList lyricProviders();
-    QString infoProvider();
+    QString wikipediaLocale();
     QString page();
     QStringList hiddenPages();
     bool gnomeMediaKeys();
@@ -204,7 +204,7 @@ public:
     void saveGroupSingle(bool v);
     void saveGroupMultiple(bool v);
     void saveLyricProviders(const QStringList &v);
-    void saveInfoProvider(const QString &v);
+    void saveWikipediaLocale(const QString &v);
     void savePage(const QString &v);
     void saveHiddenPages(const QStringList &v);
     void saveGnomeMediaKeys(bool v);