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

List:       kde-commits
Subject:    branches/KDE/4.3/kdeplasma-addons/applets/weather
From:       Shawn Starr <shawn.starr () rogers ! com>
Date:       2009-07-11 22:38:50
Message-ID: 1247351930.993913.16982.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 995082 by spstarr:

Backport all i18n fixes including bug 199503 as permitted by the i18n team. Fix \
copyright on file also

 M  +13 -15    weatherapplet.cpp  
 M  +1 -1      weatherview.cpp  


--- branches/KDE/4.3/kdeplasma-addons/applets/weather/weatherapplet.cpp \
#995081:995082 @@ -264,9 +264,9 @@
         // fiveDayTokens[4] = Low Temperature
         if (fiveDayTokens[4] != "N/A" && fiveDayTokens[3] == "N/A") {  // Low \
                temperature
             m_tempLabel->setText(convertTemperature(temperatureUnitInt(), \
                data["Temperature"].toString(), data["Temperature Unit"].toInt(), \
                false));
-            m_forecastTemps->setText(i18n("Low: %1", \
convertTemperature(temperatureUnitInt(), fiveDayTokens[4], data["Temperature \
Unit"].toInt()))); +            m_forecastTemps->setText(i18nc("Low temperature", \
"Low: %1", convertTemperature(temperatureUnitInt(), fiveDayTokens[4], \
                data["Temperature Unit"].toInt())));
         } else if (fiveDayTokens[3] != "N/A" && fiveDayTokens[4] == "N/A") { // High \
                temperature
-            m_forecastTemps->setText(i18n("High: %1", \
convertTemperature(temperatureUnitInt(), fiveDayTokens[3], data["Temperature \
Unit"].toInt()))); +            m_forecastTemps->setText(i18nc("High temperature", \
"High: %1", convertTemperature(temperatureUnitInt(), fiveDayTokens[3], \
data["Temperature Unit"].toInt())));  } else { // Both high and low
             m_forecastTemps->setText(i18nc("High & Low temperature", "H: %1 L: %2", \
convertTemperature(temperatureUnitInt(), fiveDayTokens[3], data["Temperature \
Unit"].toInt()), convertTemperature(temperatureUnitInt(),  fiveDayTokens[4], \
data["Temperature Unit"].toInt())));  }
@@ -284,8 +284,6 @@
         m_tempLabel->setText(QString());
     }
 
-    //m_windDirLabel->setText(i18n("Wind Direction: %1", data["Wind \
                Direction"].toString()));
-
     if (!m_currentIcon) {
         kDebug() << "Create new Plasma::IconWidget";
         m_currentIcon = new Plasma::IconWidget(this);
@@ -451,7 +449,8 @@
                 m_fiveDaysView->setModel(m_fiveDaysModel);
             }
             // If we have any items, display 5 Day tab, otherwise only details
-            m_tabBar->addTab(i18n("5 Days"), m_fiveDaysView);
+            QString totalDays = i18ncp("Forecast period timeframe", "1 Day", "%1 \
Days", data["Total Weather Days"].toInt()); +            m_tabBar->addTab(totalDays, \
m_fiveDaysView);  }
     }
 
@@ -489,7 +488,7 @@
 
     if (isValidData(data["Dewpoint"])) {
         QStandardItem *dataDewpoint = new QStandardItem();
-        dataDewpoint->setText(i18n("Dewpoint: %1", \
convertTemperature(temperatureUnitInt(), data["Dewpoint"].toString(), data["Dewpoint \
Unit"].toInt(), false))); +        dataDewpoint->setText(i18nc("ground temperature, \
unit", "Dewpoint: %1", convertTemperature(temperatureUnitInt(), \
data["Dewpoint"].toString(), data["Dewpoint Unit"].toInt(), false)));  \
m_detailsModel->appendRow(dataDewpoint);  }
 
@@ -501,7 +500,7 @@
 
     if (isValidData(data["Pressure Tendency"])) {
         QStandardItem *dataPressureTend = new QStandardItem();
-        dataPressureTend->setText(i18n("Pressure Tendency: %1", data["Pressure \
Tendency"].toString())); +        dataPressureTend->setText(i18nc("pressure tendency, \
rising/falling/steady", "Pressure Tendency: %1", data["Pressure \
Tendency"].toString()));  m_detailsModel->appendRow(dataPressureTend);
     }
 
@@ -513,7 +512,7 @@
         if (isNumeric) {
             dataVisibility->setText(i18nc("distance, unit","Visibility: %1 %2", \
clampValue(WeatherUtils::convertDistance(data["Visibility"].toDouble(), \
data["Visibility Unit"].toInt(), visibilityUnitInt()), 1), visibilityUnit()));  } \
                else {
-            dataVisibility->setText(i18n("Visibility: %1", \
data["Visibility"].toString())); +            \
dataVisibility->setText(i18nc("visibility from distance", "Visibility: %1", \
data["Visibility"].toString()));  }
 
         m_detailsModel->appendRow(dataVisibility);
@@ -521,7 +520,7 @@
 
     if (isValidData(data["Humidity"])) {
         QStandardItem *dataHumidity = new QStandardItem();
-        dataHumidity->setText(i18n("Humidity: %1", data["Humidity"].toString()));
+        dataHumidity->setText(i18nc("content of water in air", "Humidity: %1", \
data["Humidity"].toString()));  m_detailsModel->appendRow(dataHumidity);
     }
 
@@ -538,7 +537,6 @@
         }
     }
 
-    //m_windDirLabel->setText(i18n("Wind Direction: %1", data["Wind \
                Direction"].toString()));
     m_windIcon->setSvg("weather/wind-arrows", data["Wind Direction"].toString());
     m_windIcon->setMaximumSize(m_windIcon->sizeFromIconSize(KIconLoader::SizeSmall));
  m_windIcon->update();
@@ -546,7 +544,7 @@
     if (isValidData(data["Wind Gust"])) {
         // Convert the wind format for nonstandard types
         QStandardItem *dataGust = new QStandardItem();
-        dataGust->setText(i18n("Wind Gust: %1 %2", \
clampValue(WeatherUtils::convertSpeed(data["Wind Gust"].toDouble(), data["Wind Gust \
Unit"].toInt(), speedUnitInt()), 1), speedUnit())); +        \
dataGust->setText(i18nc("winds exceeding wind speed briefly", "Wind Gust: %1 %2", \
clampValue(WeatherUtils::convertSpeed(data["Wind Gust"].toDouble(), data["Wind Gust \
Unit"].toInt(), speedUnitInt()), 1), speedUnit()));  \
m_detailsModel->appendRow(dataGust);  }
 
@@ -554,7 +552,7 @@
         if (!m_detailsView->model()) {
             m_detailsView->setModel(m_detailsModel);
         }
-        m_tabBar->addTab(i18n("Details"), m_detailsView);
+        m_tabBar->addTab(i18nc("current weather information", "Details"), \
m_detailsView);  }
 
     int rowCount = 0;
@@ -569,7 +567,7 @@
         if (data["Total Warnings Issued"].toInt() > 0) {
             QGraphicsGridLayout *warningLayout = new QGraphicsGridLayout();
             Plasma::Label *warningTitle = new Plasma::Label();
-            warningTitle->setText(i18n("Warnings Issued:"));
+            warningTitle->setText(i18nc("weather warnings", "Warnings Issued:"));
             warningTitle->nativeWidget()->setFont(noticeTitleFont);
             noticeLayout->addItem(warningTitle);
             for (int k = 0; k < data["Total Warnings Issued"].toInt(); k++) {
@@ -606,7 +604,7 @@
         if (data["Total Watches Issued"].toInt() > 0) {
             QGraphicsGridLayout *watchLayout = new QGraphicsGridLayout();
             Plasma::Label *watchTitle = new Plasma::Label();
-            watchTitle->setText(i18n("Watches Issued:"));
+            watchTitle->setText(i18nc("weather watches" ,"Watches Issued:"));
             watchTitle->nativeWidget()->setFont(noticeTitleFont);
             noticeLayout->addItem(watchTitle);
             for (int j = 0; j < data["Total Watches Issued"].toInt(); j++) {
@@ -632,7 +630,7 @@
             noticeLayout->addItem(watchLayout);
         }
 
-        m_tabBar->addTab(i18n("Notices"), noticeLayout);
+        m_tabBar->addTab(i18nc("weather notices", "Notices"), noticeLayout);
     }
 
     if (!m_setupLayout) {
--- branches/KDE/4.3/kdeplasma-addons/applets/weather/weatherview.cpp #995081:995082
@@ -1,5 +1,5 @@
 /*
- *   Copyright 2008 Aaron Seigo <aseigo@kde.org>
+ *   Copyright 2008 Marco Martin <notmart@gmail.com>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as


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