diff options
| author | Caroline Chao <caroline.chao@digia.com> | 2014-02-21 13:21:51 +0100 |
|---|---|---|
| committer | Caroline Chao <caroline.chao@digia.com> | 2014-02-21 16:00:50 +0100 |
| commit | a75f58958af4c3440fafe645f08fdc1b115ab58c (patch) | |
| tree | 5d63e136ed4d71f420f2d626e25dc43f9ebcbef7 | |
| parent | d3bf63bbf817a72c88f87c6cdbad7ef02b961a1e (diff) | |
Update translation flags (qsTr)
Use same temperature formating everywhere.
Change-Id: I80b7004a5011634bee4d11a47116f24ccb317723
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| -rw-r--r-- | qml/js/utils.js | 2 | ||||
| -rw-r--r-- | qml/main.qml | 2 | ||||
| -rw-r--r-- | qml/pages/CitiesPage.qml | 2 | ||||
| -rw-r--r-- | qml/pages/OneDayZoomItem.qml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/qml/js/utils.js b/qml/js/utils.js index ec7d906..b419f0e 100644 --- a/qml/js/utils.js +++ b/qml/js/utils.js @@ -76,7 +76,7 @@ function getMaxTemp(dayModel) function getTempFormat(temp) { - return temp + "°C" + return temp + qsTr("°C") } function isNegative(val) diff --git a/qml/main.qml b/qml/main.qml index 40820b9..33b8245 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -47,7 +47,7 @@ ApplicationWindow { id: root height: 700 width: 1200 - title: qsTr("Quick Forecast") + title: "Quick Forecast" property string statusBarMessage diff --git a/qml/pages/CitiesPage.qml b/qml/pages/CitiesPage.qml index c32fca2..4ded77d 100644 --- a/qml/pages/CitiesPage.qml +++ b/qml/pages/CitiesPage.qml @@ -95,7 +95,7 @@ BasicPage { z: 1 anchors.centerIn: parent visible: listview.count === 0 - text: "No Cities" + text: qsTr("No Cities") color: ApplicationInfo.colors.lightGray } } diff --git a/qml/pages/OneDayZoomItem.qml b/qml/pages/OneDayZoomItem.qml index 204481e..96da59a 100644 --- a/qml/pages/OneDayZoomItem.qml +++ b/qml/pages/OneDayZoomItem.qml @@ -120,7 +120,7 @@ GridLayout { TouchLabel { Layout.preferredWidth: expectedTextWidth(Utils.getMaxTempLenght(ApplicationInfo.currentCityModel)) property int temp: Utils.getTemperature(root.slider.value, root.model) - text : temp + qsTr("°C") + text : Utils.getTempFormat(temp) color: temp < 0 ? ApplicationInfo.colors.blue : ApplicationInfo.colors.doubleDarkGray pixelSize: 72 letterSpacing: -0.5 |