Merge lp:~vthompson/ubuntu-weather-app/fix-1521701 into lp:ubuntu-weather-app

[Victor Thompson]

* Change translatable string from "rain" to "precipitation"

* Change translatable string from "rain" to "precipitation"

This change still needs Design approval.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:188
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/28/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/249/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/28/rebuild

review: Approve (continuous-integration)

[Bartosz Kosiorek (gang65)]

It looks perfectly fine for me.

review: Approve

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/weather-app-autolanding/10/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/1382/console

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

I'll resolve the merge conflicts--but don't we want to wait for design approval? I'm not sure they approve yet.

[lp:~vthompson/ubuntu-weather-app/fix-1521701]

189. By Victor Thompson on 2015-12-23

Merge of trunk and resolve conflict.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:189
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/31/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/271/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/31/rebuild

review: Approve (continuous-integration)

=== modified file 'app/components/DayDelegateExtraInfo.qml'
--- app/components/DayDelegateExtraInfo.qml	2015-11-02 21:28:34 +0000
+++ app/components/DayDelegateExtraInfo.qml	2015-12-23 00:45:15 +0000
@@ -48,10 +48,10 @@
     }
 
     ForecastDetailsDelegate {
-        id: chanceOfRainForecast
-        forecast: i18n.tr("Chance of rain")
+        id: chanceOfPrecipForecast
+        forecast: i18n.tr("Chance of precipitation")
         imageSource: "../graphics/extended-information_chance-of-rain.svg"
-        value: modelData.chanceOfRain
+        value: modelData.chanceOfPrecip
     }
 
     ForecastDetailsDelegate {
 
=== modified file 'app/components/ForecastDetailsDelegate.qml'
--- app/components/ForecastDetailsDelegate.qml	2015-11-02 21:28:34 +0000
+++ app/components/ForecastDetailsDelegate.qml	2015-12-23 00:45:15 +0000
@@ -20,7 +20,7 @@
 import Ubuntu.Components 1.3
 
 Row {
-    height: icon.height
+    height: forecastLabel.height
     spacing: units.gu(2)
     visible: value !== ""
 
@@ -39,6 +39,7 @@
     Label {
         id: forecastLabel
         elide: Text.ElideRight
+        wrapMode: Text.WordWrap
         width: units.gu(16)
     }
     
 
=== modified file 'app/ui/LocationPane.qml'
--- app/ui/LocationPane.qml	2015-11-02 21:28:34 +0000
+++ app/ui/LocationPane.qml	2015-12-23 00:45:15 +0000
@@ -153,7 +153,7 @@
             high: (data[tempUnits].tempMax !== undefined) ? Math.round(data[tempUnits].tempMax).toString() + settings.tempScale : "",
             image: (data.icon !== undefined && iconMap[data.icon] !== undefined) ? iconMap[data.icon] : "",
             condition: emptyIfUndefined(data.condition),
-            chanceOfRain: emptyIfUndefined(data.propPrecip, "%"),
+            chanceOfPrecip: emptyIfUndefined(data.propPrecip, "%"),
             humidity: emptyIfUndefined(data.humidity, "%"),
             sunrise: data.sunrise || sunrise.toLocaleTimeString(Qt.locale().name, options),
             sunset: data.sunset || sunset.toLocaleTimeString(Qt.locale().name, options),
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-12-17 02:29:07 +0000
+++ debian/changelog	2015-12-23 00:45:15 +0000
@@ -6,6 +6,9 @@
   [ Girish Rawat ]
   * Added new READMEs
 
+  [ Victor Thompson ]
+  * Change translatable string from "rain" to "precipitation" (LP:1521701)
+
  -- Andrew Hayzen <[e-mail]>  Thu, 03 Dec 2015 15:20:49 +0000
 
 ubuntu-weather-app (3.1ubuntu1) vivid; urgency=medium
 
=== modified file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot	2015-11-26 02:05:13 +0000
+++ po/com.ubuntu.weather.pot	2015-12-23 00:45:15 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-weather-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-26 02:04+0000\n"
+"POT-Creation-Date: 2015-12-11 21:39-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -19,7 +19,7 @@
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: ../app/components/DayDelegateExtraInfo.qml:52
-msgid "Chance of rain"
+msgid "Chance of precipitation"
 msgstr ""
 
 #: ../app/components/DayDelegateExtraInfo.qml:59