Merge lp:~vthompson/ubuntu-weather-app/reboot-kph into lp:ubuntu-weather-app

[Victor Thompson]

Use kph for kilometers per hour.

Use kph for kilometers per hour. The spec also lists this as "Kph", which is correct. In the app that is currently in the store the user never sees this abbreviation, however, so this is only an issue with the reboot series.

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

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

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

review: Approve (continuous-integration)

[Martin Borho (martin-borho)]

LGTM, thanks!

review: Approve

=== modified file 'app/data/WeatherApi.js'
--- app/data/WeatherApi.js	2015-04-06 10:29:13 +0000
+++ app/data/WeatherApi.js	2015-04-27 00:59:36 +0000
@@ -44,12 +44,12 @@
     return mm/25.4;
 }
 //
-function calcKmh(ms) {
+function calcKph(ms) {
     return ms*3.6;
 }
 //
-function convertKmhToMph(kmh) {
-    return kmh*0.621;
+function convertKphToMph(kph) {
+    return kph*0.621;
 }
 //
 function calcWindDir(degrees) {
@@ -218,7 +218,7 @@
             date: date,
             metric: {
                 temp:data.main.temp,
-                windSpeed: calcKmh(data.wind.speed),
+                windSpeed: calcKph(data.wind.speed),
                 rain: data.main.rain || ((data.rain) ? data.rain["3h"] : false ) || 0,
                 snow: data.main.snow || ((data.snow) ? data.snow["3h"] : false ) || 0
             },
@@ -249,7 +249,7 @@
             metric: {
                 tempMin: data.temp.min,
                 tempMax: data.temp.max,
-                windSpeed: calcKmh(data.speed),
+                windSpeed: calcKph(data.speed),
                 rain: data.rain || 0,
                 snow: data.snow || 0
             },
@@ -450,7 +450,7 @@
                 imperial: {
                     temp: calcFahrenheit(data.temp),
                     tempFeels: calcFahrenheit(data.feelsLike),
-                    windSpeed: convertKmhToMph(data.wSpeed)
+                    windSpeed: convertKphToMph(data.wSpeed)
                 },
                 precipType: (data.precip_type !== undefined) ? data.precip_type : null,
                 propPrecip: (data.pop !== undefined) ? data.pop : null,
@@ -481,7 +481,7 @@
             imperial: {
                 tempMin: calcFahrenheit(data.minTemp),
                 tempMax: calcFahrenheit(data.maxTemp !== undefined ? data.maxTemp : data.minTemp),
-                windSpeed: convertKmhToMph(partData.wSpeed)
+                windSpeed: convertKphToMph(partData.wSpeed)
             },
             precipType: partData.precip_type,
             propPrecip: partData.pop,
 
=== modified file 'app/ubuntu-weather-app.qml'
--- app/ubuntu-weather-app.qml	2015-03-16 13:43:00 +0000
+++ app/ubuntu-weather-app.qml	2015-04-27 00:59:36 +0000
@@ -141,7 +141,7 @@
                 service = "weatherchannel"
                 tempScale = "°" + (metric ? "C" : "F")
                 units = metric ? "metric" : "imperial"
-                windUnits = metric ? "kmh" : "mph"
+                windUnits = metric ? "kph" : "mph"
             }
         }
     }
 
=== modified file 'app/ui/settings/UnitsPage.qml'
--- app/ui/settings/UnitsPage.qml	2015-04-05 22:31:13 +0000
+++ app/ui/settings/UnitsPage.qml	2015-04-27 00:59:36 +0000
@@ -70,7 +70,7 @@
                 // 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.
-                windSpeedModel.append({"text": i18n.tr("kmh"), "value": "kmh"})
+                windSpeedModel.append({"text": i18n.tr("kph"), "value": "kph"})
 
                 // TRANSLATORS: The strings are standard measurement units
                 // of wind speed in miles per hour and are shown in the settings page.
@@ -145,7 +145,7 @@
                 listViewHeight: windSpeedModel.count*units.gu(6) - units.gu(0.5)
                 model: windSpeedModel
                 text: i18n.tr("Wind Speed")
-                subText: settings.windUnits === "kmh" ? i18n.tr("kmh")
+                subText: settings.windUnits === "kph" ? i18n.tr("kph")
                                                       : i18n.tr("mph")
 
                 delegate: ListItem.Standard {
 
=== modified file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot	2015-04-19 21:10:44 +0000
+++ po/com.ubuntu.weather.pot	2015-04-27 00:59:36 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-weather-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-19 16:08-0500\n"
+"POT-Creation-Date: 2015-04-26 19:55-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"
@@ -141,7 +141,7 @@
 #. 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:148
-msgid "kmh"
+msgid "kph"
 msgstr ""
 
 #. TRANSLATORS: The strings are standard measurement units