[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/dataengines/weather/ions
From:       Shawn Starr <shawn.starr () rogers ! com>
Date:       2009-07-12 19:13:34
Message-ID: 1247426014.838207.26797.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 995448 by spstarr:

More i18n string translations for pressure, visibility strings where applicable

 M  +8 -0      data/bbcukmet_i18n.dat  
 M  +3 -0      data/envcan_i18n.dat  
 M  +2 -2      ion_bbcukmet.cpp  
 M  +1 -21     ion_envcan.cpp  


--- trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/data/bbcukmet_i18n.dat \
#995447:995448 @@ -108,3 +108,11 @@
 wind direction|SW
 wind direction|WSW
 wind direction|VR
+visibility|Very Good
+visibility|Good
+visibility|Moderate
+visibility|Poor
+visibility|Very Poor
+pressure tendency|rising
+pressure tendency|falling
+pressure tendency|no change
--- trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/data/envcan_i18n.dat \
#995447:995448 @@ -352,3 +352,6 @@
 wind direction|VR
 wind speed|Calm
 wind speed|N/A
+pressure tendency|rising
+pressure tendency|falling
+pressure tendency|steady
--- trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_bbcukmet.cpp \
#995447:995448 @@ -958,7 +958,7 @@
 
 QString UKMETIon::visibility(const QString& source)
 {
-    return d->m_weatherData[source].visibilityStr;
+    return i18nc("visibility", d->m_weatherData[source].visibilityStr.toUtf8());
 }
 
 QMap<QString, QString> UKMETIon::pressure(const QString& source)
@@ -972,7 +972,7 @@
     pressureInfo.insert("pressure", QString(d->m_weatherData[source].pressure));
     pressureInfo.insert("pressureUnit", QString::number(WeatherUtils::Millibars));
 
-    pressureInfo.insert("pressureTendency", \
d->m_weatherData[source].pressureTendency); +    \
pressureInfo.insert("pressureTendency", i18nc("pressure tendency", \
d->m_weatherData[source].pressureTendency.toUtf8()));  return pressureInfo;
 }
 
--- trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_envcan.cpp \
#995447:995448 @@ -1375,26 +1375,6 @@
     }
 }
 
-static double toFractionalHour(const QString & from, const double abort = -1.0)
-{
-    int colon = from.indexOf(':');
-    if (colon == -1 || colon < 2 || colon + 3 > from.length()) return abort;
-
-    bool ok;
-
-    const double h = from.mid(colon - 2, 2).toDouble(&ok);
-    if (!ok) {
-        return abort;
-    }
-
-    const double m = from.mid(colon + 1, 2).toDouble(&ok);
-    if (!ok) {
-        return abort;
-    }
-
-    return (h + (m / 60.0));
-}
-
 void EnvCanadaIon::updateWeather(const QString& source)
 {
     kDebug() << "updateWeather()";
@@ -1830,7 +1810,7 @@
     } else {
         pressureInfo.insert("pressure", \
                QString::number(d->m_weatherData[source].pressure, 'f', 1));
         pressureInfo.insert("pressureUnit", \
                QString::number(WeatherUtils::Kilopascals));
-        pressureInfo.insert("pressureTendency", \
d->m_weatherData[source].pressureTendency); +        \
pressureInfo.insert("pressureTendency", i18nc("pressure tendency", \
d->m_weatherData[source].pressureTendency.toUtf8()));  }
     return pressureInfo;
 }


[prev in list] [next in list] [prev in thread] [next in thread]