Added some missing Finnish translations to settings dialog. Added missing build deped...

[jenirok] / src / common / eniro.cpp

diff --git a/src/common/eniro.cpp b/src/common/eniro.cpp
index 0b8579b..20af69c 100644 (file)
--- a/src/common/eniro.cpp
+++ b/src/common/eniro.cpp
@@ -21,18 +21,32 @@
 
 namespace
 {
-    static const QString SITE_URLS[] =
+    static const QString SITE_URLS[Eniro::SITE_COUNT] =
     {
             "http://wap.eniro.fi/",
             "http://wap.eniro.se/",
             "http://wap.eniro.dk/"
     };
 
-    const QString INVALID_LOGIN_STRING = "Invalid login details";
-    const QString PERSON_REGEXP = "<td class=\"hTd2\">(.*)<b>(.*)</td>";
-    const QString YELLOW_REGEXP = "<td class=\"hTd2\">(.*)<span class=\"gray\"\\}>(.*)</td>";
-    const QString NUMBER_REGEXP = "<div class=\"callRow\">(.*)</div>";
-    const QString LOGIN_CHECK = "<input class=\"inpTxt\" id=\"loginformUsername\"";
+    static const QString SITE_NAMES[Eniro::SITE_COUNT] =
+    {
+         "finnish",
+         "swedish",
+         "danish"
+    };
+
+    static const QString SITE_IDS[Eniro::SITE_COUNT] =
+    {
+         "fi",
+         "se",
+         "dk"
+    };
+
+    static const QString INVALID_LOGIN_STRING = "Invalid login details";
+    static const QString PERSON_REGEXP = "<td class=\"hTd2\">(.*)<b>(.*)</td>";
+    static const QString YELLOW_REGEXP = "<td class=\"hTd2\">(.*)<span class=\"gray\"\\}>(.*)</td>";
+    static const QString NUMBER_REGEXP = "<div class=\"callRow\">(.*)</div>";
+    static const QString LOGIN_CHECK = "<input class=\"inpTxt\" id=\"loginformUsername\"";
 }
 
 // Regexp used to remove numbers from string
@@ -549,17 +563,14 @@ QMap <Eniro::Site, Eniro::SiteDetails> Eniro::getSites()
 {
     QMap <Site, SiteDetails> sites;
     SiteDetails details;
-    details.name = tr("Finnish");
-    details.id = "fi";
-    sites[FI] = details;
-
-    details.name = tr("Swedish");
-    details.id = "se";
-    sites[SE] = details;
 
-    details.name = tr("Danish");
-    details.id = "dk";
-    sites[DK] = details;
+    for(int i = 0; i < SITE_COUNT; i++)
+    {
+        SiteDetails details;
+        details.name = SITE_NAMES[i];
+        details.id = SITE_IDS[i];
+        sites[static_cast<Site>(i)] = details;
+    }
 
     return sites;
 }
@@ -567,16 +578,14 @@ QMap <Eniro::Site, Eniro::SiteDetails> Eniro::getSites()
 Eniro::Site Eniro::stringToSite(QString const& str)
 {
     Site site = FI;
-
     QString lower = str.toLower();
 
-    if(lower == "se" || lower == "swedish")
+    for(int i = 0; i < SITE_COUNT; i++)
     {
-        site = SE;
-    }
-    else if(lower == "dk" || lower == "danish")
-    {
-        site = DK;
+        if(lower == SITE_NAMES[i] || lower == SITE_IDS[i])
+        {
+            site = static_cast <Site> (i);
+        }
     }
 
     return site;