cal: fix thursday typo (#1776)

This commit is contained in:
Hoàng Đức Hiếu
2020-05-13 19:06:31 +07:00
committed by GitHub
parent 196991ae1e
commit e3b7e47515
3 changed files with 160 additions and 160 deletions

View File

@ -174,7 +174,7 @@ fn add_month_to_table(
"monday",
"tuesday",
"wednesday",
"thurday",
"thursday",
"friday",
"saturday",
];

View File

@ -9,7 +9,7 @@ fn cal_full_year() {
"#
));
let first_week_2010_json = r#"{"year":2010,"sunday":null,"monday":null,"tuesday":null,"wednesday":null,"thurday":null,"friday":1,"saturday":2}"#;
let first_week_2010_json = r#"{"year":2010,"sunday":null,"monday":null,"tuesday":null,"wednesday":null,"thursday":null,"friday":1,"saturday":2}"#;
assert_eq!(actual.out, first_week_2010_json);
}
@ -23,7 +23,7 @@ fn cal_february_2020_leap_year() {
"#
));
let cal_february_json = r#"[{"year":2020,"month":"february","sunday":null,"monday":null,"tuesday":null,"wednesday":null,"thurday":null,"friday":null,"saturday":1},{"year":2020,"month":"february","sunday":2,"monday":3,"tuesday":4,"wednesday":5,"thurday":6,"friday":7,"saturday":8},{"year":2020,"month":"february","sunday":9,"monday":10,"tuesday":11,"wednesday":12,"thurday":13,"friday":14,"saturday":15},{"year":2020,"month":"february","sunday":16,"monday":17,"tuesday":18,"wednesday":19,"thurday":20,"friday":21,"saturday":22},{"year":2020,"month":"february","sunday":23,"monday":24,"tuesday":25,"wednesday":26,"thurday":27,"friday":28,"saturday":29}]"#;
let cal_february_json = r#"[{"year":2020,"month":"february","sunday":null,"monday":null,"tuesday":null,"wednesday":null,"thursday":null,"friday":null,"saturday":1},{"year":2020,"month":"february","sunday":2,"monday":3,"tuesday":4,"wednesday":5,"thursday":6,"friday":7,"saturday":8},{"year":2020,"month":"february","sunday":9,"monday":10,"tuesday":11,"wednesday":12,"thursday":13,"friday":14,"saturday":15},{"year":2020,"month":"february","sunday":16,"monday":17,"tuesday":18,"wednesday":19,"thursday":20,"friday":21,"saturday":22},{"year":2020,"month":"february","sunday":23,"monday":24,"tuesday":25,"wednesday":26,"thursday":27,"friday":28,"saturday":29}]"#;
assert_eq!(actual.out, cal_february_json);
}

View File

@ -14,178 +14,178 @@ Use `cal` to display a calendar.
```shell
> cal
───┬────────┬────────┬─────────┬───────────┬─────────┬────────┬──────────
# │ sunday │ monday │ tuesday │ wednesday │ thurday │ friday │ saturday
───┼────────┼────────┼─────────┼───────────┼─────────┼────────┼──────────
0 │ │ │ │ │ │ 12
13456789
210111213141516
317181920212223
424252627282930
531 │ │ │ │ │ │
───┴────────┴────────┴─────────┴───────────┴─────────┴────────┴──────────
───┬────────┬────────┬─────────┬───────────┬────────-─┬────────┬──────────
# │ sunday │ monday │ tuesday │ wednesday │ thursday │ friday │ saturday
───┼────────┼────────┼─────────┼───────────┼──────-───┼────────┼──────────
0 │ │ │ │ │ 12
13456 789
210111213 141516
317181920 212223
424252627 282930
531 │ │ │ │ │ │
───┴────────┴────────┴─────────┴───────────┴────-─────┴────────┴──────────
```
```shell
> cal -yqm --full-year 2020
────┬──────┬─────────┬───────┬────────┬────────┬─────────┬───────────┬─────────┬────────┬──────────
# │ year │ quarter │ month │ sunday │ monday │ tuesday │ wednesday │ thurday │ friday │ saturday
────┼──────┼─────────┼───────┼────────┼────────┼─────────┼───────────┼─────────┼────────┼──────────
0202011 │ │ │ │ 1234
1202011567891011
220201112131415161718
320201119202122232425
4202011262728293031
5202012 │ │ │ │ │ │ │ 1
62020122345678
72020129101112131415
820201216171819202122
920201223242526272829
102020131234567
11202013891011121314
1220201315161718192021
1320201322232425262728
14202013293031 │ │ │ │
15202024 │ │ │ │ 1234
16202024567891011
1720202412131415161718
1820202419202122232425
192020242627282930 │ │
20202025 │ │ │ │ │ │ 12
212020253456789
2220202510111213141516
2320202517181920212223
2420202524252627282930
2520202531 │ │ │ │ │ │
26202026 │ │ 123456
2720202678910111213
2820202614151617181920
2920202621222324252627
30202026282930 │ │ │ │
31202037 │ │ │ │ 1234
32202037567891011
3320203712131415161718
3420203719202122232425
35202037262728293031
36202038 │ │ │ │ │ │ │ 1
372020382345678
382020389101112131415
3920203816171819202122
4020203823242526272829
412020383031 │ │ │ │ │
42202039 │ │ │ 12345
432020396789101112
4420203913141516171819
4520203920212223242526
4620203927282930 │ │ │
472020410 │ │ │ │ │ 123
48202041045678910
49202041011121314151617
50202041018192021222324
51202041025262728293031
5220204111234567
532020411891011121314
54202041115161718192021
55202041122232425262728
5620204112930 │ │ │ │ │
572020412 │ │ │ 12345
5820204126789101112
59202041213141516171819
60202041220212223242526
6120204122728293031 │ │
────┴──────┴─────────┴───────┴────────┴────────┴─────────┴───────────┴─────────┴────────┴──────────
────┬──────┬─────────┬───────┬────────┬────────┬─────────┬───────────┬───-──────┬────────┬──────────
# │ year │ quarter │ month │ sunday │ monday │ tuesday │ wednesday │ thursday │ friday │ saturday
────┼──────┼─────────┼───────┼────────┼────────┼─────────┼───────────┼────-─────┼────────┼──────────
0202011 │ │ │ │ 1 234
12020115678 91011
220201112131415 161718
320201119202122 232425
420201126272829 3031
5202012 │ │ │ │ │ │ │ 1
62020122345 678
72020129101112 131415
820201216171819 202122
920201223242526 272829
102020131234 567
11202013891011 121314
1220201315161718 192021
1320201322232425 262728
14202013293031 │ │ │ │
15202024 │ │ │ │ 1 234
162020245678 91011
1720202412131415 161718
1820202419202122 232425
1920202426272829 30 │ │
20202025 │ │ │ │ │ 12
212020253456 789
2220202510111213 141516
2320202517181920 212223
2420202524252627 282930
2520202531 │ │ │ │ │ │
26202026 │ │ 123 456
2720202678910 111213
2820202614151617 181920
2920202621222324 252627
30202026282930 │ │ │ │
31202037 │ │ │ │ 1 234
322020375678 91011
3320203712131415 161718
3420203719202122 232425
3520203726272829 3031
36202038 │ │ │ │ │ │ │ 1
372020382345 678
382020389101112 131415
3920203816171819 202122
4020203823242526 272829
412020383031 │ │ │ │ │
42202039 │ │ │ 12 345
432020396789 101112
4420203913141516 171819
4520203920212223 242526
4620203927282930 │ │
472020410 │ │ │ │ │ 123
4820204104567 8910
49202041011121314 151617
50202041018192021 222324
51202041025262728 293031
5220204111234 567
532020411891011 121314
54202041115161718 192021
55202041122232425 262728
5620204112930 │ │ │ │ │
572020412 │ │ │ 12 345
5820204126789 101112
59202041213141516 171819
60202041220212223 242526
61202041227282930 31 │ │
────┴──────┴─────────┴───────┴────────┴────────┴─────────┴───────────┴─-────────┴────────┴──────────
```
```shell
> cal -yqm --full-year 2020 --month-names
────┬──────┬─────────┬───────────┬────────┬────────┬─────────┬───────────┬─────────┬────────┬──────────
# │ year │ quarter │ month │ sunday │ monday │ tuesday │ wednesday │ thurday │ friday │ saturday
────┼──────┼─────────┼───────────┼────────┼────────┼─────────┼───────────┼─────────┼────────┼──────────
020201 │ january │ │ │ │ 1234
120201 │ january │ 567891011
220201 │ january │ 12131415161718
320201 │ january │ 19202122232425
420201 │ january │ 262728293031
520201 │ february │ │ │ │ │ │ │ 1
620201 │ february │ 2345678
720201 │ february │ 9101112131415
820201 │ february │ 16171819202122
920201 │ february │ 23242526272829
1020201 │ march │ 1234567
1120201 │ march │ 891011121314
1220201 │ march │ 15161718192021
1320201 │ march │ 22232425262728
1420201 │ march │ 293031 │ │ │ │
1520202 │ april │ │ │ │ 1234
1620202 │ april │ 567891011
1720202 │ april │ 12131415161718
1820202 │ april │ 19202122232425
1920202 │ april │ 2627282930 │ │
2020202 │ may │ │ │ │ │ │ 12
2120202 │ may │ 3456789
2220202 │ may │ 10111213141516
2320202 │ may │ 17181920212223
2420202 │ may │ 24252627282930
2520202 │ may │ 31 │ │ │ │ │ │
2620202 │ june │ │ 123456
2720202 │ june │ 78910111213
2820202 │ june │ 14151617181920
2920202 │ june │ 21222324252627
3020202 │ june │ 282930 │ │ │ │
3120203 │ july │ │ │ │ 1234
3220203 │ july │ 567891011
3320203 │ july │ 12131415161718
3420203 │ july │ 19202122232425
3520203 │ july │ 262728293031
3620203 │ august │ │ │ │ │ │ │ 1
3720203 │ august │ 2345678
3820203 │ august │ 9101112131415
3920203 │ august │ 16171819202122
4020203 │ august │ 23242526272829
4120203 │ august │ 3031 │ │ │ │ │
4220203 │ september │ │ │ 12345
4320203 │ september │ 6789101112
4420203 │ september │ 13141516171819
4520203 │ september │ 20212223242526
4620203 │ september │ 27282930 │ │ │
4720204 │ october │ │ │ │ │ 123
4820204 │ october │ 45678910
4920204 │ october │ 11121314151617
5020204 │ october │ 18192021222324
5120204 │ october │ 25262728293031
5220204 │ november │ 1234567
5320204 │ november │ 891011121314
5420204 │ november │ 15161718192021
5520204 │ november │ 22232425262728
5620204 │ november │ 2930 │ │ │ │ │
5720204 │ december │ │ │ 12345
5820204 │ december │ 6789101112
5920204 │ december │ 13141516171819
6020204 │ december │ 20212223242526
6120204 │ december │ 2728293031 │ │
────┴──────┴─────────┴───────────┴────────┴────────┴─────────┴───────────┴─────────┴────────┴──────────
────┬──────┬─────────┬───────────┬────────┬────────┬─────────┬───────────┬──-───────┬────────┬──────────
# │ year │ quarter │ month │ sunday │ monday │ tuesday │ wednesday │ thursday │ friday │ saturday
────┼──────┼─────────┼───────────┼────────┼────────┼─────────┼───────────┼─-────────┼────────┼──────────
020201 │ january │ │ │ │ 1 234
120201 │ january │ 5678 91011
220201 │ january │ 12131415 161718
320201 │ january │ 19202122 232425
420201 │ january │ 26272829 3031
520201 │ february │ │ │ │ │ │ │ 1
620201 │ february │ 2345 678
720201 │ february │ 9101112 131415
820201 │ february │ 16171819 202122
920201 │ february │ 23242526 272829
1020201 │ march │ 1234 567
1120201 │ march │ 891011 121314
1220201 │ march │ 15161718 192021
1320201 │ march │ 22232425 262728
1420201 │ march │ 293031 │ │ │ │
1520202 │ april │ │ │ │ 1 234
1620202 │ april │ 5678 91011
1720202 │ april │ 12131415 161718
1820202 │ april │ 19202122 232425
1920202 │ april │ 26272829 30 │ │
2020202 │ may │ │ │ │ │ 12
2120202 │ may │ 3456 789
2220202 │ may │ 10111213 141516
2320202 │ may │ 17181920 212223
2420202 │ may │ 24252627 282930
2520202 │ may │ 31 │ │ │ │ │ │
2620202 │ june │ │ 123 456
2720202 │ june │ 78910 111213
2820202 │ june │ 14151617 181920
2920202 │ june │ 21222324 252627
3020202 │ june │ 282930 │ │ │ │
3120203 │ july │ │ │ │ 1 234
3220203 │ july │ 5678 91011
3320203 │ july │ 12131415 161718
3420203 │ july │ 19202122 232425
3520203 │ july │ 26272829 3031
3620203 │ august │ │ │ │ │ │ │ 1
3720203 │ august │ 2345 678
3820203 │ august │ 9101112 131415
3920203 │ august │ 16171819 202122
4020203 │ august │ 23242526 272829
4120203 │ august │ 3031 │ │ │ │ │
4220203 │ september │ │ │ 12 345
4320203 │ september │ 6789 101112
4420203 │ september │ 13141516 171819
4520203 │ september │ 20212223 242526
4620203 │ september │ 27282930 │ │
4720204 │ october │ │ │ │ │ 123
4820204 │ october │ 4567 8910
4920204 │ october │ 11121314 151617
5020204 │ october │ 18192021 222324
5120204 │ october │ 25262728 293031
5220204 │ november │ 1234 567
5320204 │ november │ 891011 121314
5420204 │ november │ 15161718 192021
5520204 │ november │ 22232425 262728
5620204 │ november │ 2930 │ │ │ │ │
5720204 │ december │ │ │ 12 345
5820204 │ december │ 6789 101112
5920204 │ december │ 13141516 171819
6020204 │ december │ 20212223 242526
6120204 │ december │ 27282930 31 │ │
────┴──────┴─────────┴───────────┴────────┴────────┴─────────┴───────────┴─-────────┴────────┴──────────
```
```shell
> cal -ym --full-year 2303 --month-names | where month == "june"
───┬──────┬───────┬────────┬────────┬─────────┬───────────┬─────────┬────────┬──────────
# │ year │ month │ sunday │ monday │ tuesday │ wednesday │ thurday │ friday │ saturday
───┼──────┼───────┼────────┼────────┼─────────┼───────────┼─────────┼────────┼──────────
02303 │ june │ │ 123456
12303 │ june │ 78910111213
22303 │ june │ 14151617181920
32303 │ june │ 21222324252627
42303 │ june │ 282930 │ │ │ │
───┴──────┴───────┴────────┴────────┴─────────┴───────────┴─────────┴────────┴──────────
───┬──────┬───────┬────────┬────────┬─────────┬───────────┬─────-────┬────────┬──────────
# │ year │ month │ sunday │ monday │ tuesday │ wednesday │ thursday │ friday │ saturday
───┼──────┼───────┼────────┼────────┼─────────┼───────────┼────-─────┼────────┼──────────
02303 │ june │ │ 123 456
12303 │ june │ 78910 111213
22303 │ june │ 14151617 181920
32303 │ june │ 21222324 252627
42303 │ june │ 282930 │ │ │ │
───┴──────┴───────┴────────┴────────┴─────────┴───────────┴──────-───┴────────┴──────────
```
```shell
> cal -my --full-year 2020 --month-names | where friday == 13
───┬──────┬──────────┬────────┬────────┬─────────┬───────────┬─────────┬────────┬──────────
# │ year │ month │ sunday │ monday │ tuesday │ wednesday │ thurday │ friday │ saturday
───┼──────┼──────────┼────────┼────────┼─────────┼───────────┼─────────┼────────┼──────────
02020 │ march │ 891011121314
12020 │ november │ 891011121314
───┴──────┴──────────┴────────┴────────┴─────────┴───────────┴─────────┴────────┴──────────
───┬──────┬──────────┬────────┬────────┬─────────┬───────────┬────-─────┬────────┬──────────
# │ year │ month │ sunday │ monday │ tuesday │ wednesday │ thursday │ friday │ saturday
───┼──────┼──────────┼────────┼────────┼─────────┼───────────┼──-───────┼────────┼──────────
02020 │ march │ 891011 121314
12020 │ november │ 891011 121314
───┴──────┴──────────┴────────┴────────┴─────────┴───────────┴────-─────┴────────┴──────────
```