From 7f3fb7313aa0dc31e1b504e11607858a0e61d4aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tinkl?= Date: Fri, 15 Aug 2014 05:28:33 +0200 Subject: [PATCH] argl and once again, use the stuff in non-English locale this couldn't work as expected, Qt.formatDate() accepts a Qt::DateFormat enum, not Locale.*Format enum --- applets/digital-clock/package/contents/ui/DigitalClock.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/applets/digital-clock/package/contents/ui/DigitalClock.qml b/applets/digital-clock/package/contents/ui/DigitalClock.qml index a67e2ef96..a965aa073 100644 --- a/applets/digital-clock/package/contents/ui/DigitalClock.qml +++ b/applets/digital-clock/package/contents/ui/DigitalClock.qml @@ -69,7 +69,7 @@ Item { minimumPixelSize: theme.mSize(theme.smallestFont).height fontSizeMode: Text.Fit text: Qt.formatTime(dataSource.data["Local"]["DateTime"], main.timeFormat) - + (showDate ? "
" + Qt.formatDate(dataSource.data["Local"]["DateTime"], main.dateFormat) : "" ) + + (showDate ? "
" + Qt.formatDate(dataSource.data["Local"]["DateTime"], Qt.locale().dateFormat(main.dateFormat)) : "" ) wrapMode: plasmoid.formFactor != PlasmaCore.Types.Horizontal ? Text.WordWrap : Text.NoWrap horizontalAlignment: vertical ? Text.AlignHCenter : Text.AlignLeft // we want left align when horizontal to avoid re-aligning when seconds are visible verticalAlignment: Text.AlignVCenter @@ -142,7 +142,7 @@ Item { } if (main.showDate) { - st += "
" + Qt.formatDate(dataSource.data["Local"]["DateTime"], main.dateFormat); + st += "
" + Qt.formatDate(dataSource.data["Local"]["DateTime"], Qt.locale().dateFormat(main.dateFormat)); } if (sizehelper.text != st) {