diff options
| author | Jan Arve Saether <jan-arve.saether@digia.com> | 2014-10-16 15:54:26 +0200 |
|---|---|---|
| committer | Jan Arve Sæther <jan-arve.saether@theqtcompany.com> | 2014-10-17 15:21:08 +0200 |
| commit | f9cf0cc41c5e2cdc5802d35b63af8327acb26e74 (patch) | |
| tree | a5addbc309df3bbc2d72c6357ea1df12f78d0230 | |
| parent | 4ceabd6c5d52665791dc95f88641229035590ac7 (diff) | |
Un-abbreviate m/s, mph, mm and in for accessibility
There is currently only one translation (german)
Change-Id: I76abb04d842b91726d3052a94d8b81dbac1b10e8
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| -rw-r--r-- | qml/js/utils.js | 13 | ||||
| -rw-r--r-- | qml/pages/LongTermDayItem.qml | 2 | ||||
| -rw-r--r-- | qml/pages/OneDayZoomItem.qml | 2 | ||||
| -rw-r--r-- | translations/QuickForecast_de.ts | 16 |
4 files changed, 32 insertions, 1 deletions
diff --git a/qml/js/utils.js b/qml/js/utils.js index 8e6eea3..9333062 100644 --- a/qml/js/utils.js +++ b/qml/js/utils.js @@ -274,3 +274,16 @@ function isMetricSystem() { return Qt.locale().measurementSystem === QtQml.Locale.MetricSystem } + +function expandAbbreviation(abbrevCode) +{ + switch (abbrevCode) + { + case "m/s": + return isMetricSystem() ? qsTr("meters per second") : qsTr("miles per hour") + case "mm": + return isMetricSystem() ? qsTr("millimeters") : qsTr("inches") + } + + return "UNKNOWN" +} diff --git a/qml/pages/LongTermDayItem.qml b/qml/pages/LongTermDayItem.qml index 95995fd..3ea8932 100644 --- a/qml/pages/LongTermDayItem.qml +++ b/qml/pages/LongTermDayItem.qml @@ -63,7 +63,7 @@ ObjectModel { z: -1 x: -ApplicationInfo.hMargin Accessible.role: Accessible.Button - Accessible.name: qsTr("%1 %2 - temperature low: %3, high: %4, wind: %5 %6").arg(Utils.getDay(0, dayModel)).arg(Utils.getShortDate(dayModel.date)).arg(lowTemp.text).arg(highTemp.text).arg(windSpeed.text).arg(windSpeedUnit.text) + Accessible.name: qsTr("%1 %2 - temperature low: %3, high: %4, wind: %5 %6").arg(Utils.getDay(0, dayModel)).arg(Utils.getShortDate(dayModel.date)).arg(lowTemp.text).arg(highTemp.text).arg(windSpeed.text).arg(Utils.expandAbbreviation("m/s")) Accessible.description: qsTr("press for details") function accessiblePressAction () { ApplicationInfo.currentIndexDay = index diff --git a/qml/pages/OneDayZoomItem.qml b/qml/pages/OneDayZoomItem.qml index e34873e..0a03725 100644 --- a/qml/pages/OneDayZoomItem.qml +++ b/qml/pages/OneDayZoomItem.qml @@ -163,6 +163,7 @@ GridLayout { //: The rain level unit, millimeters or inches id: rainUnit text: Utils.isMetricSystem() ? qsTr("mm") : qsTr("in") + Accessible.name: Utils.expandAbbreviation("mm") pixelSize: 24 Layout.alignment: Qt.AlignBaseline | Qt.AlignLeft Accessible.ignored: true @@ -181,6 +182,7 @@ GridLayout { //: The wind speed unit, meters per second or miles per hour id: windUnit text: Utils.isMetricSystem() ? qsTr("m/s") : qsTr("mph") + Accessible.name: Utils.expandAbbreviation("m/s") pixelSize: 24 Layout.alignment: Qt.AlignLeft | Qt.AlignBaseline Accessible.ignored: true diff --git a/translations/QuickForecast_de.ts b/translations/QuickForecast_de.ts index 5805c67..61a113d 100644 --- a/translations/QuickForecast_de.ts +++ b/translations/QuickForecast_de.ts @@ -132,5 +132,21 @@ <source>°C</source> <translation>°C</translation> </message> + <message> + <source>meters per second</source> + <translation>Meter pro Sekunde</translation> + </message> + <message> + <source>miles per hour</source> + <translation>Meilen pro Stunde</translation> + </message> + <message> + <source>millimeters</source> + <translation>Millimeter</translation> + </message> + <message> + <source>inches</source> + <translation>Inch</translation> + </message> </context> </TS> |