Merge lp:~vthompson/ubuntu-weather-app/reboot-remove-precip-from-settings into lp:ubuntu-weather-app

Proposed by Victor Thompson on 2015-06-29
Status: Merged
Approved by: Nekhelesh Ramananthan on 2015-06-29
Approved revision: 58
Merged at revision: 60
Proposed branch: lp:~vthompson/ubuntu-weather-app/reboot-remove-precip-from-settings
Merge into: lp:ubuntu-weather-app
Diff against target: 140 lines (+9/-63)
2 files modified
app/ui/settings/UnitsPage.qml (+0/-36)
po/com.ubuntu.weather.pot (+9/-27)
To merge this branch: bzr merge lp:~vthompson/ubuntu-weather-app/reboot-remove-precip-from-settings
Reviewer Review Type Date Requested Status
Nekhelesh Ramananthan (community) 2015-06-29 Approve on 2015-06-29
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-06-29
Review via email: mp+263210@code.launchpad.net

Commit message

Remove precip settings from the Settings Page because it is not part of the data shown to the user

Description of the change

Remove precip settings from the Settings Page because it is not part of the data shown to the user. None of the design specs show the total amount of rain being displayed. I suggest we leave the setting in the app's storage for now, just in case we want to introduce it later.

To post a comment you must log in.
Nekhelesh Ramananthan (nik90) wrote :

It seems to have been overlooked by design. But considering we could easily re-add the functionality anytime if required I approve.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/ui/settings/UnitsPage.qml'
2--- app/ui/settings/UnitsPage.qml 2015-06-21 14:54:05 +0000
3+++ app/ui/settings/UnitsPage.qml 2015-06-29 00:23:21 +0000
4@@ -48,22 +48,6 @@
5 }
6
7 ListModel {
8- id: precipationModel
9- Component.onCompleted: initialize()
10- function initialize() {
11- // TRANSLATORS: The strings are standard measurement units
12- // of precipitation in millimeters and are shown in the settings page.
13- // Only the abbreviated form of millimeters should be used.
14- precipationModel.append({"text": i18n.tr("mm"), "value": "mm"})
15-
16- // TRANSLATORS: The strings are standard measurement units
17- // of precipitation in inches and are shown in the settings page.
18- // Only the abbreviated form of inches should be used.
19- precipationModel.append({"text": i18n.tr("in"), "value": "in"})
20- }
21- }
22-
23- ListModel {
24 id: windSpeedModel
25 Component.onCompleted: initialize()
26 function initialize() {
27@@ -104,26 +88,6 @@
28 }
29
30 ExpandableListItem {
31- id: precipationSetting
32-
33- listViewHeight: precipationModel.count*units.gu(7) - units.gu(1)
34- model: precipationModel
35- text: i18n.tr("Precipitation")
36- subText: settings.precipUnits === "mm" ? i18n.tr("mm")
37- : i18n.tr("in")
38-
39- delegate: StandardListItem {
40- title: model.text
41- icon: "ok"
42- showIcon: settings.precipUnits === model.value
43- onClicked: {
44- settings.precipUnits = model.value
45- refreshData(true)
46- }
47- }
48- }
49-
50- ExpandableListItem {
51 id: windSetting
52
53 listViewHeight: windSpeedModel.count*units.gu(7) - units.gu(1)
54
55=== modified file 'po/com.ubuntu.weather.pot'
56--- po/com.ubuntu.weather.pot 2015-06-21 20:14:39 +0000
57+++ po/com.ubuntu.weather.pot 2015-06-29 00:23:21 +0000
58@@ -8,7 +8,7 @@
59 msgstr ""
60 "Project-Id-Version: ubuntu-weather-app\n"
61 "Report-Msgid-Bugs-To: \n"
62-"POT-Creation-Date: 2015-06-21 20:10+0000\n"
63+"POT-Creation-Date: 2015-06-28 19:17-0500\n"
64 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
65 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
66 "Language-Team: LANGUAGE <LL@li.org>\n"
67@@ -66,11 +66,11 @@
68 msgid "Cancel selection"
69 msgstr ""
70
71-#: ../app/ubuntu-weather-app.qml:167
72+#: ../app/ubuntu-weather-app.qml:168
73 msgid "Searching for current location..."
74 msgstr ""
75
76-#: ../app/ubuntu-weather-app.qml:176
77+#: ../app/ubuntu-weather-app.qml:177
78 msgid "Add a manual location"
79 msgstr ""
80
81@@ -152,54 +152,36 @@
82 #. TRANSLATORS: The strings are standard measurement units
83 #. of temperature in Celcius and are shown in the settings page.
84 #. Only the abbreviated form of Celcius should be used.
85-#: ../app/ui/settings/UnitsPage.qml:41 ../app/ui/settings/UnitsPage.qml:92
86+#: ../app/ui/settings/UnitsPage.qml:41 ../app/ui/settings/UnitsPage.qml:76
87 msgid "°C"
88 msgstr ""
89
90 #. TRANSLATORS: The strings are standard measurement units
91 #. of temperature in Fahrenheit and are shown in the settings page.
92 #. Only the abbreviated form of Fahrenheit should be used.
93-#: ../app/ui/settings/UnitsPage.qml:46 ../app/ui/settings/UnitsPage.qml:93
94+#: ../app/ui/settings/UnitsPage.qml:46 ../app/ui/settings/UnitsPage.qml:77
95 msgid "°F"
96 msgstr ""
97
98 #. TRANSLATORS: The strings are standard measurement units
99-#. of precipitation in millimeters and are shown in the settings page.
100-#. Only the abbreviated form of millimeters should be used.
101-#: ../app/ui/settings/UnitsPage.qml:57 ../app/ui/settings/UnitsPage.qml:112
102-msgid "mm"
103-msgstr ""
104-
105-#. TRANSLATORS: The strings are standard measurement units
106-#. of precipitation in inches and are shown in the settings page.
107-#. Only the abbreviated form of inches should be used.
108-#: ../app/ui/settings/UnitsPage.qml:62 ../app/ui/settings/UnitsPage.qml:113
109-msgid "in"
110-msgstr ""
111-
112-#. TRANSLATORS: The strings are standard measurement units
113 #. of wind speed in kilometers per hour and are shown in the settings page.
114 #. Only the abbreviated form of kilometers per hour should be used.
115-#: ../app/ui/settings/UnitsPage.qml:73 ../app/ui/settings/UnitsPage.qml:132
116+#: ../app/ui/settings/UnitsPage.qml:57 ../app/ui/settings/UnitsPage.qml:96
117 msgid "kph"
118 msgstr ""
119
120 #. TRANSLATORS: The strings are standard measurement units
121 #. of wind speed in miles per hour and are shown in the settings page.
122 #. Only the abbreviated form of miles per hour should be used.
123-#: ../app/ui/settings/UnitsPage.qml:78 ../app/ui/settings/UnitsPage.qml:133
124+#: ../app/ui/settings/UnitsPage.qml:62 ../app/ui/settings/UnitsPage.qml:97
125 msgid "mph"
126 msgstr ""
127
128-#: ../app/ui/settings/UnitsPage.qml:91
129+#: ../app/ui/settings/UnitsPage.qml:75
130 msgid "Temperature"
131 msgstr ""
132
133-#: ../app/ui/settings/UnitsPage.qml:111
134-msgid "Precipitation"
135-msgstr ""
136-
137-#: ../app/ui/settings/UnitsPage.qml:131
138+#: ../app/ui/settings/UnitsPage.qml:95
139 msgid "Wind Speed"
140 msgstr ""
141

Subscribers

People subscribed via source and target branches

to all changes: