diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2018-11-01 10:20:47 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-11-08 13:04:12 +0000 |
| commit | 65a46c51f8b0529008c0bb86e698738c8ca96df3 (patch) | |
| tree | 12dd48acac67fd6778f2c581f7e96f960d89b353 | |
| parent | a62db6e7501b2514aaef630f1683c2b9596cb0cb (diff) | |
Enable usage of LocaleManager.locale
This reverts commit ddb14d59252c451a3ceb6271d9579c902cf6bdd2.
Change-Id: I7a7068ba208be539362387e618972396d46e5b6a
Fixes: QTBUG-70539
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| -rw-r--r-- | src/settingsui/locale/Language.qml | 3 | ||||
| -rw-r--r-- | src/settingsui/locale/RegionSelect.qml | 3 | ||||
| -rw-r--r-- | src/settingsui/timedate/TimeDate.qml | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/settingsui/locale/Language.qml b/src/settingsui/locale/Language.qml index 47a4fdf..23d1b64 100644 --- a/src/settingsui/locale/Language.qml +++ b/src/settingsui/locale/Language.qml @@ -35,8 +35,7 @@ import QtDeviceUtilities.QtButtonImageProvider 1.0 Item { id: root - // QTBUG-63598: property var currentRegion: Qt.locale(LocaleManager.locale) - property var currentRegion: Qt.locale("en_EN") + property var currentRegion: Qt.locale(LocaleManager.locale) Column { spacing: pluginMain.spacing diff --git a/src/settingsui/locale/RegionSelect.qml b/src/settingsui/locale/RegionSelect.qml index 148db0e..fbde92a 100644 --- a/src/settingsui/locale/RegionSelect.qml +++ b/src/settingsui/locale/RegionSelect.qml @@ -35,8 +35,7 @@ import QtGraphicalEffects 1.0 Item { id: root - // QTBUG-63598: property var currentRegion: Qt.locale(LocaleManager.locale) - property var currentRegion: Qt.locale("en_EN") + property var currentRegion: Qt.locale(LocaleManager.locale) Row { id: backRow diff --git a/src/settingsui/timedate/TimeDate.qml b/src/settingsui/timedate/TimeDate.qml index fccda46..8e618c1 100644 --- a/src/settingsui/timedate/TimeDate.qml +++ b/src/settingsui/timedate/TimeDate.qml @@ -63,8 +63,7 @@ Item { triggeredOnStart: true onTriggered: { var date = new Date(); - // QTBUG-63598: dateText.text = date.toLocaleString(Qt.locale(LocaleManager.locale), Locale.LongFormat) - dateText.text = date.toLocaleString(Qt.locale("en_EN"), Locale.LongFormat) + dateText.text = date.toLocaleString(Qt.locale(LocaleManager.locale), Locale.LongFormat) } } } |