diff options
| author | Caroline Chao <caroline.chao@digia.com> | 2014-02-27 11:48:44 +0100 |
|---|---|---|
| committer | Caroline Chao <caroline.chao@digia.com> | 2014-06-15 18:52:57 +0200 |
| commit | 0048ad21af1c775801939da810ffbba19b80e2a2 (patch) | |
| tree | d7f934deff3460cf18fba9ecd7e1d9b48533a984 | |
| parent | 7667db401aecde225c285a23c23b4ba14542f9da (diff) | |
Use locale's measurement system
To choose which precipitation and wind speed units to display.
Change-Id: Ie1fe3dd8f325a9fe253f411addfc9ab3174f4a0c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| -rw-r--r-- | qml/js/utils.js | 11 | ||||
| -rw-r--r-- | qml/pages/LongTermDayItem.qml | 3 | ||||
| -rw-r--r-- | qml/pages/OneDayZoomItem.qml | 6 |
3 files changed, 15 insertions, 5 deletions
diff --git a/qml/js/utils.js b/qml/js/utils.js index cf5948f..8e6eea3 100644 --- a/qml/js/utils.js +++ b/qml/js/utils.js @@ -239,7 +239,8 @@ function getLongDate(date) function getRain(index, dayModel) { - return dayModel.getDayDetails(index, "rain") + var rain_mm = dayModel.getDayDetails(index, "rain") + return isMetricSystem() ? rain_mm : Math.round(3.93701 * rain_mm)/100 // convert to inches } function getTemperature(index, dayModel) @@ -249,7 +250,8 @@ function getTemperature(index, dayModel) function getWindSpeed(index, dayModel) { - return dayModel.getDayDetails(index, "windSpeed") + var speed_ms = dayModel.getDayDetails(index, "windSpeed") + return isMetricSystem() ? speed_ms : Math.round(speed_ms * 223.694)/100 // convert to mph } function getWindUrl(index, dayModel) @@ -267,3 +269,8 @@ function getWeatherUrl(index, dayModel, size) smallUrl = smallUrl return dayModel.getCachedImageFile(smallUrl) } + +function isMetricSystem() +{ + return Qt.locale().measurementSystem === QtQml.Locale.MetricSystem +} diff --git a/qml/pages/LongTermDayItem.qml b/qml/pages/LongTermDayItem.qml index 61a13ac..3317b83 100644 --- a/qml/pages/LongTermDayItem.qml +++ b/qml/pages/LongTermDayItem.qml @@ -122,7 +122,8 @@ ObjectModel { Layout.alignment: Qt.AlignBaseline } TouchLabel { - text: qsTr("m/s") + //: The wind speed unit, meters per second or miles per hour + text: Utils.isMetricSystem() ? qsTr("m/s") : qsTr("mph") pixelSize: 18 Layout.alignment: Qt.AlignBaseline } diff --git a/qml/pages/OneDayZoomItem.qml b/qml/pages/OneDayZoomItem.qml index 53a0efc..3c025ca 100644 --- a/qml/pages/OneDayZoomItem.qml +++ b/qml/pages/OneDayZoomItem.qml @@ -153,7 +153,8 @@ GridLayout { pixelSize: 30 } TouchLabel { - text : qsTr("mm") + //: The rain level unit, millimeters or inches + text: Utils.isMetricSystem() ? qsTr("mm") : qsTr("in") pixelSize: 24 Layout.alignment: Qt.AlignBaseline | Qt.AlignLeft } @@ -167,7 +168,8 @@ GridLayout { pixelSize: 30 } TouchLabel { - text : qsTr("m/s") + //: The wind speed unit, meters per second or miles per hour + text: Utils.isMetricSystem() ? qsTr("m/s") : qsTr("mph") pixelSize: 24 Layout.alignment: Qt.AlignLeft | Qt.AlignBaseline } |