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

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

SVN commit 994053 by spstarr:

make summary and condition strings i18n ready. Backport to 4.3


 M  +4 -2      ion_bbcukmet.cpp  
 M  +4 -2      ion_envcan.cpp  
 M  +2 -2      ion_noaa.cpp  


--- branches/KDE/4.3/kdebase/workspace/plasma/dataengines/weather/ions/ion_bbcukmet.cpp \
#994052:994053 @@ -745,7 +745,8 @@
             low.indexIn(line.split(',')[2]);
 
             forecast->period = period;
-            forecast->summary = summary;
+            forecast->summary = i18n(summary.toUtf8());
+            kDebug() << "i18n summary string: " << qPrintable(forecast->summary);
             forecast->iconName = getWeatherIcon(dayIcons(), \
forecast->summary.toLower());  forecast->tempHigh = high.cap(0).toInt();
             forecast->tempLow = low.cap(0).toInt();
@@ -804,6 +805,7 @@
     data.insert("Station", station(source));
     data.insert("Observation Period", observationTime(source));
     data.insert("Current Conditions", condition(source));
+    kDebug() << "i18n condition string: " << qPrintable(condition(source));
 
     const double observationSeconds = 60.0 * (periodMinute(source) + 60.0 * \
periodHour(source));  
@@ -912,7 +914,7 @@
 
 QString UKMETIon::condition(const QString& source)
 {
-    return d->m_weatherData[source].condition;
+    return i18n(d->m_weatherData[source].condition.toUtf8());
 }
 
 QMap<QString, QString> UKMETIon::temperature(const QString& source)
--- branches/KDE/4.3/kdebase/workspace/plasma/dataengines/weather/ions/ion_envcan.cpp \
#994052:994053 @@ -1377,6 +1377,7 @@
     // Real weather - Current conditions
     data.insert("Observation Period", observationTime(source));
     data.insert("Current Conditions", condition(source));
+    kDebug() << "i18n condition string: " << qPrintable(condition(source));
 
     const double sunrise = \
                toFractionalHour(d->m_weatherData[source].sunriseTimestamp, 6.0);
     const double sunset = toFractionalHour(d->m_weatherData[source].sunsetTimestamp, \
18.0); @@ -1595,7 +1596,7 @@
     if (d->m_weatherData[source].condition.isEmpty()) {
         d->m_weatherData[source].condition = "N/A";
     }
-    return d->m_weatherData[source].condition;
+    return i18n(d->m_weatherData[source].condition.toUtf8());
 }
 
 QString EnvCanadaIon::dewpoint(const QString& source)
@@ -1756,10 +1757,11 @@
         forecastData.append(QString("%1|%2|%3|%4|%5|%6") \
                             \
                .arg(d->m_weatherData[source].forecasts[i]->forecastPeriod) \
                             .arg(d->m_weatherData[source].forecasts[i]->iconName) \
-                            \
.arg(d->m_weatherData[source].forecasts[i]->shortForecast) \ +                        \
                .arg(i18n(d->m_weatherData[source].forecasts[i]->shortForecast.toUtf8())) \
                \
                             \
                .arg(d->m_weatherData[source].forecasts[i]->forecastTempHigh) \
                             \
                .arg(d->m_weatherData[source].forecasts[i]->forecastTempLow) \
                             \
.arg(d->m_weatherData[source].forecasts[i]->popPrecent)); +        kDebug() << "i18n \
summary string: " << \
qPrintable(i18n(d->m_weatherData[source].forecasts[i]->shortForecast.toUtf8()));  }
     return forecastData;
 }
--- branches/KDE/4.3/kdebase/workspace/plasma/dataengines/weather/ions/ion_noaa.cpp \
#994052:994053 @@ -483,7 +483,7 @@
     // Real weather - Current conditions
     data.insert("Observation Period", observationTime(source));
     data.insert("Current Conditions", condition(source));
-
+    kDebug() << "i18n condition string: " << qPrintable(condition(source));
 // FIXME: We'll need major fuzzy logic, this isn't pretty: \
http://www.weather.gov/xml/current_obs/weather.php  //QMap<QString, ConditionIcons> \
conditionList;  //conditionList = conditionIcons();
@@ -611,7 +611,7 @@
     if (d->m_weatherData[source].weather.isEmpty() || \
d->m_weatherData[source].weather == "NA") {  d->m_weatherData[source].weather = \
"N/A";  }
-    return d->m_weatherData[source].weather;
+    return i18n(d->m_weatherData[source].weather.toUtf8());
 }
 
 QString NOAAIon::dewpoint(const QString& source)


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