diff --git a/Modules/Bar/Widgets/Clock.qml b/Modules/Bar/Widgets/Clock.qml index ae179ebe..14e1f4df 100644 --- a/Modules/Bar/Widgets/Clock.qml +++ b/Modules/Bar/Widgets/Clock.qml @@ -61,7 +61,7 @@ Rectangle { spacing: Settings.data.bar.showCapsule ? -4 * scaling : -2 * scaling Repeater { id: repeater - model: Qt.formatDateTime(now, formatHorizontal.trim()).split("\\n") + model: Qt.locale().toString(now, formatHorizontal.trim()).split("\\n") NText { visible: text !== "" text: modelData @@ -91,7 +91,7 @@ Rectangle { anchors.centerIn: parent spacing: -2 * scaling Repeater { - model: Qt.formatDateTime(now, formatVertical.trim()).split(" ") + model: Qt.locale().toString(now, formatVertical.trim()).split(" ") delegate: NText { visible: text !== "" text: modelData diff --git a/Modules/ControlCenter/Cards/WeatherCard.qml b/Modules/ControlCenter/Cards/WeatherCard.qml index 160c48cc..a5cf8f45 100644 --- a/Modules/ControlCenter/Cards/WeatherCard.qml +++ b/Modules/ControlCenter/Cards/WeatherCard.qml @@ -88,7 +88,7 @@ NBox { NText { text: { var weatherDate = new Date(LocationService.data.weather.daily.time[index].replace(/-/g, "/")) - return Qt.formatDateTime(weatherDate, "ddd") + return Qt.locale().toString(weatherDate, "ddd") } color: Color.mOnSurface Layout.alignment: Qt.AlignHCenter diff --git a/Modules/LockScreen/LockScreen.qml b/Modules/LockScreen/LockScreen.qml index be75508c..bdb5f4f4 100644 --- a/Modules/LockScreen/LockScreen.qml +++ b/Modules/LockScreen/LockScreen.qml @@ -27,12 +27,12 @@ Loader { } function formatTime() { - return Settings.data.location.use12hourFormat ? Qt.formatDateTime(new Date(), "h:mm A") : Qt.formatDateTime(new Date(), "HH:mm") + return Settings.data.location.use12hourFormat ? Qt.locale().toString(new Date(), "h:mm A") : Qt.locale().toString(new Date(), "HH:mm") } function formatDate() { // For full text date, day is always before month, so we use this format for everybody: Wednesday, September 17. - return Qt.formatDateTime(new Date(), "dddd, MMMM d") + return Qt.locale().toString(new Date(), "dddd, MMMM d") } function scheduleUnloadAfterUnlock() { diff --git a/Modules/Settings/Bar/WidgetSettings/ClockSettings.qml b/Modules/Settings/Bar/WidgetSettings/ClockSettings.qml index 6214590a..af48201a 100644 --- a/Modules/Settings/Bar/WidgetSettings/ClockSettings.qml +++ b/Modules/Settings/Bar/WidgetSettings/ClockSettings.qml @@ -182,7 +182,7 @@ ColumnLayout { // Horizontal Repeater { Layout.topMargin: Style.marginM * scaling - model: Qt.formatDateTime(now, valueFormatHorizontal.trim()).split("\\n") + model: Qt.locale().toString(now, valueFormatHorizontal.trim()).split("\\n") delegate: NText { visible: text !== "" text: modelData @@ -213,7 +213,7 @@ ColumnLayout { Repeater { Layout.topMargin: Style.marginM * scaling - model: Qt.formatDateTime(now, valueFormatVertical.trim()).split(" ") + model: Qt.locale().toString(now, valueFormatVertical.trim()).split(" ") delegate: NText { visible: text !== "" text: modelData diff --git a/Widgets/NDateTimeTokens.qml b/Widgets/NDateTimeTokens.qml index 523e74f0..eae75d7b 100644 --- a/Widgets/NDateTimeTokens.qml +++ b/Widgets/NDateTimeTokens.qml @@ -312,7 +312,7 @@ Rectangle { NText { anchors.centerIn: parent - text: Qt.formatDateTime(root.sampleDate, modelData.token) + text: Qt.locale().toString(root.sampleDate, modelData.token) color: tokenMouseArea.containsMouse ? Color.mOnPrimary : Color.mSurfaceVariant font.pointSize: Style.fontSizeS * scaling