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

[Victor Thompson]

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

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.

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

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

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

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

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

review: Approve

=== modified file 'app/ui/settings/UnitsPage.qml'
--- app/ui/settings/UnitsPage.qml	2015-06-21 14:54:05 +0000
+++ app/ui/settings/UnitsPage.qml	2015-06-29 00:23:21 +0000
@@ -48,22 +48,6 @@
         }
 
         ListModel {
-            id: precipationModel
-            Component.onCompleted: initialize()
-            function initialize() {
-                // TRANSLATORS: The strings are standard measurement units
-                // of precipitation in millimeters and are shown in the settings page.
-                // Only the abbreviated form of millimeters should be used.
-                precipationModel.append({"text": i18n.tr("mm"), "value": "mm"})
-
-                // TRANSLATORS: The strings are standard measurement units
-                // of precipitation in inches and are shown in the settings page.
-                // Only the abbreviated form of inches should be used.
-                precipationModel.append({"text": i18n.tr("in"), "value": "in"})
-            }
-        }
-
-        ListModel {
             id: windSpeedModel
             Component.onCompleted: initialize()
             function initialize() {
@@ -104,26 +88,6 @@
             }
 
             ExpandableListItem {
-                id: precipationSetting
-
-                listViewHeight: precipationModel.count*units.gu(7) - units.gu(1)
-                model: precipationModel
-                text: i18n.tr("Precipitation")
-                subText: settings.precipUnits === "mm" ? i18n.tr("mm")
-                                                       : i18n.tr("in")
-
-                delegate: StandardListItem {
-                    title: model.text
-                    icon: "ok"
-                    showIcon: settings.precipUnits === model.value
-                    onClicked: {
-                        settings.precipUnits = model.value
-                        refreshData(true)
-                    }
-                }
-            }
-
-            ExpandableListItem {
                 id: windSetting
 
                 listViewHeight: windSpeedModel.count*units.gu(7) - units.gu(1)
 
=== modified file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot	2015-06-21 20:14:39 +0000
+++ po/com.ubuntu.weather.pot	2015-06-29 00:23:21 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-weather-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-21 20:10+0000\n"
+"POT-Creation-Date: 2015-06-28 19:17-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -66,11 +66,11 @@
 msgid "Cancel selection"
 msgstr ""
 
-#: ../app/ubuntu-weather-app.qml:167
+#: ../app/ubuntu-weather-app.qml:168
 msgid "Searching for current location..."
 msgstr ""
 
-#: ../app/ubuntu-weather-app.qml:176
+#: ../app/ubuntu-weather-app.qml:177
 msgid "Add a manual location"
 msgstr ""
 
@@ -152,54 +152,36 @@
 #. TRANSLATORS: The strings are standard measurement units
 #. of temperature in Celcius and are shown in the settings page.
 #. Only the abbreviated form of Celcius should be used.
-#: ../app/ui/settings/UnitsPage.qml:41 ../app/ui/settings/UnitsPage.qml:92
+#: ../app/ui/settings/UnitsPage.qml:41 ../app/ui/settings/UnitsPage.qml:76
 msgid "°C"
 msgstr ""
 
 #. TRANSLATORS: The strings are standard measurement units
 #. of temperature in Fahrenheit and are shown in the settings page.
 #. Only the abbreviated form of Fahrenheit should be used.
-#: ../app/ui/settings/UnitsPage.qml:46 ../app/ui/settings/UnitsPage.qml:93
+#: ../app/ui/settings/UnitsPage.qml:46 ../app/ui/settings/UnitsPage.qml:77
 msgid "°F"
 msgstr ""
 
 #. TRANSLATORS: The strings are standard measurement units
-#. of precipitation in millimeters and are shown in the settings page.
-#. Only the abbreviated form of millimeters should be used.
-#: ../app/ui/settings/UnitsPage.qml:57 ../app/ui/settings/UnitsPage.qml:112
-msgid "mm"
-msgstr ""
-
-#. TRANSLATORS: The strings are standard measurement units
-#. of precipitation in inches and are shown in the settings page.
-#. Only the abbreviated form of inches should be used.
-#: ../app/ui/settings/UnitsPage.qml:62 ../app/ui/settings/UnitsPage.qml:113
-msgid "in"
-msgstr ""
-
-#. TRANSLATORS: The strings are standard measurement units
 #. of wind speed in kilometers per hour and are shown in the settings page.
 #. Only the abbreviated form of kilometers per hour should be used.
-#: ../app/ui/settings/UnitsPage.qml:73 ../app/ui/settings/UnitsPage.qml:132
+#: ../app/ui/settings/UnitsPage.qml:57 ../app/ui/settings/UnitsPage.qml:96
 msgid "kph"
 msgstr ""
 
 #. TRANSLATORS: The strings are standard measurement units
 #. of wind speed in miles per hour and are shown in the settings page.
 #. Only the abbreviated form of miles per hour should be used.
-#: ../app/ui/settings/UnitsPage.qml:78 ../app/ui/settings/UnitsPage.qml:133
+#: ../app/ui/settings/UnitsPage.qml:62 ../app/ui/settings/UnitsPage.qml:97
 msgid "mph"
 msgstr ""
 
-#: ../app/ui/settings/UnitsPage.qml:91
+#: ../app/ui/settings/UnitsPage.qml:75
 msgid "Temperature"
 msgstr ""
 
-#: ../app/ui/settings/UnitsPage.qml:111
-msgid "Precipitation"
-msgstr ""
-
-#: ../app/ui/settings/UnitsPage.qml:131
+#: ../app/ui/settings/UnitsPage.qml:95
 msgid "Wind Speed"
 msgstr ""