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
wilder-5.14
Lukáš Tinkl 12 years ago
parent 92d4efc1b4
commit 7f3fb7313a
  1. 4
      applets/digital-clock/package/contents/ui/DigitalClock.qml

@ -69,7 +69,7 @@ Item {
minimumPixelSize: theme.mSize(theme.smallestFont).height minimumPixelSize: theme.mSize(theme.smallestFont).height
fontSizeMode: Text.Fit fontSizeMode: Text.Fit
text: Qt.formatTime(dataSource.data["Local"]["DateTime"], main.timeFormat) text: Qt.formatTime(dataSource.data["Local"]["DateTime"], main.timeFormat)
+ (showDate ? "<br/>" + Qt.formatDate(dataSource.data["Local"]["DateTime"], main.dateFormat) : "" ) + (showDate ? "<br/>" + Qt.formatDate(dataSource.data["Local"]["DateTime"], Qt.locale().dateFormat(main.dateFormat)) : "" )
wrapMode: plasmoid.formFactor != PlasmaCore.Types.Horizontal ? Text.WordWrap : Text.NoWrap 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 horizontalAlignment: vertical ? Text.AlignHCenter : Text.AlignLeft // we want left align when horizontal to avoid re-aligning when seconds are visible
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
@ -142,7 +142,7 @@ Item {
} }
if (main.showDate) { if (main.showDate) {
st += "<br/>" + Qt.formatDate(dataSource.data["Local"]["DateTime"], main.dateFormat); st += "<br/>" + Qt.formatDate(dataSource.data["Local"]["DateTime"], Qt.locale().dateFormat(main.dateFormat));
} }
if (sizehelper.text != st) { if (sizehelper.text != st) {

Loading…
Cancel
Save