Skip to content

Commit bcbf0c5

Browse files
alainm23alainm23
authored
Merge branch 'master' into weblate-planner-io-github-alainm23-planify
2 parents e4bb2a5 + b596d85 commit bcbf0c5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+668
-942
lines changed

‎core/Objects/Item.vala‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,16 @@ public class Objects.Item : Objects.BaseObject {
538538
if (sort_order_str != null) {
539539
child_order = int.parse (sort_order_str);
540540
}
541+
} else {
542+
// Items without an X-APPLE-SORT-ORDER must use the time in seconds
543+
// since 2001-01-01-00:00:00 (978307200L) as their sort order
544+
ICal.Property ? created_property = ical_vtodo.get_first_property (ICal.PropertyKind.CREATED_PROPERTY);
545+
if (created_property != null) {
546+
var create_time = (long) created_property.get_created ().as_timet ();
547+
child_order = (int)(create_time - 978307200L);
548+
} else {
549+
// TODO should probably emit a warning that manual sorting will not work?
550+
}
541551
}
542552

543553
ICal.Property ? pinned_property = ical_vtodo.get_first_property (ICal.PropertyKind.from_string ("X-PINNED"));

‎po/POTFILES‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ src/Views/Scheduled/ScheduledDay.vala
190190
src/Views/Scheduled/ScheduledMonth.vala
191191
src/Views/Scheduled/ScheduledOverdue.vala
192192
src/Views/Scheduled/ScheduledRange.vala
193+
src/Views/Scheduled/ScheduledSection.vala
193194
src/Views/Today.vala
194195
src/Widgets/AttachmentRow.vala
195196
src/Widgets/Attachments.vala

‎po/af.po‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,11 +310,11 @@ msgstr ""
310310
msgid "unlabeled"
311311
msgstr ""
312312

313-
#: core/Objects/Item.vala:1374
313+
#: core/Objects/Item.vala:1384
314314
msgid "Task copied to clipboard"
315315
msgstr ""
316316

317-
#: core/Objects/Item.vala:1667 core/Utils/Util.vala:885
317+
#: core/Objects/Item.vala:1677 core/Utils/Util.vala:885
318318
#: src/Widgets/MultiSelectToolbar.vala:376
319319
#: src/Widgets/MultiSelectToolbar.vala:379
320320
#, c-format
@@ -2957,11 +2957,11 @@ msgstr ""
29572957
msgid "Sort By"
29582958
msgstr ""
29592959

2960-
#: src/Views/Scheduled/ScheduledOverdue.vala:46 src/Views/Today.vala:155
2960+
#: src/Views/Scheduled/ScheduledOverdue.vala:38 src/Views/Today.vala:155
29612961
msgid "Overdue"
29622962
msgstr ""
29632963

2964-
#: src/Views/Scheduled/ScheduledOverdue.vala:51 src/Views/Today.vala:163
2964+
#: src/Views/Scheduled/ScheduledOverdue.vala:43 src/Views/Today.vala:163
29652965
msgid "Reschedule"
29662966
msgstr ""
29672967

‎po/ak.po‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,11 +310,11 @@ msgstr ""
310310
msgid "unlabeled"
311311
msgstr ""
312312

313-
#: core/Objects/Item.vala:1374
313+
#: core/Objects/Item.vala:1384
314314
msgid "Task copied to clipboard"
315315
msgstr ""
316316

317-
#: core/Objects/Item.vala:1667 core/Utils/Util.vala:885
317+
#: core/Objects/Item.vala:1677 core/Utils/Util.vala:885
318318
#: src/Widgets/MultiSelectToolbar.vala:376
319319
#: src/Widgets/MultiSelectToolbar.vala:379
320320
#, c-format
@@ -2957,11 +2957,11 @@ msgstr ""
29572957
msgid "Sort By"
29582958
msgstr ""
29592959

2960-
#: src/Views/Scheduled/ScheduledOverdue.vala:46 src/Views/Today.vala:155
2960+
#: src/Views/Scheduled/ScheduledOverdue.vala:38 src/Views/Today.vala:155
29612961
msgid "Overdue"
29622962
msgstr ""
29632963

2964-
#: src/Views/Scheduled/ScheduledOverdue.vala:51 src/Views/Today.vala:163
2964+
#: src/Views/Scheduled/ScheduledOverdue.vala:43 src/Views/Today.vala:163
29652965
msgid "Reschedule"
29662966
msgstr ""
29672967

‎po/ar.po‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -335,11 +335,11 @@ msgstr "لا اسم"
335335
msgid "unlabeled"
336336
msgstr "غير مسمى"
337337

338-
#: core/Objects/Item.vala:1374
338+
#: core/Objects/Item.vala:1384
339339
msgid "Task copied to clipboard"
340340
msgstr "تم نسخ المهمة الى الحافظة"
341341

342-
#: core/Objects/Item.vala:1667 core/Utils/Util.vala:885
342+
#: core/Objects/Item.vala:1677 core/Utils/Util.vala:885
343343
#: src/Widgets/MultiSelectToolbar.vala:376
344344
#: src/Widgets/MultiSelectToolbar.vala:379
345345
#, fuzzy, c-format
@@ -3012,11 +3012,11 @@ msgstr ""
30123012
msgid "Sort By"
30133013
msgstr ""
30143014

3015-
#: src/Views/Scheduled/ScheduledOverdue.vala:46 src/Views/Today.vala:155
3015+
#: src/Views/Scheduled/ScheduledOverdue.vala:38 src/Views/Today.vala:155
30163016
msgid "Overdue"
30173017
msgstr ""
30183018

3019-
#: src/Views/Scheduled/ScheduledOverdue.vala:51 src/Views/Today.vala:163
3019+
#: src/Views/Scheduled/ScheduledOverdue.vala:43 src/Views/Today.vala:163
30203020
msgid "Reschedule"
30213021
msgstr ""
30223022

‎po/az.po‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,11 +310,11 @@ msgstr ""
310310
msgid "unlabeled"
311311
msgstr ""
312312

313-
#: core/Objects/Item.vala:1374
313+
#: core/Objects/Item.vala:1384
314314
msgid "Task copied to clipboard"
315315
msgstr ""
316316

317-
#: core/Objects/Item.vala:1667 core/Utils/Util.vala:885
317+
#: core/Objects/Item.vala:1677 core/Utils/Util.vala:885
318318
#: src/Widgets/MultiSelectToolbar.vala:376
319319
#: src/Widgets/MultiSelectToolbar.vala:379
320320
#, c-format
@@ -2957,11 +2957,11 @@ msgstr ""
29572957
msgid "Sort By"
29582958
msgstr ""
29592959

2960-
#: src/Views/Scheduled/ScheduledOverdue.vala:46 src/Views/Today.vala:155
2960+
#: src/Views/Scheduled/ScheduledOverdue.vala:38 src/Views/Today.vala:155
29612961
msgid "Overdue"
29622962
msgstr ""
29632963

2964-
#: src/Views/Scheduled/ScheduledOverdue.vala:51 src/Views/Today.vala:163
2964+
#: src/Views/Scheduled/ScheduledOverdue.vala:43 src/Views/Today.vala:163
29652965
msgid "Reschedule"
29662966
msgstr ""
29672967

‎po/be.po‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -317,11 +317,11 @@ msgstr ""
317317
msgid "unlabeled"
318318
msgstr ""
319319

320-
#: core/Objects/Item.vala:1374
320+
#: core/Objects/Item.vala:1384
321321
msgid "Task copied to clipboard"
322322
msgstr ""
323323

324-
#: core/Objects/Item.vala:1667 core/Utils/Util.vala:885
324+
#: core/Objects/Item.vala:1677 core/Utils/Util.vala:885
325325
#: src/Widgets/MultiSelectToolbar.vala:376
326326
#: src/Widgets/MultiSelectToolbar.vala:379
327327
#, c-format
@@ -2971,11 +2971,11 @@ msgstr ""
29712971
msgid "Sort By"
29722972
msgstr ""
29732973

2974-
#: src/Views/Scheduled/ScheduledOverdue.vala:46 src/Views/Today.vala:155
2974+
#: src/Views/Scheduled/ScheduledOverdue.vala:38 src/Views/Today.vala:155
29752975
msgid "Overdue"
29762976
msgstr ""
29772977

2978-
#: src/Views/Scheduled/ScheduledOverdue.vala:51 src/Views/Today.vala:163
2978+
#: src/Views/Scheduled/ScheduledOverdue.vala:43 src/Views/Today.vala:163
29792979
msgid "Reschedule"
29802980
msgstr ""
29812981

‎po/bg.po‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -312,13 +312,13 @@ msgstr "без етикет"
312312
msgid "unlabeled"
313313
msgstr "без етикет"
314314

315-
#: core/Objects/Item.vala:1374
315+
#: core/Objects/Item.vala:1384
316316
msgid "Task copied to clipboard"
317317
msgstr "Задачата е копирана в буфера за обмен"
318318

319319
# c-format
320320
# c-format
321-
#: core/Objects/Item.vala:1667 core/Utils/Util.vala:885
321+
#: core/Objects/Item.vala:1677 core/Utils/Util.vala:885
322322
#: src/Widgets/MultiSelectToolbar.vala:376
323323
#: src/Widgets/MultiSelectToolbar.vala:379
324324
#, fuzzy, c-format
@@ -3108,11 +3108,11 @@ msgstr "Показване на завършените задачи"
31083108
msgid "Sort By"
31093109
msgstr "Подреждане по"
31103110

3111-
#: src/Views/Scheduled/ScheduledOverdue.vala:46 src/Views/Today.vala:155
3111+
#: src/Views/Scheduled/ScheduledOverdue.vala:38 src/Views/Today.vala:155
31123112
msgid "Overdue"
31133113
msgstr "Просрочено"
31143114

3115-
#: src/Views/Scheduled/ScheduledOverdue.vala:51 src/Views/Today.vala:163
3115+
#: src/Views/Scheduled/ScheduledOverdue.vala:43 src/Views/Today.vala:163
31163116
msgid "Reschedule"
31173117
msgstr "Изместване"
31183118

‎po/bn.po‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,11 +310,11 @@ msgstr ""
310310
msgid "unlabeled"
311311
msgstr ""
312312

313-
#: core/Objects/Item.vala:1374
313+
#: core/Objects/Item.vala:1384
314314
msgid "Task copied to clipboard"
315315
msgstr ""
316316

317-
#: core/Objects/Item.vala:1667 core/Utils/Util.vala:885
317+
#: core/Objects/Item.vala:1677 core/Utils/Util.vala:885
318318
#: src/Widgets/MultiSelectToolbar.vala:376
319319
#: src/Widgets/MultiSelectToolbar.vala:379
320320
#, c-format
@@ -2957,11 +2957,11 @@ msgstr ""
29572957
msgid "Sort By"
29582958
msgstr ""
29592959

2960-
#: src/Views/Scheduled/ScheduledOverdue.vala:46 src/Views/Today.vala:155
2960+
#: src/Views/Scheduled/ScheduledOverdue.vala:38 src/Views/Today.vala:155
29612961
msgid "Overdue"
29622962
msgstr ""
29632963

2964-
#: src/Views/Scheduled/ScheduledOverdue.vala:51 src/Views/Today.vala:163
2964+
#: src/Views/Scheduled/ScheduledOverdue.vala:43 src/Views/Today.vala:163
29652965
msgid "Reschedule"
29662966
msgstr ""
29672967

‎po/bs.po‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -317,11 +317,11 @@ msgstr ""
317317
msgid "unlabeled"
318318
msgstr ""
319319

320-
#: core/Objects/Item.vala:1374
320+
#: core/Objects/Item.vala:1384
321321
msgid "Task copied to clipboard"
322322
msgstr ""
323323

324-
#: core/Objects/Item.vala:1667 core/Utils/Util.vala:885
324+
#: core/Objects/Item.vala:1677 core/Utils/Util.vala:885
325325
#: src/Widgets/MultiSelectToolbar.vala:376
326326
#: src/Widgets/MultiSelectToolbar.vala:379
327327
#, c-format
@@ -2971,11 +2971,11 @@ msgstr ""
29712971
msgid "Sort By"
29722972
msgstr ""
29732973

2974-
#: src/Views/Scheduled/ScheduledOverdue.vala:46 src/Views/Today.vala:155
2974+
#: src/Views/Scheduled/ScheduledOverdue.vala:38 src/Views/Today.vala:155
29752975
msgid "Overdue"
29762976
msgstr ""
29772977

2978-
#: src/Views/Scheduled/ScheduledOverdue.vala:51 src/Views/Today.vala:163
2978+
#: src/Views/Scheduled/ScheduledOverdue.vala:43 src/Views/Today.vala:163
29792979
msgid "Reschedule"
29802980
msgstr ""
29812981

0 commit comments

Comments
 (0)