Index: weather.cpp =================================================================== RCS file: /var/lib/mythcvs/mythweather/mythweather/weather.cpp,v retrieving revision 1.37 diff -u -r1.37 weather.cpp --- weather.cpp 2 Mar 2004 06:03:54 -0000 1.37 +++ weather.cpp 27 Mar 2004 19:04:40 -0000 @@ -1808,8 +1808,17 @@ QString todayDesc; - todayDesc = tr("Today a high of ") + highTemp[0] + tr(" and a low of "); - todayDesc += lowTemp[0] + tr(". Currently there is a humidity of "); + todayDesc = tr("Today a high of ") + highTemp[0]; + if (convertData == false) + todayDesc += QString::fromUtf8("°F",3); + else + todayDesc += QString::fromUtf8("°C",3); + todayDesc += tr(" and a low of ") + lowTemp[0]; + if (convertData == false) + todayDesc += QString::fromUtf8("°F",3); + else + todayDesc += QString::fromUtf8("°C",3); + todayDesc += tr(". Currently there is a humidity of "); todayDesc += curHumid + tr("% and the winds are"); if (winddir == "CALM") @@ -1860,8 +1869,17 @@ else tomDate = tr("Date Error"); - tomDesc = tr("Tomorrow expect a high of ") + highTemp[0] + tr(" and a low of "); - tomDesc += lowTemp[0] + tr("."); + tomDesc = tr("Tomorrow expect a high of ") + highTemp[0]; + if (convertData == false) + tomDesc += QString::fromUtf8("°F",3); + else + tomDesc += QString::fromUtf8("°C",3); + tomDesc += tr(" and a low of ") + lowTemp[0]; + if (convertData == false) + tomDesc += QString::fromUtf8("°F",3); + else + tomDesc += QString::fromUtf8("°C",3); + tomDesc += tr("."); QString tomCond = tr("Expected conditions: ") + weatherType[0];