git.iko.soy/unity8
on xenial help sign in
Fix upcoming alarms ETA labels Fixes: #1576741
5157af3Lukáš Tinkl
qml/Panel/Indicators/MenuItemFactory.qml+2−2
compare with xenial
unifiedsplit
@@ -377,11 +377,11 @@ Item {
377 property int menuIndex: -1
377 property int menuIndex: -1
378 property var extendedData: menuData && menuData.ext || undefined
378 property var extendedData: menuData && menuData.ext || undefined
379
379
380− property date serverTime: new Date(getExtendedProperty(extendedData, "xCanonicalTime", 0) * 1000)
380+ readonly property date serverTime: new Date(getExtendedProperty(extendedData, "xCanonicalTime", 0) * 1000)
381 LiveTimer {
381 LiveTimer {
382 frequency: LiveTimer.Relative
382 frequency: LiveTimer.Relative
383 relativeTime: alarmItem.serverTime
383 relativeTime: alarmItem.serverTime
384− onTrigger: alarmItem.serverTime = new Date(getExtendedProperty(extendedData, "xCanonicalTime", 0) * 1000)
384+ onTrigger: alarmItem.time = i18n.relativeDateTime(alarmItem.serverTime)
385 }
385 }
386
386
387 text: menuData && menuData.label || ""
387 text: menuData && menuData.label || ""