← Back to branch summary

~fboucault/ubuntu-calendar-app/crossbuild_fixes

« back to all changes in this revision

Viewing changes to EventDetails.qml

Trunk merged.

Show diffs side-by-side

added added

removed removed

Lines of Context:
EventDetails.qml
24
24
 
25
25
import "Defines.js" as Defines
26
26
import "dateExt.js" as DateExt
 
27
import "./3rd-party/lunar.js" as Lunar
27
28
 
28
29
Page {
29
30
    id: root
123
124
        var startTime = e.startDateTime.toLocaleTimeString(Qt.locale(), Locale.ShortFormat)
124
125
        var endTime = e.endDateTime.toLocaleTimeString(Qt.locale(), Locale.ShortFormat)
125
126
 
 
127
        var lunarStartDate = null;
 
128
        var lunarEndDate = null;
 
129
        if (mainView.displayLunarCalendar) {
 
130
            lunarStartDate = Lunar.calendar.solar2lunar(e.startDateTime.getFullYear(),
 
131
                                                   e.startDateTime.getMonth() + 1,
 
132
                                                   e.startDateTime.getDate())
 
133
 
 
134
            lunarEndDate = Lunar.calendar.solar2lunar(e.endDateTime.getFullYear(),
 
135
                                                   e.endDateTime.getMonth() + 1,
 
136
                                                   e.endDateTime.getDate())
 
137
        }
 
138
 
126
139
        if( e.allDay ) {
127
140
            var days = Math.floor((e.endDateTime - e.startDateTime) / Date.msPerDay);
128
141
            if( days !== 1 ) {
129
 
                dateLabel.text = i18n.tr("%1 - %2 (All Day)")
130
 
                .arg( e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat))
131
 
                .arg( e.endDateTime.addDays(-1).toLocaleDateString(Qt.locale(), Locale.LongFormat))
 
142
                if (mainView.displayLunarCalendar) {
 
143
                    dateLabel.text = i18n.tr("%1 %2 %3 - %4 %5 %6 (All Day)")
 
144
                    .arg(lunarStartDate.gzYear).arg(lunarStartDate .IMonthCn).arg(lunarStartDate.IDayCn)
 
145
                    .arg(lunarEndDate.gzYear).arg(lunarEndDate .IMonthCn).arg(lunarEndDate.IDayCn)
 
146
                } else {
 
147
                    dateLabel.text = i18n.tr("%1 - %2 (All Day)")
 
148
                    .arg( e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat))
 
149
                    .arg( e.endDateTime.addDays(-1).toLocaleDateString(Qt.locale(), Locale.LongFormat))
 
150
                }
132
151
            } else {
133
 
                dateLabel.text = i18n.tr("%1 (All Day)").arg( e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat))
 
152
                if (mainView.displayLunarCalendar) {
 
153
                    dateLabel.text = i18n.tr("%1 %2 %3 (All Day)")
 
154
                    .arg(lunarStartDate.gzYear).arg(lunarStartDate .IMonthCn).arg(lunarStartDate.IDayCn)
 
155
                } else {
 
156
                    dateLabel.text = i18n.tr("%1 (All Day)").arg( e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat))
 
157
                }
134
158
            }
135
159
        } else {
136
160
            if (e.endDateTime.getDate() !== e.startDateTime.getDate()) {
137
 
                dateLabel.text = e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat) + ", " +startTime + " - "
138
 
                        + e.endDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat) +  ", " + endTime;
 
161
                if (mainView.displayLunarCalendar) {
 
162
                    dateLabel.text = i18n.tr("%1 %2 %3, %4 - %5 %6 %7, %8")
 
163
                    .arg(lunarStartDate.gzYear).arg(lunarStartDate .IMonthCn).arg(lunarStartDate.IDayCn).arg(startTime)
 
164
                    .arg(lunarEndDate.gzYear).arg(lunarEndDate .IMonthCn).arg(lunarEndDate.IDayCn).arg(endTime);
 
165
                } else {
 
166
                    dateLabel.text = e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat) + ", " +startTime + " - "
 
167
                            + e.endDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat) +  ", " + endTime;
 
168
                }
139
169
            } else {
140
 
                dateLabel.text = e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat) + ", " +startTime + " - "  + endTime;
 
170
                if (mainView.displayLunarCalendar) {
 
171
                    dateLabel.text = i18n.tr("%1 %2 %3, %4 - %5")
 
172
                    .arg(lunarStartDate.gzYear).arg(lunarStartDate .IMonthCn).arg(lunarStartDate.IDayCn).arg(startTime).arg(endTime);
 
173
                } else {
 
174
                    dateLabel.text = e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat) + ", " +startTime + " - "  + endTime;
 
175
                }
141
176
            }
142
177
        }
143
178