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

Proposed by Victor Thompson on 2015-12-12
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 πŸ¦„ on 2016-01-28
Approved revision: 189
Merged at revision: 201
Proposed branch: lp:~vthompson/ubuntu-weather-app/fix-1521701
Merge into: lp:ubuntu-weather-app
Diff against target: 87 lines (+11/-7)
5 files modified
app/components/DayDelegateExtraInfo.qml (+3/-3)
app/components/ForecastDetailsDelegate.qml (+2/-1)
app/ui/LocationPane.qml (+1/-1)
debian/changelog (+3/-0)
po/com.ubuntu.weather.pot (+2/-2)
To merge this branch: bzr merge lp:~vthompson/ubuntu-weather-app/fix-1521701
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve on 2015-12-23
Bartosz Kosiorek (community) 2015-12-12 Approve on 2015-12-22
Review via email: mp+280379@code.launchpad.net

Commit message

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

Description of the change

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

This change still needs Design approval.

To post a comment you must log in.
review: Approve (continuous-integration)
Bartosz Kosiorek (gang65) wrote :

It looks perfectly fine for me.

review: Approve

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) wrote :

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

189. By Victor Thompson on 2015-12-23

Merge of trunk and resolve conflict.

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/components/DayDelegateExtraInfo.qml'
2--- app/components/DayDelegateExtraInfo.qml 2015-11-02 21:28:34 +0000
3+++ app/components/DayDelegateExtraInfo.qml 2015-12-23 00:45:15 +0000
4@@ -48,10 +48,10 @@
5 }
6
7 ForecastDetailsDelegate {
8- id: chanceOfRainForecast
9- forecast: i18n.tr("Chance of rain")
10+ id: chanceOfPrecipForecast
11+ forecast: i18n.tr("Chance of precipitation")
12 imageSource: "../graphics/extended-information_chance-of-rain.svg"
13- value: modelData.chanceOfRain
14+ value: modelData.chanceOfPrecip
15 }
16
17 ForecastDetailsDelegate {
18
19=== modified file 'app/components/ForecastDetailsDelegate.qml'
20--- app/components/ForecastDetailsDelegate.qml 2015-11-02 21:28:34 +0000
21+++ app/components/ForecastDetailsDelegate.qml 2015-12-23 00:45:15 +0000
22@@ -20,7 +20,7 @@
23 import Ubuntu.Components 1.3
24
25 Row {
26- height: icon.height
27+ height: forecastLabel.height
28 spacing: units.gu(2)
29 visible: value !== ""
30
31@@ -39,6 +39,7 @@
32 Label {
33 id: forecastLabel
34 elide: Text.ElideRight
35+ wrapMode: Text.WordWrap
36 width: units.gu(16)
37 }
38
39
40=== modified file 'app/ui/LocationPane.qml'
41--- app/ui/LocationPane.qml 2015-11-02 21:28:34 +0000
42+++ app/ui/LocationPane.qml 2015-12-23 00:45:15 +0000
43@@ -153,7 +153,7 @@
44 high: (data[tempUnits].tempMax !== undefined) ? Math.round(data[tempUnits].tempMax).toString() + settings.tempScale : "",
45 image: (data.icon !== undefined && iconMap[data.icon] !== undefined) ? iconMap[data.icon] : "",
46 condition: emptyIfUndefined(data.condition),
47- chanceOfRain: emptyIfUndefined(data.propPrecip, "%"),
48+ chanceOfPrecip: emptyIfUndefined(data.propPrecip, "%"),
49 humidity: emptyIfUndefined(data.humidity, "%"),
50 sunrise: data.sunrise || sunrise.toLocaleTimeString(Qt.locale().name, options),
51 sunset: data.sunset || sunset.toLocaleTimeString(Qt.locale().name, options),
52
53=== modified file 'debian/changelog'
54--- debian/changelog 2015-12-17 02:29:07 +0000
55+++ debian/changelog 2015-12-23 00:45:15 +0000
56@@ -6,6 +6,9 @@
57 [ Girish Rawat ]
58 * Added new READMEs
59
60+ [ Victor Thompson ]
61+ * Change translatable string from "rain" to "precipitation" (LP:1521701)
62+
63 -- Andrew Hayzen <ahayzen@gmail.com> Thu, 03 Dec 2015 15:20:49 +0000
64
65 ubuntu-weather-app (3.1ubuntu1) vivid; urgency=medium
66
67=== modified file 'po/com.ubuntu.weather.pot'
68--- po/com.ubuntu.weather.pot 2015-11-26 02:05:13 +0000
69+++ po/com.ubuntu.weather.pot 2015-12-23 00:45:15 +0000
70@@ -8,7 +8,7 @@
71 msgstr ""
72 "Project-Id-Version: ubuntu-weather-app\n"
73 "Report-Msgid-Bugs-To: \n"
74-"POT-Creation-Date: 2015-11-26 02:04+0000\n"
75+"POT-Creation-Date: 2015-12-11 21:39-0600\n"
76 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
77 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
78 "Language-Team: LANGUAGE <LL@li.org>\n"
79@@ -19,7 +19,7 @@
80 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
81
82 #: ../app/components/DayDelegateExtraInfo.qml:52
83-msgid "Chance of rain"
84+msgid "Chance of precipitation"
85 msgstr ""
86
87 #: ../app/components/DayDelegateExtraInfo.qml:59

Subscribers

People subscribed via source and target branches

to all changes: