@@ -472,7 +472,7 @@ suite('relative-time', function () {
472
472
timeElement . setAttribute ( 'tense' , 'past' )
473
473
timeElement . setAttribute ( 'datetime' , then )
474
474
await Promise . resolve ( )
475
- assert . equal ( timeElement . shadowRoot . textContent , '2 years ago ' )
475
+ assert . equal ( timeElement . shadowRoot . textContent , 'last year ' )
476
476
} )
477
477
478
478
test ( 'micro formats years' , async ( ) => {
@@ -762,9 +762,9 @@ suite('relative-time', function () {
762
762
{ datetime : '2022-10-24T14:46:08.000Z' , format : 'duration' , tense : 'past' , expected : '0 seconds' } ,
763
763
764
764
// 50 seconds in the future
765
- { datetime : '2022-10-24T14:46:50.000Z' , tense : 'future' , format : 'relative' , expected : 'in 1 minute ' } ,
765
+ { datetime : '2022-10-24T14:46:50.000Z' , tense : 'future' , format : 'relative' , expected : 'in 50 seconds ' } ,
766
766
{ datetime : '2022-10-24T14:46:50.000Z' , tense : 'past' , format : 'relative' , expected : 'now' } ,
767
- { datetime : '2022-10-24T14:46:50.000Z' , format : 'relative' , formatStyle : 'narrow' , expected : 'in 1 min .' } ,
767
+ { datetime : '2022-10-24T14:46:50.000Z' , format : 'relative' , formatStyle : 'narrow' , expected : 'in 50 sec .' } ,
768
768
{ datetime : '2022-10-24T14:46:50.000Z' , format : 'relative' , precision : 'hour' , expected : 'now' } ,
769
769
{ datetime : '2022-10-24T14:46:50.000Z' , format : 'relative' , threshold : 'PT0S' , expected : 'on Oct 24' } ,
770
770
{ datetime : '2022-10-24T14:46:50.000Z' , format : 'datetime' , expected : 'Mon, Oct 24' } ,
@@ -775,9 +775,9 @@ suite('relative-time', function () {
775
775
{ datetime : '2022-10-24T14:46:50.000Z' , format : 'duration' , tense : 'past' , expected : '0 seconds' } ,
776
776
777
777
// 90 seconds in the future
778
- { datetime : '2022-10-24T14:47:30.000Z' , tense : 'future' , format : 'relative' , expected : 'in 2 minutes ' } ,
778
+ { datetime : '2022-10-24T14:47:30.000Z' , tense : 'future' , format : 'relative' , expected : 'in 1 minute ' } ,
779
779
{ datetime : '2022-10-24T14:47:30.000Z' , tense : 'past' , format : 'relative' , expected : 'now' } ,
780
- { datetime : '2022-10-24T14:47:30.000Z' , format : 'relative' , formatStyle : 'narrow' , expected : 'in 2 min.' } ,
780
+ { datetime : '2022-10-24T14:47:30.000Z' , format : 'relative' , formatStyle : 'narrow' , expected : 'in 1 min.' } ,
781
781
{ datetime : '2022-10-24T14:47:30.000Z' , format : 'relative' , precision : 'hour' , expected : 'now' } ,
782
782
{ datetime : '2022-10-24T14:47:30.000Z' , format : 'relative' , threshold : 'PT0S' , expected : 'on Oct 24' } ,
783
783
{ datetime : '2022-10-24T14:47:30.000Z' , format : 'datetime' , expected : 'Mon, Oct 24' } ,
@@ -788,10 +788,10 @@ suite('relative-time', function () {
788
788
{ datetime : '2022-10-24T14:47:30.000Z' , format : 'duration' , tense : 'past' , expected : '0 seconds' } ,
789
789
790
790
// 20 days in the future
791
- { datetime : '2022-11-13T15:46:00.000Z' , tense : 'future' , format : 'relative' , expected : 'next month ' } ,
791
+ { datetime : '2022-11-13T15:46:00.000Z' , tense : 'future' , format : 'relative' , expected : 'in 3 weeks ' } ,
792
792
{ datetime : '2022-11-13T15:46:00.000Z' , tense : 'past' , format : 'relative' , expected : 'now' } ,
793
- { datetime : '2022-11-13T15:46:00.000Z' , format : 'relative' , formatStyle : 'narrow' , expected : 'next mo .' } ,
794
- { datetime : '2022-11-13T15:46:00.000Z' , format : 'relative' , precision : 'hour' , expected : 'next month ' } ,
793
+ { datetime : '2022-11-13T15:46:00.000Z' , format : 'relative' , formatStyle : 'narrow' , expected : 'in 3 wk .' } ,
794
+ { datetime : '2022-11-13T15:46:00.000Z' , format : 'relative' , precision : 'hour' , expected : 'in 3 weeks ' } ,
795
795
{ datetime : '2022-11-13T15:46:00.000Z' , format : 'relative' , threshold : 'PT0S' , expected : 'on Nov 13' } ,
796
796
{ datetime : '2022-11-13T15:46:00.000Z' , format : 'datetime' , expected : 'Sun, Nov 13' } ,
797
797
{ datetime : '2022-11-13T15:46:00.000Z' , format : 'duration' , expected : '20 days, 1 hour' } ,
@@ -846,8 +846,8 @@ suite('relative-time', function () {
846
846
847
847
// 50 seconds in the past
848
848
{ datetime : '2022-10-24T14:45:10.000Z' , tense : 'future' , format : 'relative' , expected : 'now' } ,
849
- { datetime : '2022-10-24T14:45:10.000Z' , tense : 'past' , format : 'relative' , expected : '1 minute ago ' } ,
850
- { datetime : '2022-10-24T14:45:10.000Z' , format : 'relative' , formatStyle : 'narrow' , expected : '1 min. ago ' } ,
849
+ { datetime : '2022-10-24T14:45:10.000Z' , tense : 'past' , format : 'relative' , expected : 'now ' } ,
850
+ { datetime : '2022-10-24T14:45:10.000Z' , format : 'relative' , formatStyle : 'narrow' , expected : 'now ' } ,
851
851
{ datetime : '2022-10-24T14:45:10.000Z' , format : 'relative' , precision : 'hour' , expected : 'now' } ,
852
852
{ datetime : '2022-10-24T14:45:10.000Z' , format : 'relative' , threshold : 'PT0S' , expected : 'on Oct 24' } ,
853
853
{ datetime : '2022-10-24T14:45:10.000Z' , format : 'datetime' , expected : 'Mon, Oct 24' } ,
@@ -859,8 +859,8 @@ suite('relative-time', function () {
859
859
860
860
// 90 seconds in the past
861
861
{ datetime : '2022-10-24T14:44:30.000Z' , tense : 'future' , format : 'relative' , expected : 'now' } ,
862
- { datetime : '2022-10-24T14:44:30.000Z' , tense : 'past' , format : 'relative' , expected : '2 minutes ago' } ,
863
- { datetime : '2022-10-24T14:44:30.000Z' , format : 'relative' , formatStyle : 'narrow' , expected : '2 min. ago' } ,
862
+ { datetime : '2022-10-24T14:44:30.000Z' , tense : 'past' , format : 'relative' , expected : '1 minute ago' } ,
863
+ { datetime : '2022-10-24T14:44:30.000Z' , format : 'relative' , formatStyle : 'narrow' , expected : '1 min. ago' } ,
864
864
{ datetime : '2022-10-24T14:44:30.000Z' , format : 'relative' , precision : 'hour' , expected : 'now' } ,
865
865
{ datetime : '2022-10-24T14:44:30.000Z' , format : 'relative' , threshold : 'PT0S' , expected : 'on Oct 24' } ,
866
866
{ datetime : '2022-10-24T14:44:30.000Z' , format : 'datetime' , expected : 'Mon, Oct 24' } ,
@@ -872,9 +872,9 @@ suite('relative-time', function () {
872
872
873
873
// 20 days in the past
874
874
{ datetime : '2022-10-04T14:46:00.000Z' , tense : 'future' , format : 'relative' , expected : 'now' } ,
875
- { datetime : '2022-10-04T14:46:00.000Z' , tense : 'past' , format : 'relative' , expected : 'last month ' } ,
876
- { datetime : '2022-10-04T14:46:00.000Z' , format : 'relative' , formatStyle : 'narrow' , expected : 'last mo. ' } ,
877
- { datetime : '2022-10-04T14:46:00.000Z' , format : 'relative' , precision : 'hour' , expected : 'last month ' } ,
875
+ { datetime : '2022-10-04T14:46:00.000Z' , tense : 'past' , format : 'relative' , expected : '3 weeks ago ' } ,
876
+ { datetime : '2022-10-04T14:46:00.000Z' , format : 'relative' , formatStyle : 'narrow' , expected : '3 wk. ago ' } ,
877
+ { datetime : '2022-10-04T14:46:00.000Z' , format : 'relative' , precision : 'hour' , expected : '3 weeks ago ' } ,
878
878
{ datetime : '2022-10-04T14:46:00.000Z' , format : 'relative' , threshold : 'PT0S' , expected : 'on Oct 4' } ,
879
879
{ datetime : '2022-10-04T14:46:00.000Z' , format : 'datetime' , expected : 'Tue, Oct 4' } ,
880
880
{ datetime : '2022-10-04T14:46:00.000Z' , format : 'duration' , expected : '20 days' } ,
@@ -958,13 +958,13 @@ suite('relative-time', function () {
958
958
{ datetime : '2022-10-24T15:46:00.000Z' , tense : 'future' , format : 'micro' , expected : '1h' } ,
959
959
{ datetime : '2022-10-24T16:00:00.000Z' , tense : 'future' , format : 'micro' , expected : '1h' } ,
960
960
{ datetime : '2022-10-24T16:15:00.000Z' , tense : 'future' , format : 'micro' , expected : '1h' } ,
961
- { datetime : '2022-10-24T16:31:00.000Z' , tense : 'future' , format : 'micro' , expected : '2h ' } ,
961
+ { datetime : '2022-10-24T16:31:00.000Z' , tense : 'future' , format : 'micro' , expected : '1h ' } ,
962
962
{ datetime : '2022-10-30T14:46:00.000Z' , tense : 'future' , format : 'micro' , expected : '1w' } ,
963
963
{ datetime : '2022-11-24T14:46:00.000Z' , tense : 'future' , format : 'micro' , expected : '1m' } ,
964
964
{ datetime : '2023-10-23T14:46:00.000Z' , tense : 'future' , format : 'micro' , expected : '1y' } ,
965
965
{ datetime : '2023-10-24T14:46:00.000Z' , tense : 'future' , format : 'micro' , expected : '1y' } ,
966
966
{ datetime : '2024-03-31T14:46:00.000Z' , tense : 'future' , format : 'micro' , expected : '1y' } ,
967
- { datetime : '2024-04-01T14:46:00.000Z' , tense : 'future' , format : 'micro' , expected : '2y ' } ,
967
+ { datetime : '2024-04-01T14:46:00.000Z' , tense : 'future' , format : 'micro' , expected : '1y ' } ,
968
968
969
969
// Dates in the future
970
970
{ datetime : '2022-11-24T14:46:00.000Z' , tense : 'past' , format : 'micro' , expected : '1m' } ,
@@ -975,13 +975,13 @@ suite('relative-time', function () {
975
975
{ datetime : '2022-10-24T13:46:00.000Z' , tense : 'past' , format : 'micro' , expected : '1h' } ,
976
976
{ datetime : '2022-10-24T13:30:00.000Z' , tense : 'past' , format : 'micro' , expected : '1h' } ,
977
977
{ datetime : '2022-10-24T13:17:00.000Z' , tense : 'past' , format : 'micro' , expected : '1h' } ,
978
- { datetime : '2022-10-24T13:01:00.000Z' , tense : 'past' , format : 'micro' , expected : '2h ' } ,
978
+ { datetime : '2022-10-24T13:01:00.000Z' , tense : 'past' , format : 'micro' , expected : '1h ' } ,
979
979
{ datetime : '2022-10-18T14:46:00.000Z' , tense : 'past' , format : 'micro' , expected : '1w' } ,
980
980
{ datetime : '2022-09-23T14:46:00.000Z' , tense : 'past' , format : 'micro' , expected : '1m' } ,
981
981
{ datetime : '2021-10-25T14:46:00.000Z' , tense : 'past' , format : 'micro' , expected : '1y' } ,
982
982
{ datetime : '2021-10-24T14:46:00.000Z' , tense : 'past' , format : 'micro' , expected : '1y' } ,
983
983
{ datetime : '2021-05-18T14:46:00.000Z' , tense : 'past' , format : 'micro' , expected : '1y' } ,
984
- { datetime : '2021-05-17T14:46:00.000Z' , tense : 'past' , format : 'micro' , expected : '2y ' } ,
984
+ { datetime : '2021-05-17T14:46:00.000Z' , tense : 'past' , format : 'micro' , expected : '1y ' } ,
985
985
986
986
// Elapsed Times
987
987
{ datetime : '2022-10-24T14:46:10.000Z' , format : 'elapsed' , expected : '10s' } ,
@@ -1011,23 +1011,23 @@ suite('relative-time', function () {
1011
1011
{ datetime : '2022-10-24T15:46:00.000Z' , tense : 'future' , format : 'auto' , expected : 'in 1 hour' } ,
1012
1012
{ datetime : '2022-10-24T16:00:00.000Z' , tense : 'future' , format : 'auto' , expected : 'in 1 hour' } ,
1013
1013
{ datetime : '2022-10-24T16:15:00.000Z' , tense : 'future' , format : 'auto' , expected : 'in 1 hour' } ,
1014
- { datetime : '2022-10-24T16:31:00.000Z' , tense : 'future' , format : 'auto' , expected : 'in 2 hours ' } ,
1014
+ { datetime : '2022-10-24T16:31:00.000Z' , tense : 'future' , format : 'auto' , expected : 'in 1 hour ' } ,
1015
1015
{ datetime : '2022-10-30T14:46:00.000Z' , tense : 'future' , format : 'auto' , expected : 'next week' } ,
1016
1016
{ datetime : '2022-11-24T14:46:00.000Z' , tense : 'future' , format : 'auto' , expected : 'next month' } ,
1017
1017
{ datetime : '2023-10-23T14:46:00.000Z' , tense : 'future' , format : 'auto' , expected : 'next year' } ,
1018
1018
{ datetime : '2023-10-24T14:46:00.000Z' , tense : 'future' , format : 'auto' , expected : 'next year' } ,
1019
1019
{ datetime : '2024-03-31T14:46:00.000Z' , tense : 'future' , format : 'auto' , expected : 'next year' } ,
1020
- { datetime : '2024-04-01T14:46:00.000Z' , tense : 'future' , format : 'auto' , expected : 'in 2 years ' } ,
1020
+ { datetime : '2024-04-01T14:46:00.000Z' , tense : 'future' , format : 'auto' , expected : 'next year ' } ,
1021
1021
{ datetime : '2022-10-24T15:46:00.000Z' , lang : 'en' , tense : 'future' , formatStyle : 'narrow' , expected : 'in 1 hr.' } ,
1022
1022
{ datetime : '2022-10-24T16:00:00.000Z' , lang : 'en' , tense : 'future' , formatStyle : 'narrow' , expected : 'in 1 hr.' } ,
1023
1023
{ datetime : '2022-10-24T16:15:00.000Z' , lang : 'en' , tense : 'future' , formatStyle : 'narrow' , expected : 'in 1 hr.' } ,
1024
- { datetime : '2022-10-24T16:31:00.000Z' , lang : 'en' , tense : 'future' , formatStyle : 'narrow' , expected : 'in 2 hr.' } ,
1024
+ { datetime : '2022-10-24T16:31:00.000Z' , lang : 'en' , tense : 'future' , formatStyle : 'narrow' , expected : 'in 1 hr.' } ,
1025
1025
{ datetime : '2022-10-30T14:46:00.000Z' , lang : 'en' , tense : 'future' , formatStyle : 'narrow' , expected : 'next wk.' } ,
1026
1026
{ datetime : '2022-11-24T14:46:00.000Z' , lang : 'en' , tense : 'future' , formatStyle : 'narrow' , expected : 'next mo.' } ,
1027
1027
{ datetime : '2023-10-23T14:46:00.000Z' , lang : 'en' , tense : 'future' , formatStyle : 'narrow' , expected : 'next yr.' } ,
1028
1028
{ datetime : '2023-10-24T14:46:00.000Z' , lang : 'en' , tense : 'future' , formatStyle : 'narrow' , expected : 'next yr.' } ,
1029
1029
{ datetime : '2024-03-31T14:46:00.000Z' , lang : 'en' , tense : 'future' , formatStyle : 'narrow' , expected : 'next yr.' } ,
1030
- { datetime : '2024-04-01T14:46:00.000Z' , lang : 'en' , tense : 'future' , formatStyle : 'narrow' , expected : 'in 2 yr.' } ,
1030
+ { datetime : '2024-04-01T14:46:00.000Z' , lang : 'en' , tense : 'future' , formatStyle : 'narrow' , expected : 'next yr.' } ,
1031
1031
1032
1032
// Dates in the future
1033
1033
{ datetime : '2022-11-24T14:46:00.000Z' , tense : 'past' , format : 'auto' , expected : 'now' } ,
@@ -1038,23 +1038,23 @@ suite('relative-time', function () {
1038
1038
{ datetime : '2022-10-24T13:46:00.000Z' , tense : 'past' , format : 'auto' , expected : '1 hour ago' } ,
1039
1039
{ datetime : '2022-10-24T13:30:00.000Z' , tense : 'past' , format : 'auto' , expected : '1 hour ago' } ,
1040
1040
{ datetime : '2022-10-24T13:17:00.000Z' , tense : 'past' , format : 'auto' , expected : '1 hour ago' } ,
1041
- { datetime : '2022-10-24T13:01:00.000Z' , tense : 'past' , format : 'auto' , expected : '2 hours ago' } ,
1041
+ { datetime : '2022-10-24T13:01:00.000Z' , tense : 'past' , format : 'auto' , expected : '1 hour ago' } ,
1042
1042
{ datetime : '2022-10-18T14:46:00.000Z' , tense : 'past' , format : 'auto' , expected : 'last week' } ,
1043
1043
{ datetime : '2022-09-23T14:46:00.000Z' , tense : 'past' , format : 'auto' , expected : 'last month' } ,
1044
1044
{ datetime : '2021-10-25T14:46:00.000Z' , tense : 'past' , format : 'auto' , expected : 'last year' } ,
1045
1045
{ datetime : '2021-10-24T14:46:00.000Z' , tense : 'past' , format : 'auto' , expected : 'last year' } ,
1046
1046
{ datetime : '2021-05-18T14:46:00.000Z' , tense : 'past' , format : 'auto' , expected : 'last year' } ,
1047
- { datetime : '2021-05-17T14:46:00.000Z' , tense : 'past' , format : 'auto' , expected : '2 years ago ' } ,
1047
+ { datetime : '2021-05-17T14:46:00.000Z' , tense : 'past' , format : 'auto' , expected : 'last year ' } ,
1048
1048
{ datetime : '2022-10-24T13:46:00.000Z' , lang : 'en' , tense : 'past' , formatStyle : 'narrow' , expected : '1 hr. ago' } ,
1049
1049
{ datetime : '2022-10-24T13:30:00.000Z' , lang : 'en' , tense : 'past' , formatStyle : 'narrow' , expected : '1 hr. ago' } ,
1050
1050
{ datetime : '2022-10-24T13:17:00.000Z' , lang : 'en' , tense : 'past' , formatStyle : 'narrow' , expected : '1 hr. ago' } ,
1051
- { datetime : '2022-10-24T13:01:00.000Z' , lang : 'en' , tense : 'past' , formatStyle : 'narrow' , expected : '2 hr. ago' } ,
1051
+ { datetime : '2022-10-24T13:01:00.000Z' , lang : 'en' , tense : 'past' , formatStyle : 'narrow' , expected : '1 hr. ago' } ,
1052
1052
{ datetime : '2022-10-18T14:46:00.000Z', lang : 'en' , tense : 'past' , formatStyle : 'narrow' , expected : 'last wk.' } ,
1053
1053
{ datetime : '2022-09-23T14:46:00.000Z' , lang : 'en' , tense : 'past' , formatStyle : 'narrow' , expected : 'last mo.' } ,
1054
1054
{ datetime : '2021-10-25T14:46:00.000Z' , lang : 'en' , tense : 'past' , formatStyle : 'narrow' , expected : 'last yr.' } ,
1055
1055
{ datetime : '2021-10-24T14:46:00.000Z' , lang : 'en' , tense : 'past' , formatStyle : 'narrow' , expected : 'last yr.' } ,
1056
1056
{ datetime : '2021-05-18T14:46:00.000Z' , lang : 'en' , tense : 'past' , formatStyle : 'narrow' , expected : 'last yr.' } ,
1057
- { datetime : '2021-05-17T14:46:00.000Z' , lang : 'en' , tense : 'past' , formatStyle : 'narrow' , expected : '2 yr. ago ' } ,
1057
+ { datetime : '2021-05-17T14:46:00.000Z' , lang : 'en' , tense : 'past' , formatStyle : 'narrow' , expected : 'last yr.' } ,
1058
1058
1059
1059
// Edge case dates
1060
1060
{
0 commit comments