@@ -472,7 +472,7 @@ suite('relative-time', function () {
472472 timeElement . setAttribute ( 'tense' , 'past' )
473473 timeElement . setAttribute ( 'datetime' , then )
474474 await Promise . resolve ( )
475- assert . equal ( timeElement . shadowRoot . textContent , '2 years ago ' )
475+ assert . equal ( timeElement . shadowRoot . textContent , 'last year ' )
476476 } )
477477
478478 test ( 'micro formats years' , async ( ) => {
@@ -762,9 +762,9 @@ suite('relative-time', function () {
762762 { datetime : '2022-10-24T14:46:08.000Z' , format : 'duration' , tense : 'past' , expected : '0 seconds' } ,
763763
764764 // 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 ' } ,
766766 { 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 .' } ,
768768 { datetime : '2022-10-24T14:46:50.000Z' , format : 'relative' , precision : 'hour' , expected : 'now' } ,
769769 { datetime : '2022-10-24T14:46:50.000Z' , format : 'relative' , threshold : 'PT0S' , expected : 'on Oct 24' } ,
770770 { datetime : '2022-10-24T14:46:50.000Z' , format : 'datetime' , expected : 'Mon, Oct 24' } ,
@@ -775,9 +775,9 @@ suite('relative-time', function () {
775775 { datetime : '2022-10-24T14:46:50.000Z' , format : 'duration' , tense : 'past' , expected : '0 seconds' } ,
776776
777777 // 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 ' } ,
779779 { 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.' } ,
781781 { datetime : '2022-10-24T14:47:30.000Z' , format : 'relative' , precision : 'hour' , expected : 'now' } ,
782782 { datetime : '2022-10-24T14:47:30.000Z' , format : 'relative' , threshold : 'PT0S' , expected : 'on Oct 24' } ,
783783 { datetime : '2022-10-24T14:47:30.000Z' , format : 'datetime' , expected : 'Mon, Oct 24' } ,
@@ -788,10 +788,10 @@ suite('relative-time', function () {
788788 { datetime : '2022-10-24T14:47:30.000Z' , format : 'duration' , tense : 'past' , expected : '0 seconds' } ,
789789
790790 // 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 ' } ,
792792 { 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 ' } ,
795795 { datetime : '2022-11-13T15:46:00.000Z' , format : 'relative' , threshold : 'PT0S' , expected : 'on Nov 13' } ,
796796 { datetime : '2022-11-13T15:46:00.000Z' , format : 'datetime' , expected : 'Sun, Nov 13' } ,
797797 { datetime : '2022-11-13T15:46:00.000Z' , format : 'duration' , expected : '20 days, 1 hour' } ,
@@ -846,8 +846,8 @@ suite('relative-time', function () {
846846
847847 // 50 seconds in the past
848848 { 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 ' } ,
851851 { datetime : '2022-10-24T14:45:10.000Z' , format : 'relative' , precision : 'hour' , expected : 'now' } ,
852852 { datetime : '2022-10-24T14:45:10.000Z' , format : 'relative' , threshold : 'PT0S' , expected : 'on Oct 24' } ,
853853 { datetime : '2022-10-24T14:45:10.000Z' , format : 'datetime' , expected : 'Mon, Oct 24' } ,
@@ -859,8 +859,8 @@ suite('relative-time', function () {
859859
860860 // 90 seconds in the past
861861 { 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' } ,
864864 { datetime : '2022-10-24T14:44:30.000Z' , format : 'relative' , precision : 'hour' , expected : 'now' } ,
865865 { datetime : '2022-10-24T14:44:30.000Z' , format : 'relative' , threshold : 'PT0S' , expected : 'on Oct 24' } ,
866866 { datetime : '2022-10-24T14:44:30.000Z' , format : 'datetime' , expected : 'Mon, Oct 24' } ,
@@ -872,9 +872,9 @@ suite('relative-time', function () {
872872
873873 // 20 days in the past
874874 { 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 ' } ,
878878 { datetime : '2022-10-04T14:46:00.000Z' , format : 'relative' , threshold : 'PT0S' , expected : 'on Oct 4' } ,
879879 { datetime : '2022-10-04T14:46:00.000Z' , format : 'datetime' , expected : 'Tue, Oct 4' } ,
880880 { datetime : '2022-10-04T14:46:00.000Z' , format : 'duration' , expected : '20 days' } ,
@@ -958,13 +958,13 @@ suite('relative-time', function () {
958958 { datetime : '2022-10-24T15:46:00.000Z' , tense : 'future' , format : 'micro' , expected : '1h' } ,
959959 { datetime : '2022-10-24T16:00:00.000Z' , tense : 'future' , format : 'micro' , expected : '1h' } ,
960960 { 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 ' } ,
962962 { datetime : '2022-10-30T14:46:00.000Z' , tense : 'future' , format : 'micro' , expected : '1w' } ,
963963 { datetime : '2022-11-24T14:46:00.000Z' , tense : 'future' , format : 'micro' , expected : '1m' } ,
964964 { datetime : '2023-10-23T14:46:00.000Z' , tense : 'future' , format : 'micro' , expected : '1y' } ,
965965 { datetime : '2023-10-24T14:46:00.000Z' , tense : 'future' , format : 'micro' , expected : '1y' } ,
966966 { 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 ' } ,
968968
969969 // Dates in the future
970970 { datetime : '2022-11-24T14:46:00.000Z' , tense : 'past' , format : 'micro' , expected : '1m' } ,
@@ -975,13 +975,13 @@ suite('relative-time', function () {
975975 { datetime : '2022-10-24T13:46:00.000Z' , tense : 'past' , format : 'micro' , expected : '1h' } ,
976976 { datetime : '2022-10-24T13:30:00.000Z' , tense : 'past' , format : 'micro' , expected : '1h' } ,
977977 { 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 ' } ,
979979 { datetime : '2022-10-18T14:46:00.000Z' , tense : 'past' , format : 'micro' , expected : '1w' } ,
980980 { datetime : '2022-09-23T14:46:00.000Z' , tense : 'past' , format : 'micro' , expected : '1m' } ,
981981 { datetime : '2021-10-25T14:46:00.000Z' , tense : 'past' , format : 'micro' , expected : '1y' } ,
982982 { datetime : '2021-10-24T14:46:00.000Z' , tense : 'past' , format : 'micro' , expected : '1y' } ,
983983 { 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 ' } ,
985985
986986 // Elapsed Times
987987 { datetime : '2022-10-24T14:46:10.000Z' , format : 'elapsed' , expected : '10s' } ,
@@ -1011,23 +1011,23 @@ suite('relative-time', function () {
10111011 { datetime : '2022-10-24T15:46:00.000Z' , tense : 'future' , format : 'auto' , expected : 'in 1 hour' } ,
10121012 { datetime : '2022-10-24T16:00:00.000Z' , tense : 'future' , format : 'auto' , expected : 'in 1 hour' } ,
10131013 { 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 ' } ,
10151015 { datetime : '2022-10-30T14:46:00.000Z' , tense : 'future' , format : 'auto' , expected : 'next week' } ,
10161016 { datetime : '2022-11-24T14:46:00.000Z' , tense : 'future' , format : 'auto' , expected : 'next month' } ,
10171017 { datetime : '2023-10-23T14:46:00.000Z' , tense : 'future' , format : 'auto' , expected : 'next year' } ,
10181018 { datetime : '2023-10-24T14:46:00.000Z' , tense : 'future' , format : 'auto' , expected : 'next year' } ,
10191019 { 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 ' } ,
10211021 { datetime : '2022-10-24T15:46:00.000Z' , lang : 'en' , tense : 'future' , formatStyle : 'narrow' , expected : 'in 1 hr.' } ,
10221022 { datetime : '2022-10-24T16:00:00.000Z' , lang : 'en' , tense : 'future' , formatStyle : 'narrow' , expected : 'in 1 hr.' } ,
10231023 { 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.' } ,
10251025 { datetime : '2022-10-30T14:46:00.000Z' , lang : 'en' , tense : 'future' , formatStyle : 'narrow' , expected : 'next wk.' } ,
10261026 { datetime : '2022-11-24T14:46:00.000Z' , lang : 'en' , tense : 'future' , formatStyle : 'narrow' , expected : 'next mo.' } ,
10271027 { datetime : '2023-10-23T14:46:00.000Z' , lang : 'en' , tense : 'future' , formatStyle : 'narrow' , expected : 'next yr.' } ,
10281028 { datetime : '2023-10-24T14:46:00.000Z' , lang : 'en' , tense : 'future' , formatStyle : 'narrow' , expected : 'next yr.' } ,
10291029 { 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.' } ,
10311031
10321032 // Dates in the future
10331033 { datetime : '2022-11-24T14:46:00.000Z' , tense : 'past' , format : 'auto' , expected : 'now' } ,
@@ -1038,23 +1038,23 @@ suite('relative-time', function () {
10381038 { datetime : '2022-10-24T13:46:00.000Z' , tense : 'past' , format : 'auto' , expected : '1 hour ago' } ,
10391039 { datetime : '2022-10-24T13:30:00.000Z' , tense : 'past' , format : 'auto' , expected : '1 hour ago' } ,
10401040 { 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' } ,
10421042 { datetime : '2022-10-18T14:46:00.000Z' , tense : 'past' , format : 'auto' , expected : 'last week' } ,
10431043 { datetime : '2022-09-23T14:46:00.000Z' , tense : 'past' , format : 'auto' , expected : 'last month' } ,
10441044 { datetime : '2021-10-25T14:46:00.000Z' , tense : 'past' , format : 'auto' , expected : 'last year' } ,
10451045 { datetime : '2021-10-24T14:46:00.000Z' , tense : 'past' , format : 'auto' , expected : 'last year' } ,
10461046 { 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 ' } ,
10481048 { datetime : '2022-10-24T13:46:00.000Z' , lang : 'en' , tense : 'past' , formatStyle : 'narrow' , expected : '1 hr. ago' } ,
10491049 { datetime : '2022-10-24T13:30:00.000Z' , lang : 'en' , tense : 'past' , formatStyle : 'narrow' , expected : '1 hr. ago' } ,
10501050 { 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' } ,
10521052 { datetime : '2022-10-18T14:46:00.000Z' , lang : 'en' , tense : 'past' , formatStyle : 'narrow' , expected : 'last wk.' } ,
10531053 { datetime : '2022-09-23T14:46:00.000Z' , lang : 'en' , tense : 'past' , formatStyle : 'narrow' , expected : 'last mo.' } ,
10541054 { datetime : '2021-10-25T14:46:00.000Z' , lang : 'en' , tense : 'past' , formatStyle : 'narrow' , expected : 'last yr.' } ,
10551055 { datetime : '2021-10-24T14:46:00.000Z' , lang : 'en' , tense : 'past' , formatStyle : 'narrow' , expected : 'last yr.' } ,
10561056 { 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.' } ,
10581058
10591059 // Edge case dates
10601060 {
0 commit comments