Skip to content

Commit 5c98756

Browse files
perryrh0danperryrh0dan
committed
fix(localization): fixed some bugs
1 parent 093c31f commit 5c98756

File tree

12 files changed

+148
-68
lines changed

12 files changed

+148
-68
lines changed

‎.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"request": "launch",
1111
"name": "Launch Program",
1212
"program": "${workspaceFolder}/dist/cli.js",
13-
"args": ["g"]
13+
"args": ["l", "canceled"]
1414
},
1515
{
1616
"type": "node",

‎i18n/de.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"help": {
3+
"default": "Benutze `--help` um anzufangen.",
34
"archive": "Archivierte Items anzeigen",
45
"begin": "Aufgabe starten/pausieren",
56
"cancel": "Aufgabe abbrechen/wiederaufnehmen",

‎i18n/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"help": {
3+
"default": "Type `tl --help` to get started!",
34
"archive": "Display archived items",
45
"begin": "Start/pause task",
56
"cancel": "Cancel/revive task",

‎i18n/es.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"help": {
3-
3+
"default": "Escriba `tl --help` para comenzar."
44
},
55
"config": {
66
"path": "Configuracion cargada de {0}",

‎src/libs/date.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,8 @@ export const getRelativeHumanizedDate = function(dueDate: Date, now?: Date): str
194194
}
195195

196196
const absValue = Math.abs(value);
197-
debugger;
198197
unit = Localization.instance.get('date.units.' + unit, { type: absValue === 1 ? 0 : 1 });
199198
const humanizedDate = value >= 1 ? `${value} ${unit}` : `${absValue} ${unit}`;
200-
debugger;
201199
const humanizedRelativeDate = value >= 1 ? Localization.instance.getf('date.due_in', { params: [humanizedDate] }) : Localization.instance.getf('date.due_ago', { params: [humanizedDate] });
202200
return humanizedRelativeDate;
203201
};

‎src/localization.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ export class Localization {
3636
}
3737
this.default = this.load('en');
3838
} catch (error) {
39-
debugger;
4039
Renderer.instance.invalidLanguageFile();
4140
process.exit(1);
4241
}

‎src/renderer.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,6 @@ export class Renderer {
289289
message.push(this.printColor('task.priority.high', '(!!)'));
290290
}
291291

292-
debugger;
293292
return message.join(' ');
294293
}
295294

@@ -446,12 +445,8 @@ export class Renderer {
446445
});
447446
}
448447

449-
if (pending + inProgress + complete + notes === 0) {
450-
this.signale.log({
451-
prefix: '\n ',
452-
message: Localization.instance.get('help'),
453-
suffix: this.printColor('icons.star', '★')
454-
});
448+
if (pending + inProgress + canceled + complete + notes === 0) {
449+
return console.log(Localization.instance.get('help.default'));
455450
}
456451

457452
this.signale.log({

‎src/taskline.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,8 @@ export class Taskline {
347347
return data;
348348
}
349349

350+
debugger;
351+
350352
attr.forEach((x: string) => {
351353
switch (x) {
352354
case 'star':

‎test/begin.spec.ts

Lines changed: 66 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -17,40 +17,46 @@ describe('Test begin functionality', () => {
1717
await helper.clearStorage();
1818
const data: Array<Item> = new Array<Item>();
1919

20-
data.push(new Note({
21-
id: 1,
22-
date: 'Mon Sep 02 2019',
23-
timestamp: 1567434272855,
24-
description: 'Test Note',
25-
isStarred: false,
26-
boards: ['My Board']
27-
}));
28-
29-
data.push(new Task({
30-
id: 2,
31-
date: 'Mon Sep 02 2019',
32-
timestamp: 1567434272855,
33-
description: 'Test Task',
34-
isStarred: false,
35-
boards: ['My Board'],
36-
dueDate: 0,
37-
isComplete: false,
38-
inProgress: false,
39-
priority: 1
40-
}));
41-
42-
data.push(new Task({
43-
id: 3,
44-
date: 'Mon Sep 02 2019',
45-
timestamp: 1567434272855,
46-
description: 'Second Test Task',
47-
isStarred: false,
48-
boards: ['My Board'],
49-
dueDate: 0,
50-
isComplete: false,
51-
inProgress: false,
52-
priority: 1
53-
}));
20+
data.push(
21+
new Note({
22+
id: 1,
23+
date: 'Mon Sep 02 2019',
24+
timestamp: 1567434272855,
25+
description: 'Test Note',
26+
isStarred: false,
27+
boards: ['My Board']
28+
})
29+
);
30+
31+
data.push(
32+
new Task({
33+
id: 2,
34+
date: 'Mon Sep 02 2019',
35+
timestamp: 1567434272855,
36+
description: 'Test Task',
37+
isStarred: false,
38+
boards: ['My Board'],
39+
dueDate: 0,
40+
isComplete: false,
41+
inProgress: false,
42+
priority: 1
43+
})
44+
);
45+
46+
data.push(
47+
new Task({
48+
id: 3,
49+
date: 'Mon Sep 02 2019',
50+
timestamp: 1567434272855,
51+
description: 'Second Test Task',
52+
isStarred: false,
53+
boards: ['My Board'],
54+
dueDate: 0,
55+
isComplete: false,
56+
inProgress: false,
57+
priority: 1
58+
})
59+
);
5460

5561
await helper.setData(data);
5662
done();
@@ -73,6 +79,7 @@ describe('Test begin functionality', () => {
7379
expect((data[0] as Task).isCanceled).toBe(false);
7480
expect((data[0] as Task).isComplete).toBe(false);
7581
expect((data[0] as Task).passedTime).toBeGreaterThan(0);
82+
expect((data[0] as Task).lastStartTime).toBe(0);
7683
});
7784

7885
it('should continue one task', async() => {
@@ -83,31 +90,35 @@ describe('Test begin functionality', () => {
8390
expect((data[0] as Task).isCanceled).toBe(false);
8491
expect((data[0] as Task).isComplete).toBe(false);
8592
expect((data[0] as Task).passedTime).toBeGreaterThan(0);
86-
expect((data[0] as Task).lastStartTime).toBeGreaterThan(now.getTime());
93+
expect((data[0] as Task).lastStartTime).toBeGreaterThanOrEqual(
94+
now.getTime()
95+
);
8796
});
8897

89-
it('should begin multiple tasks', () => {
90-
return taskline.beginTasks('2,3').then(() => {
91-
return helper.getData([2, 3]).then((data: any) => {
92-
expect((data[0] as Task).inProgress).toBe(false);
93-
expect((data[0] as Task).isCanceled).toBe(false);
94-
expect((data[0] as Task).isComplete).toBe(false);
95-
expect((data[1] as Task).inProgress).toBe(true);
96-
expect((data[1] as Task).isCanceled).toBe(false);
97-
expect((data[1] as Task).isComplete).toBe(false);
98-
});
99-
});
98+
it('should begin multiple tasks', async() => {
99+
const now = new Date();
100+
await taskline.beginTasks('2,3');
101+
const data: Array<Item> = await helper.getData([2, 3]);
102+
expect((data[0] as Task).inProgress).toBe(false);
103+
expect((data[0] as Task).isCanceled).toBe(false);
104+
expect((data[0] as Task).isComplete).toBe(false);
105+
expect((data[0] as Task).passedTime).toBeGreaterThan(0);
106+
expect((data[0] as Task).lastStartTime).toBe(0);
107+
expect((data[1] as Task).inProgress).toBe(true);
108+
expect((data[1] as Task).isCanceled).toBe(false);
109+
expect((data[1] as Task).isComplete).toBe(false);
110+
expect((data[1] as Task).lastStartTime).toBeGreaterThanOrEqual(
111+
now.getTime()
112+
);
100113
});
101114

102-
it('should begin multiple tasks by id range', () => {
103-
return taskline.beginTasks('2-3').then(() => {
104-
return helper.getData([2, 3]).then((data: any) => {
105-
expect((data[0] as Task).inProgress).toBe(true);
106-
expect((data[0] as Task).isComplete).toBe(false);
107-
expect((data[1] as Task).inProgress).toBe(false);
108-
expect((data[1] as Task).isComplete).toBe(false);
109-
});
110-
});
115+
it('should begin multiple tasks by id range', async() => {
116+
await taskline.beginTasks('2-3');
117+
const data: Array<Item> = await helper.getData([2, 3]);
118+
expect((data[0] as Task).inProgress).toBe(true);
119+
expect((data[0] as Task).isComplete).toBe(false);
120+
expect((data[1] as Task).inProgress).toBe(false);
121+
expect((data[1] as Task).isComplete).toBe(false);
111122
});
112123

113124
it('should try to begin nonexisting item', () => {

‎test/cancel.spec.ts

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,22 @@ describe('Test check functionality', () => {
6565
priority: 1
6666
}));
6767

68+
data.push(new Task({
69+
id: 5,
70+
date: 'Mon Sep 02 2019',
71+
timestamp: 1567434272855,
72+
description: 'Fourth Test Task',
73+
isStarred: false,
74+
boards: ['My Board'],
75+
dueDate: 0,
76+
isComplete: false,
77+
inProgress: true,
78+
isCanceled: false,
79+
priority: 1,
80+
passedTime: 100,
81+
lastStartTime: new Date().getTime(),
82+
}));
83+
6884
await helper.setData(data);
6985
done();
7086
});
@@ -104,6 +120,16 @@ describe('Test check functionality', () => {
104120
expect((data[2] as Task).isCanceled).toBe(true);
105121
});
106122

123+
it('should cancel an active task', async() => {
124+
await taskline.cancelTasks('5');
125+
const data = await helper.getData([5]);
126+
expect((data[0] as Task).inProgress).toBe(false);
127+
expect((data[0] as Task).isCanceled).toBe(true);
128+
expect((data[0] as Task).isComplete).toBe(false);
129+
expect((data[0] as Task).lastStartTime).toBe(0);
130+
expect((data[0] as Task).passedTime).toBeGreaterThan(100);
131+
});
132+
107133
it('should delete all canceled tasks', async() => {
108134
const data = await helper.getData([2, 3, 4]);
109135
const oldData = JSON.parse(JSON.stringify(data));

0 commit comments

Comments
 (0)