From kde-commits Fri Aug 07 00:57:09 2009 From: Shawn Starr Date: Fri, 07 Aug 2009 00:57:09 +0000 To: kde-commits Subject: KDE/kdebase/workspace/plasma/dataengines/weather/ions Message-Id: <1249606629.363462.30217.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=124960663522553 SVN commit 1008163 by spstarr: For temperature, we must always set the unit, because we use this for not just current temperature, if it's not available, ie in Arctic Bay, NU M +3 -2 ion_envcan.cpp --- trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_envcan.cpp #1008162:1008163 @@ -1654,12 +1654,10 @@ QMap temperatureInfo; if (!d->m_weatherData[source].temperature.isEmpty()) { temperatureInfo.insert("temperature", QString::number(d->m_weatherData[source].temperature.toFloat(), 'f', 1)); - temperatureInfo.insert("temperatureUnit", QString::number(WeatherUtils::Celsius)); } if (d->m_weatherData[source].temperature == i18n("N/A")) { temperatureInfo.insert("temperature", i18n("N/A")); - temperatureInfo.insert("temperatureUnit", QString::number(WeatherUtils::NoUnit)); } temperatureInfo.insert("comfortTemperature", i18n("N/A")); @@ -1667,6 +1665,9 @@ if (d->m_weatherData[source].comforttemp != i18n("N/A")) { temperatureInfo.insert("comfortTemperature", d->m_weatherData[source].comforttemp); } + + // This is used for not just current temperature but also 8 days. Cannot be NoUnit. + temperatureInfo.insert("temperatureUnit", QString::number(WeatherUtils::Celsius)); return temperatureInfo; }