Merge lp:~gary-wzl77/ubuntu-calendar-app/show-week-number into lp:ubuntu-calendar-app

Proposed by Gary.Wang
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 πŸ¦„
Approved revision: 726
Merged at revision: 726
Proposed branch: lp:~gary-wzl77/ubuntu-calendar-app/show-week-number
Merge into: lp:ubuntu-calendar-app
Diff against target: 543 lines (+238/-30)
12 files modified
AgendaView.qml (+2/-1)
AllDayEventComponent.qml (+3/-0)
DayView.qml (+2/-1)
EventActions.qml (+11/-0)
MonthComponent.qml (+86/-1)
MonthView.qml (+4/-1)
Settings.qml (+89/-0)
WeekView.qml (+2/-1)
YearView.qml (+2/-1)
YearViewDelegate.qml (+1/-1)
calendar.qml (+4/-3)
po/com.ubuntu.calendar.pot (+32/-20)
To merge this branch: bzr merge lp:~gary-wzl77/ubuntu-calendar-app/show-week-number
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 πŸ¦„ (community) Approve
Jenkins Bot continuous-integration Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Nicholas Skaggs (community) Needs Fixing
Mihir Soni Pending
Review via email: mp+264153@code.launchpad.net

Commit message

Show week number in monthly and yearly view.

Description of the change

Show week number in monthly and yearly view.
1.Navigate to day view when clicking weeknum in monthly view
2.Navigate to monthly view when clicking weeknum in yearly view

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

Not sure about this. We need design to take a look.

http://people.canonical.com/~alan/year.png
http://people.canonical.com/~alan/month.png

Seems cluttered.

Revision history for this message
Gary.Wang (gary-wzl77) wrote :

Add screenshots of monthly view with UI-fined based on feedback from UX team.
Add setting page in latest repo as well.

https://drive.google.com/open?id=0B2H9ECPSSfqIN1AxRGVfMndDYlk
https://drive.google.com/open?id=0B2H9ECPSSfqIc0ZqT2lXOEhTX3M

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

Popey,

Any updates from design team regarding this ?

Revision history for this message
Gary.Wang (gary-wzl77) wrote :

Got feedback from UX-design team that
"
This solution works nicely and I think we should proceed with it.
...
"

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/1405/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-autolanding/978/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Text conflict in po/com.ubuntu.calendar.pot
1 conflicts encountered.

review: Needs Fixing
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
710. By Kunal Parmar

resolves Bug #1473679
. Fixes: https://bugs.launchpad.net/bugs/1473679.

Approved by Alan Pope ξƒΏ, Ubuntu Phone Apps Jenkins Bot.

711. By Kunal Parmar

resolves Bug #1479533 . Fixes: https://bugs.launchpad.net/bugs/1479533.

Approved by Alan Pope ξƒΏ, Ubuntu Phone Apps Jenkins Bot.

712. By Launchpad Translations on behalf of ubuntu-calendar-dev

Launchpad automatic translations update.

713. By Launchpad Translations on behalf of ubuntu-calendar-dev

Launchpad automatic translations update.

714. By Launchpad Translations on behalf of ubuntu-calendar-dev

Launchpad automatic translations update.

715. By Kunal Parmar

resolves Bug #1475747 . Fixes: https://bugs.launchpad.net/bugs/1475747.

Approved by Mihir Soni, Ubuntu Phone Apps Jenkins Bot.

716. By Launchpad Translations on behalf of ubuntu-calendar-dev

Launchpad automatic translations update.

717. By Launchpad Translations on behalf of ubuntu-calendar-dev

Launchpad automatic translations update.

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
718. By Launchpad Translations on behalf of ubuntu-calendar-dev

Launchpad automatic translations update.

719. By Kunal Parmar

Resolves Bug #1494394 . Fixes: https://bugs.launchpad.net/bugs/1494394.

Approved by Alan Pope ξƒΏ, Jenkins Bot, Ubuntu Phone Apps Jenkins Bot.

720. By Launchpad Translations on behalf of ubuntu-calendar-dev

Launchpad automatic translations update.

721. By Gary.Wang

Tab change will cause dynamic creation(Qt.ResolvedUrl) for qml object back and forth.Using Qt.CreateComponent for dynamic creation for the first time and reuse existing obj without re-creating. Fixes: https://bugs.launchpad.net/bugs/1309263.

Approved by Ubuntu Phone Apps Jenkins Bot, Jenkins Bot, Alan Pope ξƒΏ.

722. By Launchpad Translations on behalf of ubuntu-calendar-dev

Launchpad automatic translations update.

723. By Launchpad Translations on behalf of ubuntu-calendar-dev

Launchpad automatic translations update.

724. By Launchpad Translations on behalf of ubuntu-calendar-dev

Launchpad automatic translations update.

725. By Niklas Wenzel

Remove unnecessary i18n.tr() calls.

Approved by Mihir Soni, Jenkins Bot.

726. By Gary.Wang

Replace calendarStorage with native persistent application settings

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'AgendaView.qml'
--- AgendaView.qml 2015-02-22 10:18:16 +0000
+++ AgendaView.qml 2015-11-23 07:20:37 +0000
@@ -60,7 +60,8 @@
60 commonHeaderActions.newEventAction,60 commonHeaderActions.newEventAction,
61 commonHeaderActions.showCalendarAction,61 commonHeaderActions.showCalendarAction,
62 commonHeaderActions.reloadAction,62 commonHeaderActions.reloadAction,
63 commonHeaderActions.syncCalendarAction63 commonHeaderActions.syncCalendarAction,
64 commonHeaderActions.settingsAction
64 ]65 ]
6566
66 EventListModel {67 EventListModel {
6768
=== modified file 'AllDayEventComponent.qml'
--- AllDayEventComponent.qml 2015-06-16 09:18:21 +0000
+++ AllDayEventComponent.qml 2015-11-23 07:20:37 +0000
@@ -40,6 +40,9 @@
40 for(var i = 0 ; i < items.length ; ++i) {40 for(var i = 0 ; i < items.length ; ++i) {
41 var event = items[(i)];41 var event = items[(i)];
42 if( event && event.allDay ) {42 if( event && event.allDay ) {
43
44 console.log("event.startDateTime", event.startDateTime," event.endDateTime",event.endDateTime);
45
43 for(var d = event.startDateTime; d < event.endDateTime; d = d.addDays(1)) {46 for(var d = event.startDateTime; d < event.endDateTime; d = d.addDays(1)) {
44 var key = Qt.formatDateTime(d, "dd-MMM-yyyy");47 var key = Qt.formatDateTime(d, "dd-MMM-yyyy");
45 if( !(key in map)) {48 if( !(key in map)) {
4649
=== modified file 'DayView.qml'
--- DayView.qml 2015-11-20 23:07:21 +0000
+++ DayView.qml 2015-11-23 07:20:37 +0000
@@ -49,7 +49,8 @@
49 commonHeaderActions.newEventAction,49 commonHeaderActions.newEventAction,
50 commonHeaderActions.showCalendarAction,50 commonHeaderActions.showCalendarAction,
51 commonHeaderActions.reloadAction,51 commonHeaderActions.reloadAction,
52 commonHeaderActions.syncCalendarAction52 commonHeaderActions.syncCalendarAction,
53 commonHeaderActions.settingsAction
53 ]54 ]
5455
55 contents: Label {56 contents: Label {
5657
=== modified file 'EventActions.qml'
--- EventActions.qml 2015-04-13 19:40:48 +0000
+++ EventActions.qml 2015-11-23 07:20:37 +0000
@@ -26,6 +26,7 @@
26 property alias newEventAction: _newEventAction26 property alias newEventAction: _newEventAction
27 property alias showCalendarAction: _showCalendarAction27 property alias showCalendarAction: _showCalendarAction
28 property alias syncCalendarAction: _syncCalendarAction28 property alias syncCalendarAction: _syncCalendarAction
29 property alias settingsAction: _settingsAction
2930
30 Action {31 Action {
31 id: _syncCalendarAction32 id: _syncCalendarAction
@@ -63,4 +64,14 @@
63 pageStack.currentPage.collectionUpdated.connect(eventModel.delayedApplyFilter);64 pageStack.currentPage.collectionUpdated.connect(eventModel.delayedApplyFilter);
64 }65 }
65 }66 }
67
68 Action{
69 id: _settingsAction
70 objectName: "settingsbutton"
71 iconName: "settings"
72 text: i18n.tr("Settings")
73 onTriggered: {
74 pageStack.push(Qt.resolvedUrl("Settings.qml"));
75 }
76 }
66}77}
6778
=== modified file 'MonthComponent.qml'
--- MonthComponent.qml 2015-09-05 05:30:23 +0000
+++ MonthComponent.qml 2015-11-23 07:20:37 +0000
@@ -31,6 +31,7 @@
31 property var currentMonth;31 property var currentMonth;
32 property var isYearView;32 property var isYearView;
33 property var selectedDay;33 property var selectedDay;
34 property bool displayWeekNumber:false;
3435
35 property string dayLabelFontSize: "medium"36 property string dayLabelFontSize: "medium"
36 property string dateLabelFontSize: "large"37 property string dateLabelFontSize: "large"
@@ -145,7 +146,10 @@
145 id: column146 id: column
146147
147 anchors {148 anchors {
148 fill: parent149 left: weekNumLoader.right;
150 right: parent.right;
151 top: parent.top;
152 bottom: parent.bottom;
149 topMargin: units.gu(1.5)153 topMargin: units.gu(1.5)
150 bottomMargin: units.gu(1)154 bottomMargin: units.gu(1)
151 }155 }
@@ -213,6 +217,87 @@
213 }217 }
214 }218 }
215219
220 Loader {
221 id: weekNumLoader;
222 anchors.left: parent.left;
223 width: displayWeekNumber ? parent.width / 7:0;
224 height: parent.height;
225 visible: displayWeekNumber;
226 sourceComponent: displayWeekNumber ? weekNumComp : undefined;
227 }
228
229 Component {
230 id: weekNumComp
231
232 Column {
233 id: weekNumColumn;
234
235 anchors {
236 fill: parent
237 topMargin: units.gu(1.0)
238 bottomMargin: units.gu(1.25)
239 }
240
241 Item {
242 id: datePlaceHolder;
243 objectName:"datePlaceHolder"
244
245 width: parent.width;
246 height: isYearView ? units.gu(4.5): units.gu(1.25)
247 }
248
249 Item {
250 id: weekNumLabelItem;
251 objectName: "weekNumLabelItem"
252
253 width: parent.width;
254 height: weekNumLabel.height + units.gu(2.0)
255
256 Label{
257 id: weekNumLabel;
258 objectName: "weekNumLabel";
259 width: parent.width;
260 text: i18n.tr("Wk");
261 horizontalAlignment: Text.AlignHCenter;
262 verticalAlignment: Text.AlignVCenter;
263 font.pixelSize: intern.dayFontSize;
264 font.bold: true
265 color: "black"
266 }
267 }
268
269 Repeater {
270 id: weekNumrepeater;
271 model: 6;
272
273 Label{
274 id: weekNum
275 objectName: "weekNum" + index
276 width: parent.width;
277 height: (weekNumColumn.height - weekNumLabelItem.height - datePlaceHolder.height) / 6;
278 text: intern.monthStart.addDays(index * 7).weekNumber(Qt.locale().firstDayOfWeek)
279 horizontalAlignment: Text.AlignHCenter;
280 verticalAlignment: Text.AlignVCenter;
281 font.pixelSize: intern.dayFontSize + 1;
282 font.bold: true
283 color: "black"
284
285 MouseArea {
286 anchors.fill: parent
287 onClicked: {
288 var selectedDate = new Date(intern.monthStart.addDays(index * 7))
289 if( isYearView ) {
290 root.monthSelected(selectedDate);
291 } else {
292 root.dateSelected(selectedDate);
293 }
294 }
295 }
296 }
297 }
298 }
299 }
300
216 Component{301 Component{
217 id: defaultDateLabelComponent302 id: defaultDateLabelComponent
218 MonthComponentDateDelegate{303 MonthComponentDateDelegate{
219304
=== modified file 'MonthView.qml'
--- MonthView.qml 2015-11-20 23:07:21 +0000
+++ MonthView.qml 2015-11-23 07:20:37 +0000
@@ -48,7 +48,8 @@
48 commonHeaderActions.newEventAction,48 commonHeaderActions.newEventAction,
49 commonHeaderActions.showCalendarAction,49 commonHeaderActions.showCalendarAction,
50 commonHeaderActions.reloadAction,50 commonHeaderActions.reloadAction,
51 commonHeaderActions.syncCalendarAction51 commonHeaderActions.syncCalendarAction,
52 commonHeaderActions.settingsAction
52 ]53 ]
5354
54 contents: Label {55 contents: Label {
@@ -108,6 +109,8 @@
108109
109 showEvents: true110 showEvents: true
110111
112 displayWeekNumber: mainView.displayWeekNumber;
113
111 anchors.fill: parent114 anchors.fill: parent
112115
113 currentMonth: monthViewPath.addMonth(monthViewPath.startMonth,116 currentMonth: monthViewPath.addMonth(monthViewPath.startMonth,
114117
=== added file 'Settings.qml'
--- Settings.qml 1970-01-01 00:00:00 +0000
+++ Settings.qml 2015-11-23 07:20:37 +0000
@@ -0,0 +1,89 @@
1/*
2 * Copyright (C) 2013-2014 Canonical Ltd
3 *
4 * This file is part of Ubuntu Calendar App
5 *
6 * Ubuntu Calendar App is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 3 as
8 * published by the Free Software Foundation.
9 *
10 * Ubuntu Calendar App is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */
18import QtQuick 2.3
19import Ubuntu.Components 1.1
20import Ubuntu.Components.Popups 1.0
21import Ubuntu.Components.ListItems 1.0 as ListItem
22
23Page {
24 id: root
25 objectName: "settings"
26
27 visible: false
28 title: i18n.tr("Settings")
29
30 head {
31 backAction: Action {
32 text: i18n.tr("Back")
33 iconName: "back"
34 onTriggered: {
35 pop();
36 }
37 }
38 }
39
40 ListModel{
41 id: model;
42 }
43
44 Column {
45 id: settingsColumn
46 objectName: "settingsColumn"
47 spacing: units.gu(0.5)
48 anchors {
49 margins: units.gu(2)
50 fill: parent
51 }
52
53 Item{
54 width: parent.width;
55 height: Math.max(weekNumber.height, weekCheckBox.height)
56
57 Label{
58 id: weekNumber;
59 objectName: "weekNumber"
60 text: i18n.tr("Show week numbers");
61 elide: Text.ElideRight
62 opacity: weekCheckBox.checked ? 1.0 : 0.8
63 color: UbuntuColors.midAubergine
64 anchors {
65 left: parent.left
66 right: weekCheckBox.left;
67 margins: units.gu(2)
68 verticalCenter: parent.verticalCenter
69 }
70 }
71
72 CheckBox {
73 id: weekCheckBox
74 objectName: "weekCheckBox"
75 anchors.right:parent.right;
76 onCheckedChanged: {
77 mainView.displayWeekNumber = weekCheckBox.checked;
78 }
79 }
80 }
81
82 ListItem.ThinDivider {}
83 }
84
85 Component.onCompleted: {
86 weekCheckBox.checked = mainView.displayWeekNumber;
87 }
88}
89
090
=== modified file 'WeekView.qml'
--- WeekView.qml 2015-09-05 05:30:23 +0000
+++ WeekView.qml 2015-11-23 07:20:37 +0000
@@ -53,7 +53,8 @@
53 commonHeaderActions.newEventAction,53 commonHeaderActions.newEventAction,
54 commonHeaderActions.showCalendarAction,54 commonHeaderActions.showCalendarAction,
55 commonHeaderActions.reloadAction,55 commonHeaderActions.reloadAction,
56 commonHeaderActions.syncCalendarAction56 commonHeaderActions.syncCalendarAction,
57 commonHeaderActions.settingsAction
57 ]58 ]
5859
59 contents: Label {60 contents: Label {
6061
=== modified file 'YearView.qml'
--- YearView.qml 2015-05-07 05:10:48 +0000
+++ YearView.qml 2015-11-23 07:20:37 +0000
@@ -51,7 +51,8 @@
51 commonHeaderActions.newEventAction,51 commonHeaderActions.newEventAction,
52 commonHeaderActions.showCalendarAction,52 commonHeaderActions.showCalendarAction,
53 commonHeaderActions.reloadAction,53 commonHeaderActions.reloadAction,
54 commonHeaderActions.syncCalendarAction54 commonHeaderActions.syncCalendarAction,
55 commonHeaderActions.settingsAction
55 ]56 ]
56 contents: Label {57 contents: Label {
57 id:year58 id:year
5859
=== modified file 'YearViewDelegate.qml'
--- YearViewDelegate.qml 2015-05-07 05:10:48 +0000
+++ YearViewDelegate.qml 2015-11-23 07:20:37 +0000
@@ -78,7 +78,7 @@
78 objectName: "monthComponent" + index78 objectName: "monthComponent" + index
79 showEvents: false79 showEvents: false
80 currentMonth: new Date(yearView.year, index, 1, 0, 0, 0, 0)80 currentMonth: new Date(yearView.year, index, 1, 0, 0, 0, 0)
8181 displayWeekNumber: mainView.displayWeekNumber;
82 isCurrentItem: yearView.focus82 isCurrentItem: yearView.focus
8383
84 isYearView: true84 isYearView: true
8585
=== modified file 'calendar.qml'
--- calendar.qml 2015-11-07 16:05:12 +0000
+++ calendar.qml 2015-11-23 07:20:37 +0000
@@ -20,11 +20,13 @@
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.0
21import QtOrganizer 5.021import QtOrganizer 5.0
22import Qt.labs.settings 1.022import Qt.labs.settings 1.0
23
24import "dateExt.js" as DateExt23import "dateExt.js" as DateExt
2524
26MainView {25MainView {
27 id: mainView26 id: mainView
27
28 property bool displayWeekNumber: false;
29
28 useDeprecatedToolbar: false30 useDeprecatedToolbar: false
2931
30 // Work-around until this branch lands:32 // Work-around until this branch lands:
@@ -222,8 +224,6 @@
222 property int starttime: -1;224 property int starttime: -1;
223 property int endtime: -1;225 property int endtime: -1;
224226
225 selectedTabIndex: weekTab.index
226
227 function newEvent() {227 function newEvent() {
228 var startDate = new Date();228 var startDate = new Date();
229 var endDate = new Date();229 var endDate = new Date();
@@ -324,6 +324,7 @@
324 Settings {324 Settings {
325 id: settings325 id: settings
326 property alias defaultViewIndex: tabs.selectedTabIndex326 property alias defaultViewIndex: tabs.selectedTabIndex
327 property alias showWeekNumber: mainView.displayWeekNumber
327 }328 }
328329
329 Keys.onTabPressed: {330 Keys.onTabPressed: {
330331
=== modified file 'po/com.ubuntu.calendar.pot'
--- po/com.ubuntu.calendar.pot 2015-10-28 02:23:11 +0000
+++ po/com.ubuntu.calendar.pot 2015-11-23 07:20:37 +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-10-28 10:22+0800\n"11"POT-Creation-Date: 2015-11-23 15:14+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"
@@ -23,21 +23,21 @@
23msgid "Today"23msgid "Today"
24msgstr ""24msgstr ""
2525
26#: ../AgendaView.qml:9226#: ../AgendaView.qml:93
27msgid "No upcoming events"27msgid "No upcoming events"
28msgstr ""28msgstr ""
2929
30#: ../AgendaView.qml:9530#: ../AgendaView.qml:96
31msgid "You have no calendars enabled"31msgid "You have no calendars enabled"
32msgstr ""32msgstr ""
3333
34#: ../AgendaView.qml:10534#: ../AgendaView.qml:106
35msgid "Enable calendars"35msgid "Enable calendars"
36msgstr ""36msgstr ""
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:13340#: ../AgendaView.qml:169 ../EventBubble.qml:133
41#, qt-format41#, qt-format
42msgid "%1 - %2"42msgid "%1 - %2"
43msgstr ""43msgstr ""
@@ -46,34 +46,34 @@
46#. on a given day. "Ev." is short form for "Events".46#. on a given day. "Ev." is short form for "Events".
47#. Please keep the translation of "Ev." to 3 characters only, as the week view47#. Please keep the translation of "Ev." to 3 characters only, as the week view
48#. where it's shown has limited space48#. where it's shown has limited space
49#: ../AllDayEventComponent.qml:12349#: ../AllDayEventComponent.qml:126
50#, qt-format50#, qt-format
51msgid "%1 ev."51msgid "%1 ev."
52msgstr ""52msgstr ""
5353
54#. TRANSLATORS: the argument refers to the number of all day events54#. TRANSLATORS: the argument refers to the number of all day events
55#: ../AllDayEventComponent.qml:12755#: ../AllDayEventComponent.qml:130
56#, qt-format56#, qt-format
57msgid "%1 all day event"57msgid "%1 all day event"
58msgid_plural "%1 all day events"58msgid_plural "%1 all day events"
59msgstr[0] ""59msgstr[0] ""
60msgstr[1] ""60msgstr[1] ""
6161
62#: ../CalendarChoicePopup.qml:33 ../EventActions.qml:6062#: ../CalendarChoicePopup.qml:33 ../EventActions.qml:61
63msgid "Calendars"63msgid "Calendars"
64msgstr ""64msgstr ""
6565
66#: ../CalendarChoicePopup.qml:3766#: ../CalendarChoicePopup.qml:37 ../Settings.qml:32
67msgid "Back"67msgid "Back"
68msgstr ""68msgstr ""
6969
70#. TRANSLATORS: Please translate this string to 15 characters only.70#. TRANSLATORS: Please translate this string to 15 characters only.
71#. Currently ,there is no way we can increase width of action menu currently.71#. Currently ,there is no way we can increase width of action menu currently.
72#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:3672#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:37
73msgid "Sync"73msgid "Sync"
74msgstr ""74msgstr ""
7575
76#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:3676#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:37
77msgid "Syncing"77msgid "Syncing"
78msgstr ""78msgstr ""
7979
@@ -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:60 ../WeekView.qml:63104#: ../DayView.qml:60 ../MonthView.qml:61 ../WeekView.qml:64
105msgid "MMMM yyyy"105msgid "MMMM yyyy"
106msgstr ""106msgstr ""
107107
@@ -154,10 +154,14 @@
154msgid "Edit this"154msgid "Edit this"
155msgstr ""155msgstr ""
156156
157#: ../EventActions.qml:50 ../NewEvent.qml:325157#: ../EventActions.qml:51 ../NewEvent.qml:325
158msgid "New Event"158msgid "New Event"
159msgstr ""159msgstr ""
160160
161#: ../EventActions.qml:72 ../Settings.qml:28
162msgid "Settings"
163msgstr ""
164
161#. TRANSLATORS: the first argument (%1) refers to a time for an event,165#. TRANSLATORS: the first argument (%1) refers to a time for an event,
162#. while the second one (%2) refers to title of event166#. while the second one (%2) refers to title of event
163#: ../EventBubble.qml:144 ../EventBubble.qml:149167#: ../EventBubble.qml:144 ../EventBubble.qml:149
@@ -259,6 +263,10 @@
259msgid "After Date"263msgid "After Date"
260msgstr ""264msgstr ""
261265
266#: ../MonthComponent.qml:260
267msgid "Wk"
268msgstr ""
269
262#: ../NewEvent.qml:84270#: ../NewEvent.qml:84
263msgid "Save"271msgid "Save"
264msgstr ""272msgstr ""
@@ -390,6 +398,10 @@
390msgid "2 weeks"398msgid "2 weeks"
391msgstr ""399msgstr ""
392400
401#: ../Settings.qml:60
402msgid "Show week numbers"
403msgstr ""
404
393#: ../TimeLineBase.qml:73405#: ../TimeLineBase.qml:73
394msgid "Untitled"406msgid "Untitled"
395msgstr ""407msgstr ""
@@ -404,35 +416,35 @@
404msgid "All Day"416msgid "All Day"
405msgstr ""417msgstr ""
406418
407#: ../YearView.qml:60419#: ../YearView.qml:61
408#, qt-format420#, qt-format
409msgid "Year %1"421msgid "Year %1"
410msgstr ""422msgstr ""
411423
412#: ../calendar.qml:44424#: ../calendar.qml:47
413msgid ""425msgid ""
414"Calendar app accept four arguments: --starttime, --endtime, --newevent and --"426"Calendar app accept four arguments: --starttime, --endtime, --newevent and --"
415"eventid. They will be managed by system. See the source for a full comment "427"eventid. They will be managed by system. See the source for a full comment "
416"about them"428"about them"
417msgstr ""429msgstr ""
418430
419#: ../calendar.qml:448431#: ../calendar.qml:455
420msgid "Year"432msgid "Year"
421msgstr ""433msgstr ""
422434
423#: ../calendar.qml:455435#: ../calendar.qml:462
424msgid "Month"436msgid "Month"
425msgstr ""437msgstr ""
426438
427#: ../calendar.qml:462439#: ../calendar.qml:469
428msgid "Week"440msgid "Week"
429msgstr ""441msgstr ""
430442
431#: ../calendar.qml:469443#: ../calendar.qml:476
432msgid "Day"444msgid "Day"
433msgstr ""445msgstr ""
434446
435#: ../calendar.qml:476447#: ../calendar.qml:483
436msgid "Agenda"448msgid "Agenda"
437msgstr ""449msgstr ""
438450

Subscribers

People subscribed via source and target branches

to status/vote changes: