Merge lp:~vthompson/ubuntu-weather-app/reboot-add-condition-text into lp:ubuntu-weather-app

[Victor Thompson]

Add conditions text to day delegate.

Add conditions text to day delegate.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:59
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/134/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/104
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/134

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/134/rebuild

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

What happens regarding translations with this? Do we need to create a map which we can then put i18n.tr() around the values or something?

review: Needs Information

[Andrew Hayzen (ahayzen)]

As discussed appears we are already [0] sending the locale in the requests :-)

Therefore LGTM :-)

0 - http://i.imgur.com/WsJY30q.png

review: Approve

=== modified file 'app/components/DayDelegate.qml'
--- app/components/DayDelegate.qml	2015-06-30 00:48:43 +0000
+++ app/components/DayDelegate.qml	2015-06-30 00:48:43 +0000
@@ -31,7 +31,7 @@
     property alias high: highLabel.text
     property alias low: lowLabel.text
 
-    property alias description: descriptionForecast.text
+    property alias condition: conditionForecast.text
     property alias chanceOfRain: chanceOfRainForecast.value
     property alias humidity: humidityForecast.value
     property alias pollen: pollenForecast.value
@@ -187,13 +187,11 @@
 
             // Overview text
             Label {
-                id: descriptionForecast
+                id: conditionForecast
                 color: UbuntuColors.coolGrey
                 fontSize: "x-large"
                 horizontalAlignment: Text.AlignHCenter
-                text: i18n.tr("Chance of rain")
                 width: parent.width
-                visible: false  // FIXME: add overview text eg "Chance of flurries"
             }
 
             ForecastDetailsDelegate {
 
=== modified file 'app/ui/LocationPane.qml'
--- app/ui/LocationPane.qml	2015-06-30 00:48:43 +0000
+++ app/ui/LocationPane.qml	2015-06-30 00:48:43 +0000
@@ -97,6 +97,7 @@
                     low: Math.round(forecasts[x][tempUnits].tempMin).toString() + settings.tempScale,
                     high: (forecasts[x][tempUnits].tempMax !== undefined) ? Math.round(forecasts[x][tempUnits].tempMax).toString() + settings.tempScale : "",
                     image: (forecasts[x].icon !== undefined && iconMap[forecasts[x].icon] !== undefined) ? iconMap[forecasts[x].icon] : "",
+                    condition: emptyIfUndefined(forecasts[x].condition),
                     chanceOfRain: emptyIfUndefined(forecasts[x].propPrecip, "%"),
                     humidity: emptyIfUndefined(forecasts[x].humidity, "%"),
                     uvIndex: emptyIfUndefined(forecasts[x].uv),
@@ -181,6 +182,7 @@
                 image: model.image
                 low: model.low
 
+                condition: model.condition
                 chanceOfRain: model.chanceOfRain
                 humidity: model.humidity
                 // TODO: extra from API