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

List:       kde-i18n-doc
Subject:    Re: KDE/kdebase/workspace/plasma/dataengines/weather
From:       Albert Astals Cid <aacid () kde ! org>
Date:       2009-08-06 22:37:02
Message-ID: 200908070037.02411.aacid () kde ! org
[Download RAW message or body]

A Divendres, 7 d'agost de 2009, Aaron J. Seigo va escriure:
> SVN commit 1008109 by aseigo:

Make that be two strings, "N/A" needs to be transalted too.

Albert

>
> make it possible to translate humidity; it introduces a new string,
> however, so i can't/won't backport unless the i18n team says "yes, please
> backport" CCMAIL:kde-i18n-doc@kde.org
> BUG:202884
>
>
>  M  +7 -3      ions/ion_bbcukmet.cpp
>  M  +1 -1      ions/ion_envcan.cpp
>  M  +1 -1      ions/ion_noaa.cpp
>  M  +1 -1      weatherengine.cpp
>
>
> ---
> trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_bbcukmet.cp
>p #1008108:1008109 @@ -646,6 +646,9 @@
>                  data.windSpeed_miles =
> observeData[3].split(',')[0].split(' ')[1].remove("mph");
>
>                  data.humidity = observeData[4].split(',')[0].split('
> ')[1]; +                if (data.humidity.endsWith('%')) {
> +                    data.humidity.chop(1);
> +                }
>
>                  data.pressure = observeData[5].split(',')[0].split('
> ')[1].split("mB")[0]; data.pressureTendency =
> observeData[5].split(',')[1].trimmed(); @@ -950,10 +953,11 @@
>
>  QString UKMETIon::humidity(const QString& source) const
>  {
> -    if (d->m_weatherData[source].humidity == "N/A%") {
> -        return "N/A";
> +    if (d->m_weatherData[source].humidity == "N/A") {
> +        return d->m_weatherData[source].humidity;
>      }
> -    return d->m_weatherData[source].humidity;
> +
> +    return i18nc("Humidity in percent", "%1%",
> d->m_weatherData[source].humidity); // FIXME: Turn '%' into a unit field }
>
>  QString UKMETIon::visibility(const QString& source) const
> ---
> trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_envcan.cpp
> #1008108:1008109 @@ -1645,7 +1645,7 @@
>  QString EnvCanadaIon::humidity(const QString& source) const
>  {
>      if (!d->m_weatherData[source].humidity.isEmpty()) {
> -        return QString("%1%").arg(d->m_weatherData[source].humidity);
> +        return i18nc("Humidity in percent", "%1%",
> d->m_weatherData[source].humidity); }
>      return "N/A";
>  }
> ---
> trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_noaa.cpp
> #1008108:1008109 @@ -541,7 +541,7 @@
>      }
>
>      if (humidity(source) != "N/A") {
> -        data.insert("Humidity", QString("%1%").arg(humidity(source))); //
> FIXME: Turn '%' into a unit field +        data.insert("Humidity",
> i18nc("Humidity in percent", "%1%", humidity(source))); // FIXME: Turn '%'
> into a unit field }
>
>      // Set number of forecasts per day/night supported, none for this ion
> right now ---
> trunk/KDE/kdebase/workspace/plasma/dataengines/weather/weatherengine.cpp
> #1008108:1008109 @@ -186,7 +186,7 @@
>
>  void WeatherEngine::unloadIons()
>  {
> -    foreach(const QString &ion, d->m_ions) {
> +    foreach (const QString &ion, d->m_ions) {
>          Plasma::DataEngineManager::self()->unloadEngine(ion);
>      }

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