[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-20 19:50:47
Message-ID: 1248119447.139417.13454.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1000080 by spstarr:

Fix BBC a bit more, the i18n string clobbers the icon. Just use the QString for \
summary not the WeatherData element

 M  +4 -4      ion_bbcukmet.cpp  


--- trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_bbcukmet.cpp \
#1000079:1000080 @@ -749,7 +749,7 @@
             low.indexIn(line.split(',')[2]);
 
             forecast->period = period;
-            forecast->iconName = getWeatherIcon(dayIcons(), \
forecast->summary.toLower()); +            forecast->iconName = \
                getWeatherIcon(dayIcons(), summary.toLower());
             forecast->summary = i18nc("weather forecast", summary.toUtf8());
             kDebug() << "i18n summary string: " << qPrintable(forecast->summary);
             forecast->tempHigh = high.cap(0).toInt();
@@ -808,8 +808,8 @@
     data.insert("Place", place(source));
     data.insert("Station", station(source));
     data.insert("Observation Period", observationTime(source));
-    data.insert("Current Conditions", condition(source));
-    kDebug() << "i18n condition string: " << qPrintable(condition(source));
+    data.insert("Current Conditions", i18nc("weather condition", \
condition(source).toUtf8())); +    kDebug() << "i18n condition string: " << \
qPrintable(i18nc("weather condition", condition(source).toUtf8()));  
     const double observationSeconds = 60.0 * (periodMinute(source) + 60.0 * \
periodHour(source));  
@@ -918,7 +918,7 @@
 
 QString UKMETIon::condition(const QString& source)
 {
-    return i18nc("weather condition", d->m_weatherData[source].condition.toUtf8());
+    return (d->m_weatherData[source].condition);
 }
 
 QMap<QString, QString> UKMETIon::temperature(const QString& source)


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