Skip to content

Commit 5ef148e

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents ae91877 + a2ad088 commit 5ef148e

Some content is hidden

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

87 files changed

+1208
-1214
lines changed

core/Objects/Item.vala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1519,12 +1519,11 @@ public class Objects.Item : Objects.BaseObject {
15191519
}
15201520

15211521
public void move (Objects.Project project, string _section_id) {
1522-
loading = true;
1523-
show_item = false;
1524-
15251522
if (project.source_type == SourceType.LOCAL) {
15261523
_move (project.id, _section_id);
15271524
} else if (project.source_type == SourceType.TODOIST) {
1525+
loading = true;
1526+
15281527
string move_id = project.id;
15291528
string move_type = "project_id";
15301529
if (_section_id != "") {
@@ -1535,7 +1534,6 @@ public class Objects.Item : Objects.BaseObject {
15351534
Services.Todoist.get_default ().move_item.begin (this, move_type, move_id, (obj, res) => {
15361535
var response = Services.Todoist.get_default ().move_item.end (res);
15371536
loading = false;
1538-
show_item = true;
15391537

15401538
if (response.status) {
15411539
_move (project.id, _section_id);
@@ -1544,6 +1542,8 @@ public class Objects.Item : Objects.BaseObject {
15441542
}
15451543
});
15461544
} else if (project.source_type == SourceType.CALDAV) {
1545+
loading = true;
1546+
15471547
move_caldav_recursive.begin (project, _section_id);
15481548
}
15491549
}

data/translations_metrics.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"nl": {
33
"language": "Dutch",
44
"total_strings": 693,
5-
"translated_strings": 529,
6-
"translated_percent": 76.3
5+
"translated_strings": 533,
6+
"translated_percent": 76.9
77
},
88
"tr": {
99
"language": "Turkish",
@@ -74,8 +74,8 @@
7474
"ru": {
7575
"language": "Russian",
7676
"total_strings": 693,
77-
"translated_strings": 693,
78-
"translated_percent": 100.0
77+
"translated_strings": 692,
78+
"translated_percent": 99.8
7979
},
8080
"sk": {
8181
"language": "Slovak",
@@ -260,8 +260,8 @@
260260
"it": {
261261
"language": "Italian",
262262
"total_strings": 693,
263-
"translated_strings": 18,
264-
"translated_percent": 2.5
263+
"translated_strings": 79,
264+
"translated_percent": 11.3
265265
},
266266
"ja": {
267267
"language": "Japanese",
@@ -374,8 +374,8 @@
374374
"pl": {
375375
"language": "Polish",
376376
"total_strings": 693,
377-
"translated_strings": 12,
378-
"translated_percent": 1.7
377+
"translated_strings": 15,
378+
"translated_percent": 2.1
379379
},
380380
"ro": {
381381
"language": "Romanian",

po/af.po

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ msgstr ""
113113
#: core/Enum.vala:345 core/Enum.vala:531 core/Widgets/PriorityButton.vala:90
114114
#: src/Views/Project/Project.vala:488 src/Views/Project/Project.vala:533
115115
#: src/Views/Scheduled/Scheduled.vala:228
116-
#: src/Views/Scheduled/Scheduled.vala:257 src/Views/Today.vala:624
117-
#: src/Views/Today.vala:653 src/Widgets/ItemDetailCompleted.vala:82
116+
#: src/Views/Scheduled/Scheduled.vala:257 src/Views/Today.vala:615
117+
#: src/Views/Today.vala:644 src/Widgets/ItemDetailCompleted.vala:82
118118
msgid "Priority"
119119
msgstr ""
120120

@@ -123,7 +123,7 @@ msgid "Label"
123123
msgstr ""
124124

125125
#: core/Enum.vala:351 src/Views/Project/Project.vala:486
126-
#: src/Views/Scheduled/Scheduled.vala:226 src/Views/Today.vala:622
126+
#: src/Views/Scheduled/Scheduled.vala:226 src/Views/Today.vala:613
127127
msgid "Due Date"
128128
msgstr ""
129129

@@ -1396,7 +1396,7 @@ msgid "This will delete %d completed tasks and their subtasks from project %s"
13961396
msgstr ""
13971397

13981398
#: src/Dialogs/CompletedTasks.vala:322 src/Views/Project/Project.vala:581
1399-
#: src/Views/Scheduled/Scheduled.vala:268 src/Views/Today.vala:664
1399+
#: src/Views/Scheduled/Scheduled.vala:268 src/Views/Today.vala:655
14001400
msgid "Filter By"
14011401
msgstr ""
14021402

@@ -1821,7 +1821,7 @@ msgstr ""
18211821

18221822
#: src/Dialogs/Preferences/Pages/General.vala:37
18231823
#: src/Views/Project/Project.vala:485 src/Views/Scheduled/Scheduled.vala:225
1824-
#: src/Views/Today.vala:621
1824+
#: src/Views/Today.vala:612
18251825
msgid "Alphabetically"
18261826
msgstr ""
18271827

@@ -2724,7 +2724,7 @@ msgid "Board"
27242724
msgstr ""
27252725

27262726
#: src/Views/Project/Project.vala:481 src/Views/Scheduled/Scheduled.vala:222
2727-
#: src/Views/Today.vala:618
2727+
#: src/Views/Today.vala:609
27282728
msgid "Sorting"
27292729
msgstr ""
27302730

@@ -2733,7 +2733,7 @@ msgid "Custom sort order"
27332733
msgstr ""
27342734

27352735
#: src/Views/Project/Project.vala:487 src/Views/Scheduled/Scheduled.vala:227
2736-
#: src/Views/Today.vala:623
2736+
#: src/Views/Today.vala:614
27372737
msgid "Date Added"
27382738
msgstr ""
27392739

@@ -2766,27 +2766,27 @@ msgid "Next 30 Days"
27662766
msgstr ""
27672767

27682768
#: src/Views/Project/Project.vala:511 src/Views/Scheduled/Scheduled.vala:235
2769-
#: src/Views/Today.vala:631
2769+
#: src/Views/Today.vala:622
27702770
msgid "P1"
27712771
msgstr ""
27722772

27732773
#: src/Views/Project/Project.vala:517 src/Views/Scheduled/Scheduled.vala:241
2774-
#: src/Views/Today.vala:637
2774+
#: src/Views/Today.vala:628
27752775
msgid "P2"
27762776
msgstr ""
27772777

27782778
#: src/Views/Project/Project.vala:523 src/Views/Scheduled/Scheduled.vala:247
2779-
#: src/Views/Today.vala:643
2779+
#: src/Views/Today.vala:634
27802780
msgid "P3"
27812781
msgstr ""
27822782

27832783
#: src/Views/Project/Project.vala:529 src/Views/Scheduled/Scheduled.vala:253
2784-
#: src/Views/Today.vala:649
2784+
#: src/Views/Today.vala:640
27852785
msgid "P4"
27862786
msgstr ""
27872787

27882788
#: src/Views/Project/Project.vala:536 src/Views/Scheduled/Scheduled.vala:260
2789-
#: src/Views/Today.vala:656
2789+
#: src/Views/Today.vala:647
27902790
msgid "Filter by Labels"
27912791
msgstr ""
27922792

po/ak.po

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ msgstr ""
113113
#: core/Enum.vala:345 core/Enum.vala:531 core/Widgets/PriorityButton.vala:90
114114
#: src/Views/Project/Project.vala:488 src/Views/Project/Project.vala:533
115115
#: src/Views/Scheduled/Scheduled.vala:228
116-
#: src/Views/Scheduled/Scheduled.vala:257 src/Views/Today.vala:624
117-
#: src/Views/Today.vala:653 src/Widgets/ItemDetailCompleted.vala:82
116+
#: src/Views/Scheduled/Scheduled.vala:257 src/Views/Today.vala:615
117+
#: src/Views/Today.vala:644 src/Widgets/ItemDetailCompleted.vala:82
118118
msgid "Priority"
119119
msgstr ""
120120

@@ -123,7 +123,7 @@ msgid "Label"
123123
msgstr ""
124124

125125
#: core/Enum.vala:351 src/Views/Project/Project.vala:486
126-
#: src/Views/Scheduled/Scheduled.vala:226 src/Views/Today.vala:622
126+
#: src/Views/Scheduled/Scheduled.vala:226 src/Views/Today.vala:613
127127
msgid "Due Date"
128128
msgstr ""
129129

@@ -1396,7 +1396,7 @@ msgid "This will delete %d completed tasks and their subtasks from project %s"
13961396
msgstr ""
13971397

13981398
#: src/Dialogs/CompletedTasks.vala:322 src/Views/Project/Project.vala:581
1399-
#: src/Views/Scheduled/Scheduled.vala:268 src/Views/Today.vala:664
1399+
#: src/Views/Scheduled/Scheduled.vala:268 src/Views/Today.vala:655
14001400
msgid "Filter By"
14011401
msgstr ""
14021402

@@ -1821,7 +1821,7 @@ msgstr ""
18211821

18221822
#: src/Dialogs/Preferences/Pages/General.vala:37
18231823
#: src/Views/Project/Project.vala:485 src/Views/Scheduled/Scheduled.vala:225
1824-
#: src/Views/Today.vala:621
1824+
#: src/Views/Today.vala:612
18251825
msgid "Alphabetically"
18261826
msgstr ""
18271827

@@ -2724,7 +2724,7 @@ msgid "Board"
27242724
msgstr ""
27252725

27262726
#: src/Views/Project/Project.vala:481 src/Views/Scheduled/Scheduled.vala:222
2727-
#: src/Views/Today.vala:618
2727+
#: src/Views/Today.vala:609
27282728
msgid "Sorting"
27292729
msgstr ""
27302730

@@ -2733,7 +2733,7 @@ msgid "Custom sort order"
27332733
msgstr ""
27342734

27352735
#: src/Views/Project/Project.vala:487 src/Views/Scheduled/Scheduled.vala:227
2736-
#: src/Views/Today.vala:623
2736+
#: src/Views/Today.vala:614
27372737
msgid "Date Added"
27382738
msgstr ""
27392739

@@ -2766,27 +2766,27 @@ msgid "Next 30 Days"
27662766
msgstr ""
27672767

27682768
#: src/Views/Project/Project.vala:511 src/Views/Scheduled/Scheduled.vala:235
2769-
#: src/Views/Today.vala:631
2769+
#: src/Views/Today.vala:622
27702770
msgid "P1"
27712771
msgstr ""
27722772

27732773
#: src/Views/Project/Project.vala:517 src/Views/Scheduled/Scheduled.vala:241
2774-
#: src/Views/Today.vala:637
2774+
#: src/Views/Today.vala:628
27752775
msgid "P2"
27762776
msgstr ""
27772777

27782778
#: src/Views/Project/Project.vala:523 src/Views/Scheduled/Scheduled.vala:247
2779-
#: src/Views/Today.vala:643
2779+
#: src/Views/Today.vala:634
27802780
msgid "P3"
27812781
msgstr ""
27822782

27832783
#: src/Views/Project/Project.vala:529 src/Views/Scheduled/Scheduled.vala:253
2784-
#: src/Views/Today.vala:649
2784+
#: src/Views/Today.vala:640
27852785
msgid "P4"
27862786
msgstr ""
27872787

27882788
#: src/Views/Project/Project.vala:536 src/Views/Scheduled/Scheduled.vala:260
2789-
#: src/Views/Today.vala:656
2789+
#: src/Views/Today.vala:647
27902790
msgid "Filter by Labels"
27912791
msgstr ""
27922792

po/ar.po

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ msgstr "CalDAV"
114114
#: core/Enum.vala:345 core/Enum.vala:531 core/Widgets/PriorityButton.vala:90
115115
#: src/Views/Project/Project.vala:488 src/Views/Project/Project.vala:533
116116
#: src/Views/Scheduled/Scheduled.vala:228
117-
#: src/Views/Scheduled/Scheduled.vala:257 src/Views/Today.vala:624
118-
#: src/Views/Today.vala:653 src/Widgets/ItemDetailCompleted.vala:82
117+
#: src/Views/Scheduled/Scheduled.vala:257 src/Views/Today.vala:615
118+
#: src/Views/Today.vala:644 src/Widgets/ItemDetailCompleted.vala:82
119119
msgid "Priority"
120120
msgstr "الأولوية"
121121

@@ -124,7 +124,7 @@ msgid "Label"
124124
msgstr "ملصق"
125125

126126
#: core/Enum.vala:351 src/Views/Project/Project.vala:486
127-
#: src/Views/Scheduled/Scheduled.vala:226 src/Views/Today.vala:622
127+
#: src/Views/Scheduled/Scheduled.vala:226 src/Views/Today.vala:613
128128
msgid "Due Date"
129129
msgstr "تاريخ الاستحقاق"
130130

@@ -1399,7 +1399,7 @@ msgid "This will delete %d completed tasks and their subtasks from project %s"
13991399
msgstr ""
14001400

14011401
#: src/Dialogs/CompletedTasks.vala:322 src/Views/Project/Project.vala:581
1402-
#: src/Views/Scheduled/Scheduled.vala:268 src/Views/Today.vala:664
1402+
#: src/Views/Scheduled/Scheduled.vala:268 src/Views/Today.vala:655
14031403
msgid "Filter By"
14041404
msgstr ""
14051405

@@ -1824,7 +1824,7 @@ msgstr ""
18241824

18251825
#: src/Dialogs/Preferences/Pages/General.vala:37
18261826
#: src/Views/Project/Project.vala:485 src/Views/Scheduled/Scheduled.vala:225
1827-
#: src/Views/Today.vala:621
1827+
#: src/Views/Today.vala:612
18281828
msgid "Alphabetically"
18291829
msgstr ""
18301830

@@ -2727,7 +2727,7 @@ msgid "Board"
27272727
msgstr ""
27282728

27292729
#: src/Views/Project/Project.vala:481 src/Views/Scheduled/Scheduled.vala:222
2730-
#: src/Views/Today.vala:618
2730+
#: src/Views/Today.vala:609
27312731
msgid "Sorting"
27322732
msgstr ""
27332733

@@ -2736,7 +2736,7 @@ msgid "Custom sort order"
27362736
msgstr ""
27372737

27382738
#: src/Views/Project/Project.vala:487 src/Views/Scheduled/Scheduled.vala:227
2739-
#: src/Views/Today.vala:623
2739+
#: src/Views/Today.vala:614
27402740
msgid "Date Added"
27412741
msgstr ""
27422742

@@ -2769,27 +2769,27 @@ msgid "Next 30 Days"
27692769
msgstr ""
27702770

27712771
#: src/Views/Project/Project.vala:511 src/Views/Scheduled/Scheduled.vala:235
2772-
#: src/Views/Today.vala:631
2772+
#: src/Views/Today.vala:622
27732773
msgid "P1"
27742774
msgstr ""
27752775

27762776
#: src/Views/Project/Project.vala:517 src/Views/Scheduled/Scheduled.vala:241
2777-
#: src/Views/Today.vala:637
2777+
#: src/Views/Today.vala:628
27782778
msgid "P2"
27792779
msgstr ""
27802780

27812781
#: src/Views/Project/Project.vala:523 src/Views/Scheduled/Scheduled.vala:247
2782-
#: src/Views/Today.vala:643
2782+
#: src/Views/Today.vala:634
27832783
msgid "P3"
27842784
msgstr ""
27852785

27862786
#: src/Views/Project/Project.vala:529 src/Views/Scheduled/Scheduled.vala:253
2787-
#: src/Views/Today.vala:649
2787+
#: src/Views/Today.vala:640
27882788
msgid "P4"
27892789
msgstr ""
27902790

27912791
#: src/Views/Project/Project.vala:536 src/Views/Scheduled/Scheduled.vala:260
2792-
#: src/Views/Today.vala:656
2792+
#: src/Views/Today.vala:647
27932793
msgid "Filter by Labels"
27942794
msgstr ""
27952795

0 commit comments

Comments
 (0)