Ubuntu Calendar App

Merge lp:~gary-wzl77/ubuntu-calendar-app/fix-1460433 into lp:ubuntu-calendar-app

  1. fix-1460433
  2. Merge into trunk
Proposed by Gary.Wang
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄
Approved revision: 654
Merged at revision: 656
Proposed branch: lp:~gary-wzl77/ubuntu-calendar-app/fix-1460433
Merge into: lp:ubuntu-calendar-app
Diff against target: 270 lines (+70/-38)
2 files modified
TimeLineBase.qml (+34/-6)
po/com.ubuntu.calendar.pot (+36/-32)
To merge this branch: bzr merge lp:~gary-wzl77/ubuntu-calendar-app/fix-1460433
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Alan Pope 🍺🐧🐱 🦄 (community) Approve
Review via email: mp+260688@code.launchpad.net

Commit message

Fix 1460433

To post a comment you must log in.
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

Looks good!

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'TimeLineBase.qml'
--- TimeLineBase.qml 2015-03-20 17:32:03 +0000
+++ TimeLineBase.qml 2015-06-01 09:05:25 +0000
@@ -219,13 +219,41 @@
219 }219 }
220220
221 function assignBubbleProperties(eventBubble, event, depth, sizeOfRow) {221 function assignBubbleProperties(eventBubble, event, depth, sizeOfRow) {
222 var hour = event.startDateTime.getHours();222 var yPos = 0;
223 var yPos = (( event.startDateTime.getMinutes() * hourHeight) / 60) + hour * hourHeight223 var height = 0;
224 var hour = 0;
225 var durationMin = 0;
226
227 if (event.endDateTime.getDate() - day.getDate() == 0 &&
228 event.startDateTime.getDate() - day.getDate() == 0) {
229 hour = event.startDateTime.getHours();
230 yPos = (( event.startDateTime.getMinutes() * hourHeight) / 60) + hour * hourHeight
231 durationMin = (event.endDateTime.getHours() - event.startDateTime.getHours()) * 60;
232 durationMin += (event.endDateTime.getMinutes() - event.startDateTime.getMinutes());
233 }
234 if (event.endDateTime.getDate() - day.getDate() == 0 &&
235 event.startDateTime.getDate() - day.getDate() < 0) {
236 hour = 0;
237 yPos = 0;
238 durationMin = event.endDateTime.getHours() * 60;
239 durationMin += event.endDateTime.getMinutes();
240 }
241 if (event.endDateTime.getDate() - day.getDate() > 0 &&
242 event.startDateTime.getDate() - day.getDate() == 0) {
243 hour = event.startDateTime.getHours();
244 yPos = (( event.startDateTime.getMinutes() * hourHeight) / 60) + hour * hourHeight
245 durationMin = (24 - event.startDateTime.getHours()) * 60;
246 }
247
248 if (event.endDateTime.getDate() - day.getDate() > 0 &&
249 event.startDateTime.getDate() - day.getDate() < 0) {
250 hour = 0;
251 yPos = 0;
252 durationMin = 24 * 60;
253 }
254
224 eventBubble.y = yPos;255 eventBubble.y = yPos;
225256 height = (durationMin * hourHeight )/ 60;
226 var durationMin = (event.endDateTime.getHours() - event.startDateTime.getHours()) * 60;
227 durationMin += (event.endDateTime.getMinutes() - event.startDateTime.getMinutes());
228 var height = (durationMin * hourHeight )/ 60;
229 eventBubble.height = (height > eventBubble.minimumHeight) ? height:eventBubble.minimumHeight ;257 eventBubble.height = (height > eventBubble.minimumHeight) ? height:eventBubble.minimumHeight ;
230258
231 eventBubble.model = bubbleOverLay.model259 eventBubble.model = bubbleOverLay.model
232260
=== modified file 'po/com.ubuntu.calendar.pot'
--- po/com.ubuntu.calendar.pot 2015-04-17 05:05:13 +0000
+++ po/com.ubuntu.calendar.pot 2015-06-01 09:05:25 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: \n"9"Project-Id-Version: \n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2015-04-17 07:04+0200\n"11"POT-Creation-Date: 2015-06-01 16:53+0800\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,7 +37,7 @@
3737
38#. TRANSLATORS: the first argument (%1) refers to a start time for an event,38#. TRANSLATORS: the first argument (%1) refers to a start time for an event,
39#. while the second one (%2) refers to the end time39#. while the second one (%2) refers to the end time
40#: ../AgendaView.qml:168 ../EventBubble.qml:13140#: ../AgendaView.qml:168 ../EventBubble.qml:133
41#, qt-format41#, qt-format
42msgid "%1 - %2"42msgid "%1 - %2"
43msgstr ""43msgstr ""
@@ -59,7 +59,7 @@
59msgstr[0] ""59msgstr[0] ""
60msgstr[1] ""60msgstr[1] ""
6161
62#: ../CalendarChoicePopup.qml:33 ../EventActions.qml:5962#: ../CalendarChoicePopup.qml:33 ../EventActions.qml:60
63msgid "Calendars"63msgid "Calendars"
64msgstr ""64msgstr ""
6565
@@ -77,15 +77,15 @@
77msgid "Syncing"77msgid "Syncing"
78msgstr ""78msgstr ""
7979
80#: ../CalendarChoicePopup.qml:7080#: ../CalendarChoicePopup.qml:71
81msgid "Add new Calendar"81msgid "Add new Calendar"
82msgstr ""82msgstr ""
8383
84#: ../ColorPickerDialog.qml:2484#: ../ColorPickerDialog.qml:25
85msgid "Select Color"85msgid "Select Color"
86msgstr ""86msgstr ""
8787
88#: ../ColorPickerDialog.qml:53 ../DeleteConfirmationDialog.qml:6088#: ../ColorPickerDialog.qml:55 ../DeleteConfirmationDialog.qml:60
89#: ../EditEventConfirmationDialog.qml:5389#: ../EditEventConfirmationDialog.qml:53
90msgid "Cancel"90msgid "Cancel"
91msgstr ""91msgstr ""
@@ -101,7 +101,7 @@
101#. TRANSLATORS: this is a time formatting string,101#. TRANSLATORS: this is a time formatting string,
102#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.102#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
103#. It's used in the header of the month and week views103#. It's used in the header of the month and week views
104#: ../DayView.qml:59 ../MonthView.qml:57 ../WeekView.qml:61104#: ../DayView.qml:59 ../MonthView.qml:58 ../WeekView.qml:61
105msgid "MMMM yyyy"105msgid "MMMM yyyy"
106msgstr ""106msgstr ""
107107
@@ -136,7 +136,7 @@
136msgid "Delete"136msgid "Delete"
137msgstr ""137msgstr ""
138138
139#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:283139#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:296
140msgid "Edit Event"140msgid "Edit Event"
141msgstr ""141msgstr ""
142142
@@ -154,18 +154,18 @@
154msgid "Edit this"154msgid "Edit this"
155msgstr ""155msgstr ""
156156
157#: ../EventActions.qml:50 ../NewEvent.qml:283157#: ../EventActions.qml:50 ../NewEvent.qml:296
158msgid "New Event"158msgid "New Event"
159msgstr ""159msgstr ""
160160
161#. TRANSLATORS: the first argument (%1) refers to a time for an event,161#. TRANSLATORS: the first argument (%1) refers to a time for an event,
162#. while the second one (%2) refers to title of event162#. while the second one (%2) refers to title of event
163#: ../EventBubble.qml:142 ../EventBubble.qml:147163#: ../EventBubble.qml:144 ../EventBubble.qml:149
164#, qt-format164#, qt-format
165msgid "%1 <b>%2</b>"165msgid "%1 <b>%2</b>"
166msgstr ""166msgstr ""
167167
168#: ../EventDetails.qml:42 ../NewEvent.qml:393168#: ../EventDetails.qml:42 ../NewEvent.qml:407
169msgid "Event Details"169msgid "Event Details"
170msgstr ""170msgstr ""
171171
@@ -189,11 +189,11 @@
189msgid "Edit"189msgid "Edit"
190msgstr ""190msgstr ""
191191
192#: ../EventDetails.qml:347 ../NewEvent.qml:479192#: ../EventDetails.qml:347 ../NewEvent.qml:509
193msgid "Guests"193msgid "Guests"
194msgstr ""194msgstr ""
195195
196#: ../EventDetails.qml:390 ../EventReminder.qml:35 ../NewEvent.qml:578196#: ../EventDetails.qml:390 ../EventReminder.qml:35 ../NewEvent.qml:606
197msgid "Reminder"197msgid "Reminder"
198msgstr ""198msgstr ""
199199
@@ -201,26 +201,26 @@
201#. and it is shown as the header of the page to choose repetition201#. and it is shown as the header of the page to choose repetition
202#. and as the header of the list item that shows the repetition202#. and as the header of the list item that shows the repetition
203#. summary in the page that displays the event details203#. summary in the page that displays the event details
204#: ../EventRepetition.qml:41 ../EventRepetition.qml:132204#: ../EventRepetition.qml:41 ../EventRepetition.qml:150
205msgid "Repeat"205msgid "Repeat"
206msgstr ""206msgstr ""
207207
208#: ../EventRepetition.qml:151208#: ../EventRepetition.qml:169
209msgid "Repeats On:"209msgid "Repeats On:"
210msgstr ""210msgstr ""
211211
212#: ../EventRepetition.qml:196212#: ../EventRepetition.qml:214
213msgid "Recurring event ends"213msgid "Recurring event ends"
214msgstr ""214msgstr ""
215215
216#. TRANSLATORS: this refers to how often a recurrent event repeats216#. TRANSLATORS: this refers to how often a recurrent event repeats
217#. and it is shown as the header of the option selector to choose217#. and it is shown as the header of the option selector to choose
218#. its repetition218#. its repetition
219#: ../EventRepetition.qml:219 ../NewEvent.qml:560219#: ../EventRepetition.qml:237 ../NewEvent.qml:590
220msgid "Repeats"220msgid "Repeats"
221msgstr ""221msgstr ""
222222
223#: ../EventRepetition.qml:244223#: ../EventRepetition.qml:262
224msgid "Date"224msgid "Date"
225msgstr ""225msgstr ""
226226
@@ -259,51 +259,51 @@
259msgid "After Date"259msgid "After Date"
260msgstr ""260msgstr ""
261261
262#: ../NewEvent.qml:59262#: ../NewEvent.qml:61
263msgid "Save"263msgid "Save"
264msgstr ""264msgstr ""
265265
266#: ../NewEvent.qml:165266#: ../NewEvent.qml:170
267msgid "End time can't be before start time"267msgid "End time can't be before start time"
268msgstr ""268msgstr ""
269269
270#: ../NewEvent.qml:293270#: ../NewEvent.qml:306
271msgid "Error"271msgid "Error"
272msgstr ""272msgstr ""
273273
274#: ../NewEvent.qml:295274#: ../NewEvent.qml:308
275msgid "OK"275msgid "OK"
276msgstr ""276msgstr ""
277277
278#: ../NewEvent.qml:347278#: ../NewEvent.qml:361
279msgid "From"279msgid "From"
280msgstr ""280msgstr ""
281281
282#: ../NewEvent.qml:360282#: ../NewEvent.qml:374
283msgid "To"283msgid "To"
284msgstr ""284msgstr ""
285285
286#: ../NewEvent.qml:377286#: ../NewEvent.qml:391
287msgid "All day event"287msgid "All day event"
288msgstr ""288msgstr ""
289289
290#: ../NewEvent.qml:406290#: ../NewEvent.qml:420
291msgid "Event Name"291msgid "Event Name"
292msgstr ""292msgstr ""
293293
294#: ../NewEvent.qml:419294#: ../NewEvent.qml:438
295msgid "Description"295msgid "Description"
296msgstr ""296msgstr ""
297297
298#: ../NewEvent.qml:432298#: ../NewEvent.qml:456
299msgid "Location"299msgid "Location"
300msgstr ""300msgstr ""
301301
302#: ../NewEvent.qml:441 com.ubuntu.calendar_calendar.desktop.in.in.h:1302#: ../NewEvent.qml:471 com.ubuntu.calendar_calendar.desktop.in.in.h:1
303msgid "Calendar"303msgid "Calendar"
304msgstr ""304msgstr ""
305305
306#: ../NewEvent.qml:483306#: ../NewEvent.qml:513
307msgid "Add Guest"307msgid "Add Guest"
308msgstr ""308msgstr ""
309309
@@ -390,13 +390,17 @@
390msgid "2 weeks"390msgid "2 weeks"
391msgstr ""391msgstr ""
392392
393#: ../TimeLineBase.qml:80
394msgid "Untitled"
395msgstr ""
396
393#. TRANSLATORS: W refers to Week, followed by the actual week number (%1)397#. TRANSLATORS: W refers to Week, followed by the actual week number (%1)
394#: ../TimeLineHeader.qml:49398#: ../TimeLineHeader.qml:51
395#, qt-format399#, qt-format
396msgid "W%1"400msgid "W%1"
397msgstr ""401msgstr ""
398402
399#: ../TimeLineHeader.qml:61403#: ../TimeLineHeader.qml:63
400msgid "All Day"404msgid "All Day"
401msgstr ""405msgstr ""
402406

Subscribers

People subscribed via source and target branches

to status/vote changes: