From 911ace8749f11ae8dd170ee625e1df5ec7d2ef73 Mon Sep 17 00:00:00 2001 From: Goun Lee Date: Fri, 13 Mar 2020 16:27:30 +0900 Subject: [PATCH 01/14] Updated list.json files to cldr 36 --- js/data/locale/am/list.json | 28 +++++++++-- js/data/locale/ar/list.json | 40 ++++------------ js/data/locale/as/list.json | 26 ++++++++++- js/data/locale/az/Cyrl/list.json | 10 ---- js/data/locale/az/list.json | 52 +++++++++++++++++++-- js/data/locale/bg/list.json | 4 +- js/data/locale/bn/list.json | 26 ++++++++++- js/data/locale/br/list.json | 28 ++++++++++- js/data/locale/ca/list.json | 26 ++++++++++- js/data/locale/chr/list.json | 26 ++++++++++- js/data/locale/cs/list.json | 26 ++++++++++- js/data/locale/cy/list.json | 26 ++++++++++- js/data/locale/da/list.json | 26 ++++++++++- js/data/locale/el/list.json | 26 ++++++++++- js/data/locale/en/AU/list.json | 8 ---- js/data/locale/en/GB/list.json | 8 ---- js/data/locale/en/list.json | 29 +++++++++++- js/data/locale/et/list.json | 26 ++++++++++- js/data/locale/eu/list.json | 26 ++++++++++- js/data/locale/fa/list.json | 32 ++++++++++--- js/data/locale/fil/list.json | 26 ++++++++++- js/data/locale/fr/list.json | 26 ++++++++++- js/data/locale/ga/list.json | 26 ++++++++++- js/data/locale/gd/list.json | 8 ++-- js/data/locale/gu/list.json | 52 +++++++++++++++++++-- js/data/locale/he/list.json | 26 ++++++++++- js/data/locale/hi/list.json | 4 +- js/data/locale/hr/list.json | 4 +- js/data/locale/hy/list.json | 26 ++++++++++- js/data/locale/id/list.json | 26 ++++++++++- js/data/locale/is/list.json | 26 ++++++++++- js/data/locale/kea/list.json | 4 ++ js/data/locale/kn/list.json | 26 ++++++++++- js/data/locale/ml/list.json | 2 +- js/data/locale/mn/list.json | 8 +++- js/data/locale/ms/list.json | 26 ++++++++++- js/data/locale/my/list.json | 28 +++++++++-- js/data/locale/ne/list.json | 27 +++++++++-- js/data/locale/pa/Arab/list.json | 9 ---- js/data/locale/pa/list.json | 77 +++++++++++++++++++++++++++++-- js/data/locale/ps/list.json | 14 +++--- js/data/locale/pt/list.json | 52 +++++++++++++++++++-- js/data/locale/ro/list.json | 26 ++++++++++- js/data/locale/ru/list.json | 26 ++++++++++- js/data/locale/sd/list.json | 26 ++++++++++- js/data/locale/so/list.json | 30 ++++++++++-- js/data/locale/sw/list.json | 52 +++++++++++++++++++-- js/data/locale/ta/list.json | 12 ++--- js/data/locale/te/list.json | 26 ++++++++++- js/data/locale/th/list.json | 42 +++++++++-------- js/data/locale/tk/list.json | 30 ++++++++++-- js/data/locale/tr/list.json | 26 ++++++++++- js/data/locale/uk/list.json | 20 ++++---- js/data/locale/ur/list.json | 32 ++++++++++--- js/data/locale/uz/Latn/list.json | 4 -- js/data/locale/uz/list.json | 32 +++++++++---- js/data/locale/vi/list.json | 38 +++++++++++---- js/data/locale/yue/Hant/list.json | 34 -------------- js/data/locale/zu/list.json | 26 ++++++++++- 59 files changed, 1228 insertions(+), 276 deletions(-) delete mode 100644 js/data/locale/az/Cyrl/list.json delete mode 100644 js/data/locale/en/AU/list.json delete mode 100644 js/data/locale/en/GB/list.json delete mode 100644 js/data/locale/pa/Arab/list.json delete mode 100644 js/data/locale/yue/Hant/list.json diff --git a/js/data/locale/am/list.json b/js/data/locale/am/list.json index 5dad1b2a0b..7af597821e 100644 --- a/js/data/locale/am/list.json +++ b/js/data/locale/am/list.json @@ -1,9 +1,29 @@ { "standard": { - "2": "{0} እና {1}", - "start": "{0}፣ {1}", - "middle": "{0}፣ {1}", - "end": "{0}, እና {1}" + "short": { + "2": "{0} እና {1}", + "start": "{0}, {1}", + "middle": "{0}፣ {1}", + "end": "{0}, እና {1}" + }, + "medium": { + "2": "{0} እና {1}", + "start": "{0}፣ {1}", + "middle": "{0}፣ {1}", + "end": "{0}, እና {1}" + }, + "long": { + "2": "{0} እና {1}", + "start": "{0}፣ {1}", + "middle": "{0}፣ {1}", + "end": "{0}, እና {1}" + }, + "full": { + "2": "{0} እና {1}", + "start": "{0}፣ {1}", + "middle": "{0}፣ {1}", + "end": "{0}, እና {1}" + } }, "or": { "2": "{0} ወይም {1}", diff --git a/js/data/locale/ar/list.json b/js/data/locale/ar/list.json index 9bf05f280f..7b25d8e8e9 100644 --- a/js/data/locale/ar/list.json +++ b/js/data/locale/ar/list.json @@ -1,42 +1,22 @@ { "standard": { - "short": { - "2": "{0} و{1}", - "start": "{0}، و{1}", - "middle": "{0}، و{1}", - "end": "{0}، و{1}" - }, - "medium": { - "2": "{0} و{1}", - "start": "{0}، و{1}", - "middle": "{0}، و{1}", - "end": "{0}، و{1}" - }, - "long": { - "2": "{0} و{1}", - "start": "{0}، {1}", - "middle": "{0}، {1}", - "end": "{0}، و{1}" - }, - "full": { - "2": "{0} و{1}", - "start": "{0}، {1}", - "middle": "{0}، {1}", - "end": "{0}، و{1}" - } + "2": "{0} و{1}", + "start": "{0} و{1}", + "middle": "{0} و{1}", + "end": "{0} و{1}" }, "or": { "2": "{0} أو {1}", - "start": "{0} و{1}", - "middle": "{0} و{1}", + "start": "{0} أو {1}", + "middle": "{0} أو {1}", "end": "{0} أو {1}" }, "unit": { "short": { - "2": "{0}، {1}", - "start": "{0}، {1}", - "middle": "{0}، {1}", - "end": "{0}، {1}" + "2": "{0} و{1}", + "start": "{0} و{1}", + "middle": "{0} و{1}", + "end": "{0} و{1}" }, "medium": { "2": "{0} و{1}", diff --git a/js/data/locale/as/list.json b/js/data/locale/as/list.json index ddb02a6336..3d018a67d1 100644 --- a/js/data/locale/as/list.json +++ b/js/data/locale/as/list.json @@ -1,7 +1,29 @@ { "standard": { - "2": "{0} আৰু {1}", - "end": "{0} আৰু {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} আৰু {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} আৰু {1}" + }, + "long": { + "2": "{0} আৰু {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} আৰু {1}" + }, + "full": { + "2": "{0} আৰু {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} আৰু {1}" + } }, "or": { "2": "{0} বা {1}", diff --git a/js/data/locale/az/Cyrl/list.json b/js/data/locale/az/Cyrl/list.json deleted file mode 100644 index 04b81bd3a8..0000000000 --- a/js/data/locale/az/Cyrl/list.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "standard": { - "2": "{0}, {1}", - "end": "{0}, {1}" - }, - "or": { - "2": "{0} or {1}", - "end": "{0}, or {1}" - } -} \ No newline at end of file diff --git a/js/data/locale/az/list.json b/js/data/locale/az/list.json index 360aba98da..6032cbf386 100644 --- a/js/data/locale/az/list.json +++ b/js/data/locale/az/list.json @@ -1,10 +1,54 @@ { "standard": { - "2": "{0} və {1}", - "end": "{0} və {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} və {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} və {1}" + }, + "long": { + "2": "{0} və {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} və {1}" + }, + "full": { + "2": "{0} və {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} və {1}" + } }, "or": { - "2": "{0} yaxud {1}", - "end": "{0}, yaxud {1}" + "short": { + "2": "{0}, yaxud {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, yaxud {1}" + }, + "medium": { + "2": "{0}, yaxud {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, yaxud {1}" + }, + "long": { + "2": "{0} yaxud {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, yaxud {1}" + }, + "full": { + "2": "{0} yaxud {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, yaxud {1}" + } } } \ No newline at end of file diff --git a/js/data/locale/bg/list.json b/js/data/locale/bg/list.json index abacb371e4..fe0d9bf24f 100644 --- a/js/data/locale/bg/list.json +++ b/js/data/locale/bg/list.json @@ -1,13 +1,13 @@ { "standard": { "short": { - "2": "{0} и{1}", + "2": "{0}, {1}", "start": "{0}, {1}", "middle": "{0}, {1}", "end": "{0} и {1}" }, "medium": { - "2": "{0} и{1}", + "2": "{0} и {1}", "start": "{0}, {1}", "middle": "{0}, {1}", "end": "{0} и {1}" diff --git a/js/data/locale/bn/list.json b/js/data/locale/bn/list.json index 3867a00d00..228af34ee3 100644 --- a/js/data/locale/bn/list.json +++ b/js/data/locale/bn/list.json @@ -1,7 +1,29 @@ { "standard": { - "2": "{0} এবং {1}", - "end": "{0} এবং {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} এবং {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} এবং {1}" + }, + "long": { + "2": "{0} এবং {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} এবং {1}" + }, + "full": { + "2": "{0} এবং {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} এবং {1}" + } }, "or": { "2": "{0} বা {1}", diff --git a/js/data/locale/br/list.json b/js/data/locale/br/list.json index 552cc8a1fb..7099078de3 100644 --- a/js/data/locale/br/list.json +++ b/js/data/locale/br/list.json @@ -1,6 +1,32 @@ { + "standard": { + "short": { + "2": "{0} & {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} & {1}" + }, + "medium": { + "2": "{0} & {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} & {1}" + }, + "long": { + "2": "{0} ha {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ha {1}" + }, + "full": { + "2": "{0} ha {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ha {1}" + } + }, "or": { "2": "{0} pe {1}", - "end": "{0}, pe {1}" + "end": "{0} pe {1}" } } \ No newline at end of file diff --git a/js/data/locale/ca/list.json b/js/data/locale/ca/list.json index b721ce3f50..c0f801b083 100644 --- a/js/data/locale/ca/list.json +++ b/js/data/locale/ca/list.json @@ -1,7 +1,29 @@ { "standard": { - "2": "{0} i {1}", - "end": "{0} i {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} i {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}" + }, + "long": { + "2": "{0} i {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}" + }, + "full": { + "2": "{0} i {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} i {1}" + } }, "or": { "2": "{0} o {1}", diff --git a/js/data/locale/chr/list.json b/js/data/locale/chr/list.json index e625b42e8b..ef75d1dddc 100644 --- a/js/data/locale/chr/list.json +++ b/js/data/locale/chr/list.json @@ -1,7 +1,29 @@ { "standard": { - "2": "{0} ᎠᎴ {1}", - "end": "{0}, ᎠᎴ {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, & {1}" + }, + "medium": { + "2": "{0} & {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, & {1}" + }, + "long": { + "2": "{0} ᎠᎴ {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ᎠᎴ {1}" + }, + "full": { + "2": "{0} ᎠᎴ {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ᎠᎴ {1}" + } }, "or": { "2": "{0} ᎠᎴᏱᎩ {1}", diff --git a/js/data/locale/cs/list.json b/js/data/locale/cs/list.json index 39b7114716..184b995f6e 100644 --- a/js/data/locale/cs/list.json +++ b/js/data/locale/cs/list.json @@ -1,7 +1,29 @@ { "standard": { - "2": "{0} a {1}", - "end": "{0} a {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} a {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} a {1}" + }, + "long": { + "2": "{0} a {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} a {1}" + }, + "full": { + "2": "{0} a {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} a {1}" + } }, "or": { "2": "{0} nebo {1}", diff --git a/js/data/locale/cy/list.json b/js/data/locale/cy/list.json index 592a184a91..5c24e440d3 100644 --- a/js/data/locale/cy/list.json +++ b/js/data/locale/cy/list.json @@ -1,7 +1,29 @@ { "standard": { - "2": "{0} a(c) {1}", - "end": "{0}, a(c) {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} a(c) {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, a(c) {1}" + }, + "long": { + "2": "{0} a(c) {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, a(c) {1}" + }, + "full": { + "2": "{0} a(c) {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, a(c) {1}" + } }, "or": { "2": "{0} neu {1}", diff --git a/js/data/locale/da/list.json b/js/data/locale/da/list.json index 8e0105a29c..bac6eba478 100644 --- a/js/data/locale/da/list.json +++ b/js/data/locale/da/list.json @@ -4,8 +4,30 @@ "end": "{0} og {1}" }, "or": { - "2": "{0} eller {1}", - "end": "{0} eller {1}" + "short": { + "2": "{0} el. {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} el. {1}" + }, + "medium": { + "2": "{0} el. {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} el. {1}" + }, + "long": { + "2": "{0} eller {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} eller {1}" + }, + "full": { + "2": "{0} eller {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} eller {1}" + } }, "unit": { "2": "{0} og {1}", diff --git a/js/data/locale/el/list.json b/js/data/locale/el/list.json index 7e6f01e43f..15166a6c6c 100644 --- a/js/data/locale/el/list.json +++ b/js/data/locale/el/list.json @@ -1,7 +1,29 @@ { "standard": { - "2": "{0} και {1}", - "end": "{0} και {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} και {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} και {1}" + }, + "long": { + "2": "{0} και {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} και {1}" + }, + "full": { + "2": "{0} και {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} και {1}" + } }, "or": { "2": "{0} ή {1}", diff --git a/js/data/locale/en/AU/list.json b/js/data/locale/en/AU/list.json deleted file mode 100644 index 920fb855b5..0000000000 --- a/js/data/locale/en/AU/list.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "standard": { - "end": "{0} and {1}" - }, - "or": { - "end": "{0} or {1}" - } -} \ No newline at end of file diff --git a/js/data/locale/en/GB/list.json b/js/data/locale/en/GB/list.json deleted file mode 100644 index 920fb855b5..0000000000 --- a/js/data/locale/en/GB/list.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "standard": { - "end": "{0} and {1}" - }, - "or": { - "end": "{0} or {1}" - } -} \ No newline at end of file diff --git a/js/data/locale/en/list.json b/js/data/locale/en/list.json index 521d06580f..680f6a56eb 100644 --- a/js/data/locale/en/list.json +++ b/js/data/locale/en/list.json @@ -1,7 +1,32 @@ { "standard": { - "2": "{0} and {1}", - "end": "{0}, and {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} and {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} and {1}" + }, + "long": { + "2": "{0} and {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} and {1}" + }, + "full": { + "2": "{0} and {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} and {1}" + } + }, + "or": { + "end": "{0} or {1}" }, "unit": { "short": { diff --git a/js/data/locale/et/list.json b/js/data/locale/et/list.json index f3dbdfd884..5a559df34a 100644 --- a/js/data/locale/et/list.json +++ b/js/data/locale/et/list.json @@ -1,7 +1,29 @@ { "standard": { - "2": "{0} ja {1}", - "end": "{0} ja {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} ja {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ja {1}" + }, + "long": { + "2": "{0} ja {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ja {1}" + }, + "full": { + "2": "{0} ja {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ja {1}" + } }, "or": { "2": "{0} või {1}", diff --git a/js/data/locale/eu/list.json b/js/data/locale/eu/list.json index 24c0a9419e..8d96c0f212 100644 --- a/js/data/locale/eu/list.json +++ b/js/data/locale/eu/list.json @@ -1,7 +1,29 @@ { "standard": { - "2": "{0} eta {1}", - "end": "{0} eta {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} eta {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} eta {1}" + }, + "long": { + "2": "{0} eta {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} eta {1}" + }, + "full": { + "2": "{0} eta {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} eta {1}" + } }, "or": { "2": "{0} edo {1}", diff --git a/js/data/locale/fa/list.json b/js/data/locale/fa/list.json index ca31ae275c..9e7aefac61 100644 --- a/js/data/locale/fa/list.json +++ b/js/data/locale/fa/list.json @@ -1,14 +1,34 @@ { "standard": { - "2": "{0} و {1}", - "start": "{0}،‏ {1}", - "middle": "{0}،‏ {1}", - "end": "{0}، و {1}" + "short": { + "2": "{0}،‏ {1}", + "start": "{0}،‏ {1}", + "middle": "{0}،‏ {1}", + "end": "{0}،‏ {1}" + }, + "medium": { + "2": "{0} و {1}", + "start": "{0}،‏ {1}", + "middle": "{0}،‏ {1}", + "end": "{0}، و {1}" + }, + "long": { + "2": "{0} و {1}", + "start": "{0}،‏ {1}", + "middle": "{0}،‏ {1}", + "end": "{0}، و {1}" + }, + "full": { + "2": "{0} و {1}", + "start": "{0}،‏ {1}", + "middle": "{0}،‏ {1}", + "end": "{0}، و {1}" + } }, "or": { "2": "{0} یا {1}", - "start": "{0}، {1}", - "middle": "{0}، {1}", + "start": "{0}،‏ {1}", + "middle": "{0}،‏ {1}", "end": "{0}، یا {1}" }, "unit": { diff --git a/js/data/locale/fil/list.json b/js/data/locale/fil/list.json index db9b4b951b..0993595e85 100644 --- a/js/data/locale/fil/list.json +++ b/js/data/locale/fil/list.json @@ -1,7 +1,29 @@ { "standard": { - "2": "{0} at {1}", - "end": "{0}, at {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} at {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, at {1}" + }, + "long": { + "2": "{0} at {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, at {1}" + }, + "full": { + "2": "{0} at {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, at {1}" + } }, "or": { "2": "{0} o {1}", diff --git a/js/data/locale/fr/list.json b/js/data/locale/fr/list.json index 91f180325d..a53c490f4f 100644 --- a/js/data/locale/fr/list.json +++ b/js/data/locale/fr/list.json @@ -1,7 +1,29 @@ { "standard": { - "2": "{0} et {1}", - "end": "{0} et {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} et {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} et {1}" + }, + "long": { + "2": "{0} et {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} et {1}" + }, + "full": { + "2": "{0} et {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} et {1}" + } }, "or": { "2": "{0} ou {1}", diff --git a/js/data/locale/ga/list.json b/js/data/locale/ga/list.json index fef74bde3f..ece512cb93 100644 --- a/js/data/locale/ga/list.json +++ b/js/data/locale/ga/list.json @@ -1,7 +1,29 @@ { "standard": { - "2": "{0} agus {1}", - "end": "{0}, agus {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} agus {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, agus {1}" + }, + "long": { + "2": "{0} agus {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, agus {1}" + }, + "full": { + "2": "{0} agus {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, agus {1}" + } }, "or": { "2": "{0} nó {1}", diff --git a/js/data/locale/gd/list.json b/js/data/locale/gd/list.json index 5b3c54fa61..445a67ea7b 100644 --- a/js/data/locale/gd/list.json +++ b/js/data/locale/gd/list.json @@ -1,16 +1,16 @@ { "standard": { "short": { - "2": "{0} is {1}", + "2": "{0}, {1}", "start": "{0}, {1}", "middle": "{0}, {1}", - "end": "{0} is {1}" + "end": "{0}, {1}" }, "medium": { - "2": "{0} is {1}", + "2": "{0} ⁊ {1}", "start": "{0}, {1}", "middle": "{0}, {1}", - "end": "{0} is {1}" + "end": "{0} ⁊ {1}" }, "long": { "2": "{0} agus {1}", diff --git a/js/data/locale/gu/list.json b/js/data/locale/gu/list.json index 006b27191f..190c417544 100644 --- a/js/data/locale/gu/list.json +++ b/js/data/locale/gu/list.json @@ -1,11 +1,55 @@ { "standard": { - "2": "{0} અને {1}", - "end": "{0} અને {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} અને {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} અને {1}" + }, + "long": { + "2": "{0} અને {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} અને {1}" + }, + "full": { + "2": "{0} અને {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} અને {1}" + } }, "or": { - "2": "{0} અથવા {1}", - "end": "{0}, અથવા {1}" + "short": { + "2": "{0} અથવા {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} અથવા {1}" + }, + "medium": { + "2": "{0} અથવા {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} અથવા {1}" + }, + "long": { + "2": "{0} અથવા {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, અથવા {1}" + }, + "full": { + "2": "{0} અથવા {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, અથવા {1}" + } }, "unit": { "short": { diff --git a/js/data/locale/he/list.json b/js/data/locale/he/list.json index 62bd0f6f90..af6dff9b48 100644 --- a/js/data/locale/he/list.json +++ b/js/data/locale/he/list.json @@ -4,8 +4,30 @@ "end": "{0} ו{1}" }, "or": { - "2": "{0} או {1}", - "end": "{0}, או {1}" + "short": { + "2": "{0} או {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} או {1}" + }, + "medium": { + "2": "{0} או {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} או {1}" + }, + "long": { + "2": "{0} או {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, או {1}" + }, + "full": { + "2": "{0} או {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, או {1}" + } }, "unit": { "short": { diff --git a/js/data/locale/hi/list.json b/js/data/locale/hi/list.json index c5224168b5..fac73fedb1 100644 --- a/js/data/locale/hi/list.json +++ b/js/data/locale/hi/list.json @@ -31,10 +31,10 @@ }, "unit": { "short": { - "2": "{0}, {1}", + "2": "{0} {1}", "start": "{0}, {1}", "middle": "{0}, {1}", - "end": "{0}, {1}" + "end": "{0} {1}" }, "medium": { "2": "{0}, {1}", diff --git a/js/data/locale/hr/list.json b/js/data/locale/hr/list.json index f0c152e522..b7341e1b83 100644 --- a/js/data/locale/hr/list.json +++ b/js/data/locale/hr/list.json @@ -15,10 +15,10 @@ "end": "{0} {1}" }, "medium": { - "2": "{0}, {1}", + "2": "{0} i {1}", "start": "{0}, {1}", "middle": "{0}, {1}", - "end": "{0}, {1}" + "end": "{0} i {1}" }, "long": { "2": "{0} i {1}", diff --git a/js/data/locale/hy/list.json b/js/data/locale/hy/list.json index 68307564f9..d913239949 100644 --- a/js/data/locale/hy/list.json +++ b/js/data/locale/hy/list.json @@ -1,7 +1,29 @@ { "standard": { - "2": "{0} և {1}", - "end": "{0} և {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} և {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} և {1}" + }, + "long": { + "2": "{0} և {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} և {1}" + }, + "full": { + "2": "{0} և {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} և {1}" + } }, "or": { "2": "{0} կամ {1}", diff --git a/js/data/locale/id/list.json b/js/data/locale/id/list.json index b494fed2fc..0f46a6fc58 100644 --- a/js/data/locale/id/list.json +++ b/js/data/locale/id/list.json @@ -1,7 +1,29 @@ { "standard": { - "2": "{0} dan {1}", - "end": "{0}, dan {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} dan {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, dan {1}" + }, + "long": { + "2": "{0} dan {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, dan {1}" + }, + "full": { + "2": "{0} dan {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, dan {1}" + } }, "or": { "2": "{0} atau {1}", diff --git a/js/data/locale/is/list.json b/js/data/locale/is/list.json index a143116f71..d9068b4cdf 100644 --- a/js/data/locale/is/list.json +++ b/js/data/locale/is/list.json @@ -1,7 +1,29 @@ { "standard": { - "2": "{0} og {1}", - "end": "{0} og {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} og {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} og {1}" + }, + "long": { + "2": "{0} og {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} og {1}" + }, + "full": { + "2": "{0} og {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} og {1}" + } }, "or": { "2": "{0} eða {1}", diff --git a/js/data/locale/kea/list.json b/js/data/locale/kea/list.json index b55f12f0f7..5181da8c0f 100644 --- a/js/data/locale/kea/list.json +++ b/js/data/locale/kea/list.json @@ -3,6 +3,10 @@ "2": "{0} i {1}", "end": "{0} i {1}" }, + "or": { + "2": "{0} o {1}", + "end": "{0} o {1}" + }, "unit": { "short": { "2": "{0}, {1}", diff --git a/js/data/locale/kn/list.json b/js/data/locale/kn/list.json index 79efc95e58..aebe6f4cb7 100644 --- a/js/data/locale/kn/list.json +++ b/js/data/locale/kn/list.json @@ -1,7 +1,29 @@ { "standard": { - "2": "{0} ಮತ್ತು {1}", - "end": "{0}, ಮತ್ತು {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} ಮತ್ತು {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ಮತ್ತು {1}" + }, + "long": { + "2": "{0} ಮತ್ತು {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ಮತ್ತು {1}" + }, + "full": { + "2": "{0} ಮತ್ತು {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ಮತ್ತು {1}" + } }, "or": { "2": "{0} ಅಥವಾ {1}", diff --git a/js/data/locale/ml/list.json b/js/data/locale/ml/list.json index ace803b6e4..b9ef3c6e8f 100644 --- a/js/data/locale/ml/list.json +++ b/js/data/locale/ml/list.json @@ -11,7 +11,7 @@ }, "unit": { "short": { - "2": "{0} കൂടാതെ {1}", + "2": "{0}, {1}", "start": "{0} {1}", "middle": "{0} {1}", "end": "{0} {1}" diff --git a/js/data/locale/mn/list.json b/js/data/locale/mn/list.json index f2a030c04f..98b210d08d 100644 --- a/js/data/locale/mn/list.json +++ b/js/data/locale/mn/list.json @@ -1,6 +1,12 @@ { "or": { "2": "{0} эсвэл {1}", - "end": "{0}, эсвэл {1}" + "end": "{0}, {1} зэргийн аль нэг" + }, + "unit": { + "2": "{0} {1}", + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}" } } \ No newline at end of file diff --git a/js/data/locale/ms/list.json b/js/data/locale/ms/list.json index f2a59d82e8..bac5776963 100644 --- a/js/data/locale/ms/list.json +++ b/js/data/locale/ms/list.json @@ -1,7 +1,29 @@ { "standard": { - "2": "{0} dan {1}", - "end": "{0} dan {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} dan {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} dan {1}" + }, + "long": { + "2": "{0} dan {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} dan {1}" + }, + "full": { + "2": "{0} dan {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} dan {1}" + } }, "or": { "2": "{0} atau {1}", diff --git a/js/data/locale/my/list.json b/js/data/locale/my/list.json index 3cac63a93f..33033a8d2c 100644 --- a/js/data/locale/my/list.json +++ b/js/data/locale/my/list.json @@ -6,10 +6,30 @@ "end": "{0}နှင့် {1}" }, "or": { - "2": "{0} သို့မဟုတ် {1}", - "start": "{0} {1}", - "middle": "{0} {1}", - "end": "{0} သို့မဟုတ် {1}" + "short": { + "2": "{0} သို့မဟုတ် {1}", + "start": "{0} ၊ {1}", + "middle": "{0} {1}", + "end": "{0} သို့မဟုတ် {1}" + }, + "medium": { + "2": "{0} သို့မဟုတ် {1}", + "start": "{0} ၊ {1}", + "middle": "{0} {1}", + "end": "{0} သို့မဟုတ် {1}" + }, + "long": { + "2": "{0} သို့မဟုတ် {1}", + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} သို့မဟုတ် {1}" + }, + "full": { + "2": "{0} သို့မဟုတ် {1}", + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} သို့မဟုတ် {1}" + } }, "unit": { "short": { diff --git a/js/data/locale/ne/list.json b/js/data/locale/ne/list.json index d7dd7813c2..189c08dcf6 100644 --- a/js/data/locale/ne/list.json +++ b/js/data/locale/ne/list.json @@ -1,8 +1,29 @@ { "standard": { - "2": "{0} र {1}", - "start": "{0},{1}", - "end": "{0} र {1}" + "short": { + "2": "{0}, {1}", + "start": "{0},{1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} र {1}", + "start": "{0},{1}", + "middle": "{0}, {1}", + "end": "{0} र {1}" + }, + "long": { + "2": "{0} र {1}", + "start": "{0},{1}", + "middle": "{0}, {1}", + "end": "{0} र {1}" + }, + "full": { + "2": "{0} र {1}", + "start": "{0},{1}", + "middle": "{0}, {1}", + "end": "{0} र {1}" + } }, "or": { "2": "{0} वा {1}", diff --git a/js/data/locale/pa/Arab/list.json b/js/data/locale/pa/Arab/list.json deleted file mode 100644 index ce3284de48..0000000000 --- a/js/data/locale/pa/Arab/list.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "standard": { - "2": "{0}, {1}", - "end": "{0}, {1}" - }, - "or": { - "2": "{0} or {1}" - } -} \ No newline at end of file diff --git a/js/data/locale/pa/list.json b/js/data/locale/pa/list.json index 084353afe5..6489ab4d8f 100644 --- a/js/data/locale/pa/list.json +++ b/js/data/locale/pa/list.json @@ -1,9 +1,80 @@ { "standard": { - "2": "{0} ਅਤੇ {1}", - "end": "{0} ਅਤੇ {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} ਅਤੇ {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ਅਤੇ {1}" + }, + "long": { + "2": "{0} ਅਤੇ {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ਅਤੇ {1}" + }, + "full": { + "2": "{0} ਅਤੇ {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ਅਤੇ {1}" + } }, "or": { - "2": "{0} ਜਾਂ {1}" + "short": { + "2": "{0} ਜਾਂ {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ਜਾਂ {1}" + }, + "medium": { + "2": "{0} ਜਾਂ {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ਜਾਂ {1}" + }, + "long": { + "2": "{0} ਜਾਂ {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}" + }, + "full": { + "2": "{0} ਜਾਂ {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, or {1}" + } + }, + "unit": { + "short": { + "2": "{0} {1}", + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}" + }, + "medium": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "long": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "full": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + } } } \ No newline at end of file diff --git a/js/data/locale/ps/list.json b/js/data/locale/ps/list.json index b56257b265..20da4e8cd2 100644 --- a/js/data/locale/ps/list.json +++ b/js/data/locale/ps/list.json @@ -1,16 +1,16 @@ { "standard": { "short": { - "2": "{0} او {1}", - "start": "{0}, {1}", - "middle": "{0}, {1}", - "end": "{0}, {1}" + "2": "{0}، {1}", + "start": "{0}، {1}", + "middle": "{0}، {1}", + "end": "{0}، او {1}" }, "medium": { "2": "{0} او {1}", - "start": "{0}, {1}", - "middle": "{0}, {1}", - "end": "{0}, {1}" + "start": "{0}، {1}", + "middle": "{0}، {1}", + "end": "{0}، او {1}" }, "long": { "2": "{0} او {1}", diff --git a/js/data/locale/pt/list.json b/js/data/locale/pt/list.json index 814c21c991..b5da1161f4 100644 --- a/js/data/locale/pt/list.json +++ b/js/data/locale/pt/list.json @@ -1,7 +1,29 @@ { "standard": { - "2": "{0} e {1}", - "end": "{0} e {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} e {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}" + }, + "long": { + "2": "{0} e {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}" + }, + "full": { + "2": "{0} e {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}" + } }, "or": { "2": "{0} ou {1}", @@ -9,6 +31,30 @@ }, "unit": { "2": "{0} e {1}", - "end": "{0} e {1}" + "end": "{0} e {1}", + "short": { + "2": "{0} {1}", + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}" + }, + "medium": { + "2": "{0} e {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}" + }, + "long": { + "2": "{0} e {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}" + }, + "full": { + "2": "{0} e {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} e {1}" + } } } \ No newline at end of file diff --git a/js/data/locale/ro/list.json b/js/data/locale/ro/list.json index 5293456ff3..7cc999c902 100644 --- a/js/data/locale/ro/list.json +++ b/js/data/locale/ro/list.json @@ -1,7 +1,29 @@ { "standard": { - "2": "{0} și {1}", - "end": "{0} și {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} și {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} și {1}" + }, + "long": { + "2": "{0} și {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} și {1}" + }, + "full": { + "2": "{0} și {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} și {1}" + } }, "or": { "2": "{0} sau {1}", diff --git a/js/data/locale/ru/list.json b/js/data/locale/ru/list.json index a873579956..fdab1510a3 100644 --- a/js/data/locale/ru/list.json +++ b/js/data/locale/ru/list.json @@ -1,7 +1,29 @@ { "standard": { - "2": "{0} и {1}", - "end": "{0} и {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} и {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} и {1}" + }, + "long": { + "2": "{0} и {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} и {1}" + }, + "full": { + "2": "{0} и {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} и {1}" + } }, "or": { "2": "{0} или {1}", diff --git a/js/data/locale/sd/list.json b/js/data/locale/sd/list.json index c4eeb99f25..39187b5937 100644 --- a/js/data/locale/sd/list.json +++ b/js/data/locale/sd/list.json @@ -1,7 +1,29 @@ { "standard": { - "2": "{0} ۽ {1}", - "end": "{0}، ۽ {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} ۽ {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}، ۽ {1}" + }, + "long": { + "2": "{0} ۽ {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}، ۽ {1}" + }, + "full": { + "2": "{0} ۽ {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}، ۽ {1}" + } }, "or": { "2": "{0} يا {1}", diff --git a/js/data/locale/so/list.json b/js/data/locale/so/list.json index a50cd5a720..431686dc4d 100644 --- a/js/data/locale/so/list.json +++ b/js/data/locale/so/list.json @@ -1,7 +1,29 @@ { "standard": { - "2": "{0} iyo {1}", - "end": "{0} iyo {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} & {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} & {1}" + }, + "long": { + "2": "{0} iyo {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} iyo {1}" + }, + "full": { + "2": "{0} iyo {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} iyo {1}" + } }, "or": { "2": "{0} ama {1}", @@ -24,13 +46,13 @@ "2": "{0} iyo {1}", "start": "{0}, {1}", "middle": "{0}, {1}", - "end": "{0} iyo {1}" + "end": "{0}, {1}" }, "full": { "2": "{0} iyo {1}", "start": "{0}, {1}", "middle": "{0}, {1}", - "end": "{0} iyo {1}" + "end": "{0}, {1}" } } } \ No newline at end of file diff --git a/js/data/locale/sw/list.json b/js/data/locale/sw/list.json index 14ed400519..b412a154f2 100644 --- a/js/data/locale/sw/list.json +++ b/js/data/locale/sw/list.json @@ -1,11 +1,55 @@ { "standard": { - "2": "{0} na {1}", - "end": "{0} na {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} na {1}" + }, + "medium": { + "2": "{0} na {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} na {1}" + }, + "long": { + "2": "{0} na {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} na {1}" + }, + "full": { + "2": "{0} na {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} na {1}" + } }, "or": { - "2": "{0} au {1}", - "end": "{0} au {1}" + "short": { + "2": "{0} au {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, au {1}" + }, + "medium": { + "2": "{0} au {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, au {1}" + }, + "long": { + "2": "{0} au {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} au {1}" + }, + "full": { + "2": "{0} au {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} au {1}" + } }, "unit": { "2": "{0} na {1}", diff --git a/js/data/locale/ta/list.json b/js/data/locale/ta/list.json index ab69d6460f..a177b7fa10 100644 --- a/js/data/locale/ta/list.json +++ b/js/data/locale/ta/list.json @@ -15,22 +15,22 @@ "end": "{0} {1}" }, "medium": { - "2": "{0}, {1}", + "2": "{0} மற்றும் {1}", "start": "{0}, {1}", "middle": "{0}, {1}", - "end": "{0}, {1}" + "end": "{0} மற்றும் {1}" }, "long": { - "2": "{0}, {1}", + "2": "{0} மற்றும் {1}", "start": "{0}, {1}", "middle": "{0}, {1}", - "end": "{0}, {1}" + "end": "{0} மற்றும் {1}" }, "full": { - "2": "{0}, {1}", + "2": "{0} மற்றும் {1}", "start": "{0}, {1}", "middle": "{0}, {1}", - "end": "{0}, {1}" + "end": "{0} மற்றும் {1}" } } } \ No newline at end of file diff --git a/js/data/locale/te/list.json b/js/data/locale/te/list.json index 1bf7c1d88d..7e348628b5 100644 --- a/js/data/locale/te/list.json +++ b/js/data/locale/te/list.json @@ -1,7 +1,29 @@ { "standard": { - "2": "{0} మరియు {1}", - "end": "{0} మరియు {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} మరియు {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} మరియు {1}" + }, + "long": { + "2": "{0} మరియు {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} మరియు {1}" + }, + "full": { + "2": "{0} మరియు {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} మరియు {1}" + } }, "or": { "2": "{0} లేదా {1}", diff --git a/js/data/locale/th/list.json b/js/data/locale/th/list.json index 3acfea4c8a..bf0fdc8e9e 100644 --- a/js/data/locale/th/list.json +++ b/js/data/locale/th/list.json @@ -1,34 +1,36 @@ { "standard": { + "2": "{0}และ{1}", + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} และ{1}" + }, + "or": { "short": { - "2": "{0} และ {1}", - "start": "{0} {1}", - "middle": "{0} {1}", - "end": "{0} และ{1}" + "2": "{0}หรือ{1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} หรือ {1}" }, "medium": { - "2": "{0} และ {1}", - "start": "{0} {1}", - "middle": "{0} {1}", - "end": "{0} และ{1}" + "2": "{0}หรือ{1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} หรือ {1}" }, "long": { - "2": "{0}และ{1}", - "start": "{0} {1}", - "middle": "{0} {1}", - "end": "{0} และ{1}" + "2": "{0} หรือ {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} หรือ {1}" }, "full": { - "2": "{0}และ{1}", - "start": "{0} {1}", - "middle": "{0} {1}", - "end": "{0} และ{1}" + "2": "{0} หรือ {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} หรือ {1}" } }, - "or": { - "2": "{0} หรือ {1}", - "end": "{0} หรือ {1}" - }, "unit": { "short": { "2": "{0} {1}", diff --git a/js/data/locale/tk/list.json b/js/data/locale/tk/list.json index 84c3e08b1f..015c7d1d1b 100644 --- a/js/data/locale/tk/list.json +++ b/js/data/locale/tk/list.json @@ -1,7 +1,29 @@ { "standard": { - "2": "{0} we {1}", - "end": "{0} we {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} we {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} we {1}" + }, + "long": { + "2": "{0} we {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} we {1}" + }, + "full": { + "2": "{0} we {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} we {1}" + } }, "or": { "2": "{0} ýa-da {1}", @@ -21,13 +43,13 @@ "end": "{0}, {1}" }, "long": { - "2": "{0} we {1}", + "2": "{0}, {1}", "start": "{0}, {1}", "middle": "{0}, {1}", "end": "{0}, {1}" }, "full": { - "2": "{0} we {1}", + "2": "{0}, {1}", "start": "{0}, {1}", "middle": "{0}, {1}", "end": "{0}, {1}" diff --git a/js/data/locale/tr/list.json b/js/data/locale/tr/list.json index 7b3581c1d8..e023d1fef5 100644 --- a/js/data/locale/tr/list.json +++ b/js/data/locale/tr/list.json @@ -1,7 +1,29 @@ { "standard": { - "2": "{0} ve {1}", - "end": "{0} ve {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} ve {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ve {1}" + }, + "long": { + "2": "{0} ve {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ve {1}" + }, + "full": { + "2": "{0} ve {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} ve {1}" + } }, "or": { "2": "{0} veya {1}", diff --git a/js/data/locale/uk/list.json b/js/data/locale/uk/list.json index 4e5133bbdc..6daef58fb7 100644 --- a/js/data/locale/uk/list.json +++ b/js/data/locale/uk/list.json @@ -1,13 +1,5 @@ { "standard": { - "2": "{0} і {1}", - "end": "{0} і {1}" - }, - "or": { - "2": "{0} або {1}", - "end": "{0} або {1}" - }, - "unit": { "short": { "2": "{0}, {1}", "start": "{0}, {1}", @@ -15,10 +7,10 @@ "end": "{0}, {1}" }, "medium": { - "2": "{0}, {1}", + "2": "{0} і {1}", "start": "{0}, {1}", "middle": "{0}, {1}", - "end": "{0}, {1}" + "end": "{0} і {1}" }, "long": { "2": "{0} і {1}", @@ -32,5 +24,13 @@ "middle": "{0}, {1}", "end": "{0} і {1}" } + }, + "or": { + "2": "{0} або {1}", + "end": "{0} або {1}" + }, + "unit": { + "2": "{0} і {1}", + "end": "{0} і {1}" } } \ No newline at end of file diff --git a/js/data/locale/ur/list.json b/js/data/locale/ur/list.json index 42197b9319..3bfac2f114 100644 --- a/js/data/locale/ur/list.json +++ b/js/data/locale/ur/list.json @@ -1,9 +1,29 @@ { "standard": { - "2": "{0} اور {1}", - "start": "{0}، {1}", - "middle": "{0}، {1}", - "end": "{0}، اور {1}" + "short": { + "2": "{0}، {1}", + "start": "{0}، {1}", + "middle": "{0}، {1}", + "end": "{0}، {1}" + }, + "medium": { + "2": "{0} اور {1}", + "start": "{0}، {1}", + "middle": "{0}، {1}", + "end": "{0}، اور {1}" + }, + "long": { + "2": "{0} اور {1}", + "start": "{0}، {1}", + "middle": "{0}، {1}", + "end": "{0}، اور {1}" + }, + "full": { + "2": "{0} اور {1}", + "start": "{0}، {1}", + "middle": "{0}، {1}", + "end": "{0}، اور {1}" + } }, "or": { "2": "{0} یا {1}", @@ -25,13 +45,13 @@ "end": "{0}، اور {1}" }, "long": { - "2": "{0} اور {1}", + "2": "{0}، {1}", "start": "{0}, {1}", "middle": "{0}, {1}", "end": "{0}، اور {1}" }, "full": { - "2": "{0} اور {1}", + "2": "{0}، {1}", "start": "{0}, {1}", "middle": "{0}, {1}", "end": "{0}، اور {1}" diff --git a/js/data/locale/uz/Latn/list.json b/js/data/locale/uz/Latn/list.json index 5c1fc0ac14..818d4b1730 100644 --- a/js/data/locale/uz/Latn/list.json +++ b/js/data/locale/uz/Latn/list.json @@ -1,8 +1,4 @@ { - "standard": { - "2": "{0} va {1}", - "end": "{0} va {1}" - }, "or": { "2": "{0} yoki {1}", "end": "{0} yoki {1}" diff --git a/js/data/locale/uz/list.json b/js/data/locale/uz/list.json index 9e6fe72734..09c25e249d 100644 --- a/js/data/locale/uz/list.json +++ b/js/data/locale/uz/list.json @@ -1,12 +1,28 @@ { "standard": { - "2": "{0} va {1}", - "end": "{0} va {1}" - }, - "unit": { - "2": "{0} {1}", - "start": "{0} {1}", - "middle": "{0} {1}", - "end": "{0} {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} va {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} va {1}" + }, + "long": { + "2": "{0} va {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} va {1}" + }, + "full": { + "2": "{0} va {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} va {1}" + } } } \ No newline at end of file diff --git a/js/data/locale/vi/list.json b/js/data/locale/vi/list.json index 681b42da36..496d6d4c7d 100644 --- a/js/data/locale/vi/list.json +++ b/js/data/locale/vi/list.json @@ -1,7 +1,29 @@ { "standard": { - "2": "{0} và {1}", - "end": "{0} và {1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} và {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} và {1}" + }, + "long": { + "2": "{0} và {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} và {1}" + }, + "full": { + "2": "{0} và {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0} và {1}" + } }, "or": { "2": "{0} hoặc {1}", @@ -15,22 +37,22 @@ "end": "{0} {1}" }, "medium": { - "2": "{0}, {1}", + "2": "{0} và {1}", "start": "{0}, {1}", "middle": "{0}, {1}", - "end": "{0}, {1}" + "end": "{0} và {1}" }, "long": { - "2": "{0}, {1}", + "2": "{0} và {1}", "start": "{0}, {1}", "middle": "{0}, {1}", - "end": "{0}, {1}" + "end": "{0} và {1}" }, "full": { - "2": "{0}, {1}", + "2": "{0} và {1}", "start": "{0}, {1}", "middle": "{0}, {1}", - "end": "{0}, {1}" + "end": "{0} và {1}" } } } \ No newline at end of file diff --git a/js/data/locale/yue/Hant/list.json b/js/data/locale/yue/Hant/list.json deleted file mode 100644 index a8fedb8367..0000000000 --- a/js/data/locale/yue/Hant/list.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "standard": { - "2": "{0}同{1}", - "start": "{0}、{1}", - "middle": "{0}、{1}", - "end": "{0}同{1}" - }, - "unit": { - "short": { - "2": "{0}{1}", - "start": "{0}{1}", - "middle": "{0}{1}", - "end": "{0}{1}" - }, - "medium": { - "2": "{0} {1}", - "start": "{0} {1}", - "middle": "{0} {1}", - "end": "{0} {1}" - }, - "long": { - "2": "{0} {1}", - "start": "{0} {1}", - "middle": "{0} {1}", - "end": "{0} {1}" - }, - "full": { - "2": "{0} {1}", - "start": "{0} {1}", - "middle": "{0} {1}", - "end": "{0} {1}" - } - } -} \ No newline at end of file diff --git a/js/data/locale/zu/list.json b/js/data/locale/zu/list.json index df07b3bab7..1675970610 100644 --- a/js/data/locale/zu/list.json +++ b/js/data/locale/zu/list.json @@ -1,7 +1,29 @@ { "standard": { - "2": "{0} ne-{1}", - "end": "{0}, ne-{1}" + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} ne-{1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ne-{1}" + }, + "long": { + "2": "{0} ne-{1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ne-{1}" + }, + "full": { + "2": "{0} ne-{1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ne-{1}" + } }, "unit": { "short": { From 5588db484acef297e31e6117cc062d8d0ab23629 Mon Sep 17 00:00:00 2001 From: Goun Lee Date: Fri, 13 Mar 2020 16:29:42 +0900 Subject: [PATCH 02/14] Added newly generated list.json files.. --- js/data/locale/ceb/list.json | 58 ++++++++++++++++++++++++++++++++++ js/data/locale/en/AE/list.json | 17 ++++++++++ js/data/locale/en/AS/list.json | 17 ++++++++++ js/data/locale/en/BI/list.json | 17 ++++++++++ js/data/locale/en/CA/list.json | 11 +++++++ js/data/locale/en/GU/list.json | 17 ++++++++++ js/data/locale/en/IN/list.json | 7 ++++ js/data/locale/en/MH/list.json | 17 ++++++++++ js/data/locale/en/MP/list.json | 17 ++++++++++ js/data/locale/en/PR/list.json | 17 ++++++++++ js/data/locale/en/UM/list.json | 17 ++++++++++ js/data/locale/en/US/list.json | 17 ++++++++++ js/data/locale/en/VI/list.json | 17 ++++++++++ js/data/locale/ha/list.json | 10 ++++++ js/data/locale/ig/list.json | 32 +++++++++++++++++++ js/data/locale/kok/list.json | 58 ++++++++++++++++++++++++++++++++++ js/data/locale/qu/list.json | 6 ++++ 17 files changed, 352 insertions(+) create mode 100644 js/data/locale/ceb/list.json create mode 100644 js/data/locale/en/AE/list.json create mode 100644 js/data/locale/en/AS/list.json create mode 100644 js/data/locale/en/BI/list.json create mode 100644 js/data/locale/en/CA/list.json create mode 100644 js/data/locale/en/GU/list.json create mode 100644 js/data/locale/en/IN/list.json create mode 100644 js/data/locale/en/MH/list.json create mode 100644 js/data/locale/en/MP/list.json create mode 100644 js/data/locale/en/PR/list.json create mode 100644 js/data/locale/en/UM/list.json create mode 100644 js/data/locale/en/US/list.json create mode 100644 js/data/locale/en/VI/list.json create mode 100644 js/data/locale/ha/list.json create mode 100644 js/data/locale/ig/list.json create mode 100644 js/data/locale/kok/list.json create mode 100644 js/data/locale/qu/list.json diff --git a/js/data/locale/ceb/list.json b/js/data/locale/ceb/list.json new file mode 100644 index 0000000000..eb6ff5f4a9 --- /dev/null +++ b/js/data/locale/ceb/list.json @@ -0,0 +1,58 @@ +{ + "standard": { + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} ug {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, ug {1}" + }, + "long": { + "2": "{0} at {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, at {1}" + }, + "full": { + "2": "{0} at {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, at {1}" + } + }, + "or": { + "2": "{0} o {1}", + "end": "{0}, o {1}" + }, + "unit": { + "short": { + "2": "{0} {1}", + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}" + }, + "medium": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "long": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "full": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + } + } +} \ No newline at end of file diff --git a/js/data/locale/en/AE/list.json b/js/data/locale/en/AE/list.json new file mode 100644 index 0000000000..dfa8da73bd --- /dev/null +++ b/js/data/locale/en/AE/list.json @@ -0,0 +1,17 @@ +{ + "standard": { + "medium": { + "2": "{0} & {1}", + "end": "{0}, & {1}" + }, + "long": { + "end": "{0}, and {1}" + }, + "full": { + "end": "{0}, and {1}" + } + }, + "or": { + "end": "{0}, or {1}" + } +} \ No newline at end of file diff --git a/js/data/locale/en/AS/list.json b/js/data/locale/en/AS/list.json new file mode 100644 index 0000000000..dfa8da73bd --- /dev/null +++ b/js/data/locale/en/AS/list.json @@ -0,0 +1,17 @@ +{ + "standard": { + "medium": { + "2": "{0} & {1}", + "end": "{0}, & {1}" + }, + "long": { + "end": "{0}, and {1}" + }, + "full": { + "end": "{0}, and {1}" + } + }, + "or": { + "end": "{0}, or {1}" + } +} \ No newline at end of file diff --git a/js/data/locale/en/BI/list.json b/js/data/locale/en/BI/list.json new file mode 100644 index 0000000000..dfa8da73bd --- /dev/null +++ b/js/data/locale/en/BI/list.json @@ -0,0 +1,17 @@ +{ + "standard": { + "medium": { + "2": "{0} & {1}", + "end": "{0}, & {1}" + }, + "long": { + "end": "{0}, and {1}" + }, + "full": { + "end": "{0}, and {1}" + } + }, + "or": { + "end": "{0}, or {1}" + } +} \ No newline at end of file diff --git a/js/data/locale/en/CA/list.json b/js/data/locale/en/CA/list.json new file mode 100644 index 0000000000..a68f9a19e3 --- /dev/null +++ b/js/data/locale/en/CA/list.json @@ -0,0 +1,11 @@ +{ + "standard": { + "short": { + "2": "{0} and {1}", + "end": "{0}, and {1}" + }, + "medium": { + "end": "{0}, and {1}" + } + } +} \ No newline at end of file diff --git a/js/data/locale/en/GU/list.json b/js/data/locale/en/GU/list.json new file mode 100644 index 0000000000..dfa8da73bd --- /dev/null +++ b/js/data/locale/en/GU/list.json @@ -0,0 +1,17 @@ +{ + "standard": { + "medium": { + "2": "{0} & {1}", + "end": "{0}, & {1}" + }, + "long": { + "end": "{0}, and {1}" + }, + "full": { + "end": "{0}, and {1}" + } + }, + "or": { + "end": "{0}, or {1}" + } +} \ No newline at end of file diff --git a/js/data/locale/en/IN/list.json b/js/data/locale/en/IN/list.json new file mode 100644 index 0000000000..17496b0d42 --- /dev/null +++ b/js/data/locale/en/IN/list.json @@ -0,0 +1,7 @@ +{ + "standard": { + "short": { + "end": "{0}, and {1}" + } + } +} \ No newline at end of file diff --git a/js/data/locale/en/MH/list.json b/js/data/locale/en/MH/list.json new file mode 100644 index 0000000000..dfa8da73bd --- /dev/null +++ b/js/data/locale/en/MH/list.json @@ -0,0 +1,17 @@ +{ + "standard": { + "medium": { + "2": "{0} & {1}", + "end": "{0}, & {1}" + }, + "long": { + "end": "{0}, and {1}" + }, + "full": { + "end": "{0}, and {1}" + } + }, + "or": { + "end": "{0}, or {1}" + } +} \ No newline at end of file diff --git a/js/data/locale/en/MP/list.json b/js/data/locale/en/MP/list.json new file mode 100644 index 0000000000..dfa8da73bd --- /dev/null +++ b/js/data/locale/en/MP/list.json @@ -0,0 +1,17 @@ +{ + "standard": { + "medium": { + "2": "{0} & {1}", + "end": "{0}, & {1}" + }, + "long": { + "end": "{0}, and {1}" + }, + "full": { + "end": "{0}, and {1}" + } + }, + "or": { + "end": "{0}, or {1}" + } +} \ No newline at end of file diff --git a/js/data/locale/en/PR/list.json b/js/data/locale/en/PR/list.json new file mode 100644 index 0000000000..dfa8da73bd --- /dev/null +++ b/js/data/locale/en/PR/list.json @@ -0,0 +1,17 @@ +{ + "standard": { + "medium": { + "2": "{0} & {1}", + "end": "{0}, & {1}" + }, + "long": { + "end": "{0}, and {1}" + }, + "full": { + "end": "{0}, and {1}" + } + }, + "or": { + "end": "{0}, or {1}" + } +} \ No newline at end of file diff --git a/js/data/locale/en/UM/list.json b/js/data/locale/en/UM/list.json new file mode 100644 index 0000000000..dfa8da73bd --- /dev/null +++ b/js/data/locale/en/UM/list.json @@ -0,0 +1,17 @@ +{ + "standard": { + "medium": { + "2": "{0} & {1}", + "end": "{0}, & {1}" + }, + "long": { + "end": "{0}, and {1}" + }, + "full": { + "end": "{0}, and {1}" + } + }, + "or": { + "end": "{0}, or {1}" + } +} \ No newline at end of file diff --git a/js/data/locale/en/US/list.json b/js/data/locale/en/US/list.json new file mode 100644 index 0000000000..dfa8da73bd --- /dev/null +++ b/js/data/locale/en/US/list.json @@ -0,0 +1,17 @@ +{ + "standard": { + "medium": { + "2": "{0} & {1}", + "end": "{0}, & {1}" + }, + "long": { + "end": "{0}, and {1}" + }, + "full": { + "end": "{0}, and {1}" + } + }, + "or": { + "end": "{0}, or {1}" + } +} \ No newline at end of file diff --git a/js/data/locale/en/VI/list.json b/js/data/locale/en/VI/list.json new file mode 100644 index 0000000000..dfa8da73bd --- /dev/null +++ b/js/data/locale/en/VI/list.json @@ -0,0 +1,17 @@ +{ + "standard": { + "medium": { + "2": "{0} & {1}", + "end": "{0}, & {1}" + }, + "long": { + "end": "{0}, and {1}" + }, + "full": { + "end": "{0}, and {1}" + } + }, + "or": { + "end": "{0}, or {1}" + } +} \ No newline at end of file diff --git a/js/data/locale/ha/list.json b/js/data/locale/ha/list.json new file mode 100644 index 0000000000..2f7bc878e6 --- /dev/null +++ b/js/data/locale/ha/list.json @@ -0,0 +1,10 @@ +{ + "standard": { + "2": "{0} da {1}", + "end": "{0} da {1}" + }, + "or": { + "2": "{0} ko {1}", + "end": "{0} ko {1}" + } +} \ No newline at end of file diff --git a/js/data/locale/ig/list.json b/js/data/locale/ig/list.json new file mode 100644 index 0000000000..ece4024c3a --- /dev/null +++ b/js/data/locale/ig/list.json @@ -0,0 +1,32 @@ +{ + "standard": { + "short": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, na {1}" + }, + "medium": { + "2": "{0} na {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, na {1}" + }, + "long": { + "2": "{0} na {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, na {1}" + }, + "full": { + "2": "{0} na {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, na {1}" + } + }, + "unit": { + "2": "{0} na {1}", + "end": "{0}, na {1}" + } +} \ No newline at end of file diff --git a/js/data/locale/kok/list.json b/js/data/locale/kok/list.json new file mode 100644 index 0000000000..6393503d3b --- /dev/null +++ b/js/data/locale/kok/list.json @@ -0,0 +1,58 @@ +{ + "standard": { + "short": { + "2": "{0} & {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "medium": { + "2": "{0} & {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "long": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "full": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + } + }, + "or": { + "2": "{0} वा {1}", + "end": "{0}, वा {1}" + }, + "unit": { + "short": { + "2": "{0}, {1}", + "start": "{0} {1}", + "middle": "{0} {1}", + "end": "{0} {1}" + }, + "medium": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "long": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + }, + "full": { + "2": "{0}, {1}", + "start": "{0}, {1}", + "middle": "{0}, {1}", + "end": "{0}, {1}" + } + } +} \ No newline at end of file diff --git a/js/data/locale/qu/list.json b/js/data/locale/qu/list.json new file mode 100644 index 0000000000..b281faa19d --- /dev/null +++ b/js/data/locale/qu/list.json @@ -0,0 +1,6 @@ +{ + "or": { + "2": "{0} utaq {1}", + "end": "{0}, utaq {1}" + } +} \ No newline at end of file From 64ed66d04bb54831af8d498dce30c62e7367f92e Mon Sep 17 00:00:00 2001 From: Goun Lee Date: Mon, 16 Mar 2020 17:01:45 +0900 Subject: [PATCH 03/14] Fixed test failures.. --- js/test/strings-ext/testlistfmt_el.js | 12 +-- js/test/strings-ext/testlistfmt_en.js | 118 +++++++++++------------ js/test/strings-ext/testlistfmt_fa.js | 16 +-- js/test/strings-ext/testlistfmt_fr.js | 20 ++-- js/test/strings-ext/testlistfmt_gu_IN.js | 6 +- js/test/strings-ext/testlistfmt_hi_IN.js | 6 +- js/test/strings-ext/testlistfmt_kn_IN.js | 6 +- js/test/strings-ext/testlistfmt_ml_IN.js | 2 +- js/test/strings-ext/testlistfmt_ms.js | 12 +-- js/test/strings-ext/testlistfmt_pa.js | 20 ++-- js/test/strings-ext/testlistfmt_pt.js | 20 ++-- js/test/strings-ext/testlistfmt_ru.js | 12 +-- js/test/strings-ext/testlistfmt_ta_IN.js | 6 +- js/test/strings-ext/testlistfmt_te_IN.js | 6 +- js/test/strings-ext/testlistfmt_th_TH.js | 2 +- js/test/strings-ext/testlistfmt_tr.js | 6 +- js/test/strings-ext/testlistfmt_uk_UA.js | 12 +-- js/test/strings-ext/testlistfmt_ur.js | 12 +-- js/test/strings-ext/testlistfmtasync.js | 6 +- 19 files changed, 149 insertions(+), 151 deletions(-) diff --git a/js/test/strings-ext/testlistfmt_el.js b/js/test/strings-ext/testlistfmt_el.js index d3bdf72719..4932496845 100644 --- a/js/test/strings-ext/testlistfmt_el.js +++ b/js/test/strings-ext/testlistfmt_el.js @@ -51,7 +51,7 @@ module.exports.testlistfmt_el = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ένας", "δυο"]), "ένας και δυο"); + test.equal(fmt.format(["ένας", "δυο"]), "ένας, δυο"); test.done(); }, @@ -62,7 +62,7 @@ module.exports.testlistfmt_el = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ένας", "δυο", "τρία"]), "ένας, δυο και τρία"); + test.equal(fmt.format(["ένας", "δυο", "τρία"]), "ένας, δυο, τρία"); test.done(); }, @@ -73,7 +73,7 @@ module.exports.testlistfmt_el = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ένας", "δυο", "τρία", "τέσσερα"]), "ένας, δυο, τρία και τέσσερα"); + test.equal(fmt.format(["ένας", "δυο", "τρία", "τέσσερα"]), "ένας, δυο, τρία, τέσσερα"); test.done(); }, testListFmtUnitStyleelCYNumberFormatOne: function(test) { @@ -195,7 +195,7 @@ module.exports.testlistfmt_el = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ένας", "δυο"]), "ένας και δυο"); + test.equal(fmt.format(["ένας", "δυο"]), "ένας, δυο"); test.done(); }, @@ -206,7 +206,7 @@ module.exports.testlistfmt_el = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ένας", "δυο", "τρία"]), "ένας, δυο και τρία"); + test.equal(fmt.format(["ένας", "δυο", "τρία"]), "ένας, δυο, τρία"); test.done(); }, @@ -217,7 +217,7 @@ module.exports.testlistfmt_el = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ένας", "δυο", "τρία", "τέσσερα"]), "ένας, δυο, τρία και τέσσερα"); + test.equal(fmt.format(["ένας", "δυο", "τρία", "τέσσερα"]), "ένας, δυο, τρία, τέσσερα"); test.done(); }, testListFmtUnitStyleelGRNumberFormatOneLong: function(test) { diff --git a/js/test/strings-ext/testlistfmt_en.js b/js/test/strings-ext/testlistfmt_en.js index 1ec2db588e..7fff7694a4 100644 --- a/js/test/strings-ext/testlistfmt_en.js +++ b/js/test/strings-ext/testlistfmt_en.js @@ -50,7 +50,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one and two"); + test.equal(fmt.format(["one", "two"]), "one, two"); test.done(); }, @@ -61,7 +61,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, and three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); test.done(); }, @@ -72,7 +72,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, and four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); test.done(); }, @@ -83,7 +83,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four, and five"); + test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four, five"); test.done(); }, @@ -232,7 +232,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one and two"); + test.equal(fmt.format(["one", "two"]), "one, two"); test.done(); }, @@ -243,7 +243,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two and three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); test.done(); }, @@ -254,7 +254,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three and four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); test.done(); }, @@ -265,7 +265,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four and five"); + test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four, five"); test.done(); }, @@ -289,7 +289,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one and two"); + test.equal(fmt.format(["one", "two"]), "one, two"); test.done(); }, @@ -300,7 +300,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two and three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); test.done(); }, @@ -311,7 +311,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three and four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); test.done(); }, @@ -322,7 +322,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four and five"); + test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four, five"); test.done(); }, @@ -346,7 +346,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one and two"); + test.equal(fmt.format(["one", "two"]), "one, two"); test.done(); }, @@ -357,7 +357,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, and three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); test.done(); }, @@ -368,7 +368,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, and four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); test.done(); }, @@ -379,7 +379,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four, and five"); + test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four, five"); test.done(); }, @@ -463,7 +463,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one and two"); + test.equal(fmt.format(["one", "two"]), "one, two"); test.done(); }, @@ -474,7 +474,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, and three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); test.done(); }, @@ -485,7 +485,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, and four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); test.done(); }, @@ -496,7 +496,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four, and five"); + test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four, five"); test.done(); }, @@ -587,7 +587,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one and two"); + test.equal(fmt.format(["one", "two"]), "one, two"); test.done(); }, @@ -598,7 +598,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, and three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); test.done(); }, @@ -609,7 +609,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, and four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); test.done(); }, @@ -694,7 +694,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, and three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two and three"); test.done(); }, @@ -706,7 +706,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, and four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three and four"); test.done(); }, // en-HK @@ -742,7 +742,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, and three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two and three"); test.done(); }, @@ -754,7 +754,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, and four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three and four"); test.done(); }, // en-IE @@ -981,7 +981,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one and two"); + test.equal(fmt.format(["one", "two"]), "one, two"); test.done(); }, @@ -992,7 +992,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, and three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); test.done(); }, @@ -1003,7 +1003,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, and four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); test.done(); }, @@ -1040,7 +1040,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, and three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two and three"); test.done(); }, @@ -1052,7 +1052,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, and four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three and four"); test.done(); }, // en-LK @@ -1088,7 +1088,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, and three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two and three"); test.done(); }, @@ -1100,7 +1100,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, and four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three and four"); test.done(); }, // en-MM @@ -1136,7 +1136,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, and three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two and three"); test.done(); }, @@ -1148,7 +1148,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, and four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three and four"); test.done(); }, // en-MW @@ -1375,7 +1375,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one and two"); + test.equal(fmt.format(["one", "two"]), "one, two"); test.done(); }, @@ -1386,7 +1386,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, and three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); test.done(); }, @@ -1397,7 +1397,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, and four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); test.done(); }, @@ -1434,7 +1434,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, and three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two and three"); test.done(); }, @@ -1446,7 +1446,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, and four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three and four"); test.done(); }, // en-UG @@ -1482,7 +1482,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, and three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two and three"); test.done(); }, @@ -1494,7 +1494,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, and four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three and four"); test.done(); }, // en-ZM @@ -1530,7 +1530,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, and three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two and three"); test.done(); }, @@ -1542,7 +1542,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, and four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three and four"); test.done(); }, @@ -1770,7 +1770,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one and two"); + test.equal(fmt.format(["one", "two"]), "one, two"); test.done(); }, @@ -1781,7 +1781,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, and three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); test.done(); }, @@ -1792,7 +1792,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, and four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); test.done(); }, @@ -1829,7 +1829,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, and three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two and three"); test.done(); }, @@ -1841,7 +1841,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, and four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three and four"); test.done(); }, // en-LR @@ -1877,7 +1877,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, and three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two and three"); test.done(); }, @@ -1889,7 +1889,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, and four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three and four"); test.done(); }, // en-PK @@ -1925,7 +1925,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, and three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two and three"); test.done(); }, @@ -1937,7 +1937,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, and four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three and four"); test.done(); }, @@ -2165,7 +2165,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one and two"); + test.equal(fmt.format(["one", "two"]), "one, two"); test.done(); }, @@ -2176,7 +2176,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, and three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); test.done(); }, @@ -2187,7 +2187,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, and four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); test.done(); }, @@ -2198,7 +2198,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four, and five"); + test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four, five"); test.done(); } -}; +}; \ No newline at end of file diff --git a/js/test/strings-ext/testlistfmt_fa.js b/js/test/strings-ext/testlistfmt_fa.js index b7e940839e..03e9aa93e1 100644 --- a/js/test/strings-ext/testlistfmt_fa.js +++ b/js/test/strings-ext/testlistfmt_fa.js @@ -49,7 +49,7 @@ module.exports.testlistfmt_fa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["یکی", "دو"]), "یکی و دو"); + test.equal(fmt.format(["یکی", "دو"]), "یکی،‏ دو"); test.done(); }, @@ -60,7 +60,7 @@ module.exports.testlistfmt_fa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["یکی", "دو", "سه"]), "یکی،‏ دو، و سه"); + test.equal(fmt.format(["یکی", "دو", "سه"]), "یکی،‏ دو،‏ سه"); test.done(); }, @@ -71,7 +71,7 @@ module.exports.testlistfmt_fa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["یکی", "دو", "سه", "چهار"]), "یکی،‏ دو،‏ سه، و چهار"); + test.equal(fmt.format(["یکی", "دو", "سه", "چهار"]), "یکی،‏ دو،‏ سه،‏ چهار"); test.done(); }, @@ -82,7 +82,7 @@ module.exports.testlistfmt_fa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["یکی", "دو", "سه", "چهار", "پنج"]), "یکی،‏ دو،‏ سه،‏ چهار، و پنج"); + test.equal(fmt.format(["یکی", "دو", "سه", "چهار", "پنج"]), "یکی،‏ دو،‏ سه،‏ چهار،‏ پنج"); test.done(); }, @@ -365,7 +365,7 @@ module.exports.testlistfmt_fa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["یکی", "دو"]), "یکی و دو"); + test.equal(fmt.format(["یکی", "دو"]), "یکی،‏ دو"); test.done(); }, @@ -376,7 +376,7 @@ module.exports.testlistfmt_fa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["یکی", "دو", "سه"]), "یکی،‏ دو، و سه"); + test.equal(fmt.format(["یکی", "دو", "سه"]), "یکی،‏ دو،‏ سه"); test.done(); }, @@ -387,7 +387,7 @@ module.exports.testlistfmt_fa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["یکی", "دو", "سه", "چهار"]), "یکی،‏ دو،‏ سه، و چهار"); + test.equal(fmt.format(["یکی", "دو", "سه", "چهار"]), "یکی،‏ دو،‏ سه،‏ چهار"); test.done(); }, @@ -398,7 +398,7 @@ module.exports.testlistfmt_fa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["یکی", "دو", "سه", "چهار", "پنج"]), "یکی،‏ دو،‏ سه،‏ چهار، و پنج"); + test.equal(fmt.format(["یکی", "دو", "سه", "چهار", "پنج"]), "یکی،‏ دو،‏ سه،‏ چهار،‏ پنج"); test.done(); }, diff --git a/js/test/strings-ext/testlistfmt_fr.js b/js/test/strings-ext/testlistfmt_fr.js index 0fbed8acac..a815cd8251 100644 --- a/js/test/strings-ext/testlistfmt_fr.js +++ b/js/test/strings-ext/testlistfmt_fr.js @@ -49,7 +49,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux"]), "un et deux"); + test.equal(fmt.format(["un", "deux"]), "un, deux"); test.done(); }, @@ -60,7 +60,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux", "trois"]), "un, deux et trois"); + test.equal(fmt.format(["un", "deux", "trois"]), "un, deux, trois"); test.done(); }, @@ -71,7 +71,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux", "trois", "quatre"]), "un, deux, trois et quatre"); + test.equal(fmt.format(["un", "deux", "trois", "quatre"]), "un, deux, trois, quatre"); test.done(); }, @@ -82,7 +82,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux", "trois", "quatre", "cinq"]), "un, deux, trois, quatre et cinq"); + test.equal(fmt.format(["un", "deux", "trois", "quatre", "cinq"]), "un, deux, trois, quatre, cinq"); test.done(); }, @@ -361,7 +361,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux"]), "un et deux"); + test.equal(fmt.format(["un", "deux"]), "un, deux"); test.done(); }, @@ -372,7 +372,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux", "trois"]), "un, deux et trois"); + test.equal(fmt.format(["un", "deux", "trois"]), "un, deux, trois"); test.done(); }, @@ -383,7 +383,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux", "trois", "quatre"]), "un, deux, trois et quatre"); + test.equal(fmt.format(["un", "deux", "trois", "quatre"]), "un, deux, trois, quatre"); test.done(); }, @@ -756,7 +756,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux"]), "un et deux"); + test.equal(fmt.format(["un", "deux"]), "un, deux"); test.done(); }, @@ -767,7 +767,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux", "trois"]), "un, deux et trois"); + test.equal(fmt.format(["un", "deux", "trois"]), "un, deux, trois"); test.done(); }, @@ -778,7 +778,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux", "trois", "quatre"]), "un, deux, trois et quatre"); + test.equal(fmt.format(["un", "deux", "trois", "quatre"]), "un, deux, trois, quatre"); test.done(); }, diff --git a/js/test/strings-ext/testlistfmt_gu_IN.js b/js/test/strings-ext/testlistfmt_gu_IN.js index 83885b1cd2..ab0b0e7ee7 100644 --- a/js/test/strings-ext/testlistfmt_gu_IN.js +++ b/js/test/strings-ext/testlistfmt_gu_IN.js @@ -51,7 +51,7 @@ module.exports.testlistfmt_gu_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["એક", "બે"]), "એક અને બે"); + test.equal(fmt.format(["એક", "બે"]), "એક, બે"); test.done(); }, @@ -62,7 +62,7 @@ module.exports.testlistfmt_gu_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["એક", "બે", "ત્રણ"]), "એક, બે અને ત્રણ"); + test.equal(fmt.format(["એક", "બે", "ત્રણ"]), "એક, બે, ત્રણ"); test.done(); }, @@ -73,7 +73,7 @@ module.exports.testlistfmt_gu_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["એક", "બે", "ત્રણ", "ચાર"]), "એક, બે, ત્રણ અને ચાર"); + test.equal(fmt.format(["એક", "બે", "ત્રણ", "ચાર"]), "એક, બે, ત્રણ, ચાર"); test.done(); }, testListFmtUnitStyleguINNumberFormatOne: function(test) { diff --git a/js/test/strings-ext/testlistfmt_hi_IN.js b/js/test/strings-ext/testlistfmt_hi_IN.js index 835952f3b6..b22461fb69 100644 --- a/js/test/strings-ext/testlistfmt_hi_IN.js +++ b/js/test/strings-ext/testlistfmt_hi_IN.js @@ -95,7 +95,7 @@ module.exports.testlistfmt_hi_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["एक", "दो"]), "एक, दो"); + test.equal(fmt.format(["एक", "दो"]), "एक दो"); test.done(); }, @@ -107,7 +107,7 @@ module.exports.testlistfmt_hi_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["एक", "दो", "तीन"]), "एक, दो, तीन"); + test.equal(fmt.format(["एक", "दो", "तीन"]), "एक, दो तीन"); test.done(); }, @@ -119,7 +119,7 @@ module.exports.testlistfmt_hi_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["एक", "दो", "तीन", "चार"]), "एक, दो, तीन, चार"); + test.equal(fmt.format(["एक", "दो", "तीन", "चार"]), "एक, दो, तीन चार"); test.done(); }, testListFmtUnitStylehiINNumberFormatOneMedium: function(test) { diff --git a/js/test/strings-ext/testlistfmt_kn_IN.js b/js/test/strings-ext/testlistfmt_kn_IN.js index 78ddc6a6d4..e52cc2a2bc 100644 --- a/js/test/strings-ext/testlistfmt_kn_IN.js +++ b/js/test/strings-ext/testlistfmt_kn_IN.js @@ -51,7 +51,7 @@ module.exports.testlistfmt_kn_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ಒಂದು", "ಎರಡು"]), "ಒಂದು ಮತ್ತು ಎರಡು"); + test.equal(fmt.format(["ಒಂದು", "ಎರಡು"]), "ಒಂದು, ಎರಡು"); test.done(); }, @@ -62,7 +62,7 @@ module.exports.testlistfmt_kn_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ಒಂದು", "ಎರಡು", "ಮೂರು"]), "ಒಂದು, ಎರಡು, ಮತ್ತು ಮೂರು"); + test.equal(fmt.format(["ಒಂದು", "ಎರಡು", "ಮೂರು"]), "ಒಂದು, ಎರಡು, ಮೂರು"); test.done(); }, @@ -73,7 +73,7 @@ module.exports.testlistfmt_kn_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ಒಂದು", "ಎರಡು", "ಮೂರು", "ನಾಲ್ಕು"]), "ಒಂದು, ಎರಡು, ಮೂರು, ಮತ್ತು ನಾಲ್ಕು"); + test.equal(fmt.format(["ಒಂದು", "ಎರಡು", "ಮೂರು", "ನಾಲ್ಕು"]), "ಒಂದು, ಎರಡು, ಮೂರು, ನಾಲ್ಕು"); test.done(); }, testListFmtUnitStyleknINNumberFormatOne: function(test) { diff --git a/js/test/strings-ext/testlistfmt_ml_IN.js b/js/test/strings-ext/testlistfmt_ml_IN.js index 73b18f5e2f..75a4c02175 100644 --- a/js/test/strings-ext/testlistfmt_ml_IN.js +++ b/js/test/strings-ext/testlistfmt_ml_IN.js @@ -96,7 +96,7 @@ module.exports.testlistfmt_ml_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ഒന്ന്", "രണ്ട്"]), "ഒന്ന് കൂടാതെ രണ്ട്"); + test.equal(fmt.format(["ഒന്ന്", "രണ്ട്"]), "ഒന്ന്, രണ്ട്"); test.done(); }, diff --git a/js/test/strings-ext/testlistfmt_ms.js b/js/test/strings-ext/testlistfmt_ms.js index f6b780afda..54e1fc5897 100644 --- a/js/test/strings-ext/testlistfmt_ms.js +++ b/js/test/strings-ext/testlistfmt_ms.js @@ -51,7 +51,7 @@ module.exports.testlistfmt_ms = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["satu", "dua"]), "satu dan dua"); + test.equal(fmt.format(["satu", "dua"]), "satu, dua"); test.done(); }, @@ -62,7 +62,7 @@ module.exports.testlistfmt_ms = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["satu", "dua", "bertiga"]), "satu, dua dan bertiga"); + test.equal(fmt.format(["satu", "dua", "bertiga"]), "satu, dua, bertiga"); test.done(); }, @@ -73,7 +73,7 @@ module.exports.testlistfmt_ms = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["satu", "dua", "bertiga", "empat"]), "satu, dua, bertiga dan empat"); + test.equal(fmt.format(["satu", "dua", "bertiga", "empat"]), "satu, dua, bertiga, empat"); test.done(); }, testListFmtUnitStylemsLatnMYNumberFormatOne: function(test) { @@ -194,7 +194,7 @@ module.exports.testlistfmt_ms = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["satu", "dua"]), "satu dan dua"); + test.equal(fmt.format(["satu", "dua"]), "satu, dua"); test.done(); }, @@ -205,7 +205,7 @@ module.exports.testlistfmt_ms = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["satu", "dua", "bertiga"]), "satu, dua dan bertiga"); + test.equal(fmt.format(["satu", "dua", "bertiga"]), "satu, dua, bertiga"); test.done(); }, @@ -216,7 +216,7 @@ module.exports.testlistfmt_ms = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["satu", "dua", "bertiga", "empat"]), "satu, dua, bertiga dan empat"); + test.equal(fmt.format(["satu", "dua", "bertiga", "empat"]), "satu, dua, bertiga, empat"); test.done(); }, testListFmtUnitStylemsLatnSGNumberFormatOne: function(test) { diff --git a/js/test/strings-ext/testlistfmt_pa.js b/js/test/strings-ext/testlistfmt_pa.js index 8cbd62c4bb..9d1c43f355 100644 --- a/js/test/strings-ext/testlistfmt_pa.js +++ b/js/test/strings-ext/testlistfmt_pa.js @@ -51,7 +51,7 @@ module.exports.testlistfmt_pa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ਇੱਕ", "ਦੋ"]), "ਇੱਕ ਅਤੇ ਦੋ"); + test.equal(fmt.format(["ਇੱਕ", "ਦੋ"]), "ਇੱਕ, ਦੋ"); test.done(); }, @@ -62,7 +62,7 @@ module.exports.testlistfmt_pa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ਇੱਕ", "ਦੋ", "ਤਿੰਨ"]), "ਇੱਕ, ਦੋ ਅਤੇ ਤਿੰਨ"); + test.equal(fmt.format(["ਇੱਕ", "ਦੋ", "ਤਿੰਨ"]), "ਇੱਕ, ਦੋ, ਤਿੰਨ"); test.done(); }, @@ -73,7 +73,7 @@ module.exports.testlistfmt_pa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ਇੱਕ", "ਦੋ", "ਤਿੰਨ", "ਚਾਰ"]), "ਇੱਕ, ਦੋ, ਤਿੰਨ ਅਤੇ ਚਾਰ"); + test.equal(fmt.format(["ਇੱਕ", "ਦੋ", "ਤਿੰਨ", "ਚਾਰ"]), "ਇੱਕ, ਦੋ, ਤਿੰਨ, ਚਾਰ"); test.done(); }, testListFmtUnitStylepaGuruINNumberFormatOne: function(test) { @@ -96,7 +96,7 @@ module.exports.testlistfmt_pa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ਇੱਕ", "ਦੋ"]), "ਇੱਕ, ਦੋ"); + test.equal(fmt.format(["ਇੱਕ", "ਦੋ"]), "ਇੱਕ ਦੋ"); test.done(); }, @@ -108,7 +108,7 @@ module.exports.testlistfmt_pa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ਇੱਕ", "ਦੋ", "ਤਿੰਨ"]), "ਇੱਕ, ਦੋ, ਤਿੰਨ"); + test.equal(fmt.format(["ਇੱਕ", "ਦੋ", "ਤਿੰਨ"]), "ਇੱਕ ਦੋ ਤਿੰਨ"); test.done(); }, @@ -120,12 +120,10 @@ module.exports.testlistfmt_pa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ਇੱਕ", "ਦੋ", "ਤਿੰਨ", "ਚਾਰ"]), "ਇੱਕ, ਦੋ, ਤਿੰਨ, ਚਾਰ"); + test.equal(fmt.format(["ਇੱਕ", "ਦੋ", "ਤਿੰਨ", "ਚਾਰ"]), "ਇੱਕ ਦੋ ਤਿੰਨ ਚਾਰ"); test.done(); }, - - //pa-Arab-PK testListFmtpaArabPKNumberFormatOne: function(test) { var fmt = new ListFmt({ @@ -191,7 +189,7 @@ module.exports.testlistfmt_pa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان"]), "واحد, اثنان"); + test.equal(fmt.format(["واحد", "اثنان"]), "واحد اثنان"); test.done(); }, @@ -203,7 +201,7 @@ module.exports.testlistfmt_pa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد, اثنان, ثلاثة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد اثنان ثلاثة"); test.done(); }, @@ -215,7 +213,7 @@ module.exports.testlistfmt_pa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد, اثنان, ثلاثة, أربعة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد اثنان ثلاثة أربعة"); test.done(); } }; diff --git a/js/test/strings-ext/testlistfmt_pt.js b/js/test/strings-ext/testlistfmt_pt.js index 9443d147ed..eae98f8e2c 100644 --- a/js/test/strings-ext/testlistfmt_pt.js +++ b/js/test/strings-ext/testlistfmt_pt.js @@ -49,7 +49,7 @@ module.exports.testlistfmt_pt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["um", "dois"]), "um e dois"); + test.equal(fmt.format(["um", "dois"]), "um, dois"); test.done(); }, @@ -60,7 +60,7 @@ module.exports.testlistfmt_pt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["um", "dois", "três"]), "um, dois e três"); + test.equal(fmt.format(["um", "dois", "três"]), "um, dois, três"); test.done(); }, @@ -71,7 +71,7 @@ module.exports.testlistfmt_pt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["um", "dois", "três", "quatro"]), "um, dois, três e quatro"); + test.equal(fmt.format(["um", "dois", "três", "quatro"]), "um, dois, três, quatro"); test.done(); }, @@ -107,7 +107,7 @@ module.exports.testlistfmt_pt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["um", "dois"]), "um e dois"); + test.equal(fmt.format(["um", "dois"]), "um dois"); test.done(); }, @@ -119,7 +119,7 @@ module.exports.testlistfmt_pt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["um", "dois", "três"]), "um, dois e três"); + test.equal(fmt.format(["um", "dois", "três"]), "um dois três"); test.done(); }, @@ -131,7 +131,7 @@ module.exports.testlistfmt_pt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["um", "dois", "três", "quatro"]), "um, dois, três e quatro"); + test.equal(fmt.format(["um", "dois", "três", "quatro"]), "um dois três quatro"); test.done(); }, @@ -143,7 +143,7 @@ module.exports.testlistfmt_pt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["um", "dois", "três", "quatro", "cinco"]), "um, dois, três, quatro e cinco"); + test.equal(fmt.format(["um", "dois", "três", "quatro", "cinco"]), "um dois três quatro cinco"); test.done(); }, @@ -166,7 +166,7 @@ module.exports.testlistfmt_pt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["um", "dois"]), "um e dois"); + test.equal(fmt.format(["um", "dois"]), "um, dois"); test.done(); }, @@ -177,7 +177,7 @@ module.exports.testlistfmt_pt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["um", "dois", "três"]), "um, dois e três"); + test.equal(fmt.format(["um", "dois", "três"]), "um, dois, três"); test.done(); }, @@ -188,7 +188,7 @@ module.exports.testlistfmt_pt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["um", "dois", "três", "quatro"]), "um, dois, três e quatro"); + test.equal(fmt.format(["um", "dois", "três", "quatro"]), "um, dois, três, quatro"); test.done(); }, diff --git a/js/test/strings-ext/testlistfmt_ru.js b/js/test/strings-ext/testlistfmt_ru.js index c85e9749a8..b617be6905 100644 --- a/js/test/strings-ext/testlistfmt_ru.js +++ b/js/test/strings-ext/testlistfmt_ru.js @@ -50,7 +50,7 @@ module.exports.testlistfmt_ru = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["один", "два"]), "один и два"); + test.equal(fmt.format(["один", "два"]), "один, два"); test.done(); }, @@ -61,7 +61,7 @@ module.exports.testlistfmt_ru = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["один", "два", "три"]), "один, два и три"); + test.equal(fmt.format(["один", "два", "три"]), "один, два, три"); test.done(); }, @@ -72,7 +72,7 @@ module.exports.testlistfmt_ru = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["один", "два", "три", "четыре"]), "один, два, три и четыре"); + test.equal(fmt.format(["один", "два", "три", "четыре"]), "один, два, три, четыре"); test.done(); }, @@ -489,7 +489,7 @@ module.exports.testlistfmt_ru = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["один", "два"]), "один и два"); + test.equal(fmt.format(["один", "два"]), "один, два"); test.done(); }, @@ -500,7 +500,7 @@ module.exports.testlistfmt_ru = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["один", "два", "три"]), "один, два и три"); + test.equal(fmt.format(["один", "два", "три"]), "один, два, три"); test.done(); }, @@ -511,7 +511,7 @@ module.exports.testlistfmt_ru = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["один", "два", "три", "четыре"]), "один, два, три и четыре"); + test.equal(fmt.format(["один", "два", "три", "четыре"]), "один, два, три, четыре"); test.done(); }, testListFmtUnitStyleruUANumberFormatOne: function(test) { diff --git a/js/test/strings-ext/testlistfmt_ta_IN.js b/js/test/strings-ext/testlistfmt_ta_IN.js index 70d8312f56..21f896d2a4 100644 --- a/js/test/strings-ext/testlistfmt_ta_IN.js +++ b/js/test/strings-ext/testlistfmt_ta_IN.js @@ -145,7 +145,7 @@ module.exports.testlistfmt_ta_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ஒரு", "இரண்டு"]), "ஒரு, இரண்டு"); + test.equal(fmt.format(["ஒரு", "இரண்டு"]), "ஒரு மற்றும் இரண்டு"); test.done(); }, @@ -158,7 +158,7 @@ module.exports.testlistfmt_ta_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ஒரு", "இரண்டு", "மூன்று"]), "ஒரு, இரண்டு, மூன்று"); + test.equal(fmt.format(["ஒரு", "இரண்டு", "மூன்று"]), "ஒரு, இரண்டு மற்றும் மூன்று"); test.done(); }, @@ -171,7 +171,7 @@ module.exports.testlistfmt_ta_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ஒரு", "இரண்டு", "மூன்று", "நான்கு"]), "ஒரு, இரண்டு, மூன்று, நான்கு"); + test.equal(fmt.format(["ஒரு", "இரண்டு", "மூன்று", "நான்கு"]), "ஒரு, இரண்டு, மூன்று மற்றும் நான்கு"); test.done(); } diff --git a/js/test/strings-ext/testlistfmt_te_IN.js b/js/test/strings-ext/testlistfmt_te_IN.js index 59818232c9..dab9847554 100644 --- a/js/test/strings-ext/testlistfmt_te_IN.js +++ b/js/test/strings-ext/testlistfmt_te_IN.js @@ -51,7 +51,7 @@ module.exports.testlistfmt_te_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ఒకటి", "రెండు"]), "ఒకటి మరియు రెండు"); + test.equal(fmt.format(["ఒకటి", "రెండు"]), "ఒకటి, రెండు"); test.done(); }, @@ -62,7 +62,7 @@ module.exports.testlistfmt_te_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ఒకటి", "రెండు", "మూడు"]), "ఒకటి, రెండు మరియు మూడు"); + test.equal(fmt.format(["ఒకటి", "రెండు", "మూడు"]), "ఒకటి, రెండు, మూడు"); test.done(); }, @@ -73,7 +73,7 @@ module.exports.testlistfmt_te_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ఒకటి", "రెండు", "మూడు", "నాలుగు"]), "ఒకటి, రెండు, మూడు మరియు నాలుగు"); + test.equal(fmt.format(["ఒకటి", "రెండు", "మూడు", "నాలుగు"]), "ఒకటి, రెండు, మూడు, నాలుగు"); test.done(); }, testListFmtUnitStyleteINNumberFormatOne: function(test) { diff --git a/js/test/strings-ext/testlistfmt_th_TH.js b/js/test/strings-ext/testlistfmt_th_TH.js index 13e005f179..c9dd887138 100644 --- a/js/test/strings-ext/testlistfmt_th_TH.js +++ b/js/test/strings-ext/testlistfmt_th_TH.js @@ -51,7 +51,7 @@ module.exports.testlistfmt_th_TH = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["หนึ่ง", "สอง"]), "หนึ่ง และ สอง"); + test.equal(fmt.format(["หนึ่ง", "สอง"]), "หนึ่งและสอง"); test.done(); }, diff --git a/js/test/strings-ext/testlistfmt_tr.js b/js/test/strings-ext/testlistfmt_tr.js index acbe51a441..c0c9c6d4ff 100644 --- a/js/test/strings-ext/testlistfmt_tr.js +++ b/js/test/strings-ext/testlistfmt_tr.js @@ -51,7 +51,7 @@ module.exports.testlistfmt_tr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "два"]), "bir ve два"); + test.equal(fmt.format(["bir", "два"]), "bir, два"); test.done(); }, @@ -62,7 +62,7 @@ module.exports.testlistfmt_tr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "два", "три"]), "bir, два ve три"); + test.equal(fmt.format(["bir", "два", "три"]), "bir, два, три"); test.done(); }, @@ -73,7 +73,7 @@ module.exports.testlistfmt_tr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "два", "три", "четыре"]), "bir, два, три ve четыре"); + test.equal(fmt.format(["bir", "два", "три", "четыре"]), "bir, два, три, четыре"); test.done(); }, diff --git a/js/test/strings-ext/testlistfmt_uk_UA.js b/js/test/strings-ext/testlistfmt_uk_UA.js index 9649cb9b1b..9243ef9007 100644 --- a/js/test/strings-ext/testlistfmt_uk_UA.js +++ b/js/test/strings-ext/testlistfmt_uk_UA.js @@ -51,7 +51,7 @@ module.exports.testlistfmt_uk_UA = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Один", "Два"]), "Один і Два"); + test.equal(fmt.format(["Один", "Два"]), "Один, Два"); test.done(); }, @@ -62,7 +62,7 @@ module.exports.testlistfmt_uk_UA = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Один", "Два", "Три"]), "Один, Два і Три"); + test.equal(fmt.format(["Один", "Два", "Три"]), "Один, Два, Три"); test.done(); }, @@ -73,7 +73,7 @@ module.exports.testlistfmt_uk_UA = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Один", "Два", "Три", "Чотири"]), "Один, Два, Три і Чотири"); + test.equal(fmt.format(["Один", "Два", "Три", "Чотири"]), "Один, Два, Три, Чотири"); test.done(); }, testListFmtUnitStyleukUANumberFormatOne: function(test) { @@ -96,7 +96,7 @@ module.exports.testlistfmt_uk_UA = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Один", "Два"]), "Один, Два"); + test.equal(fmt.format(["Один", "Два"]), "Один і Два"); test.done(); }, @@ -108,7 +108,7 @@ module.exports.testlistfmt_uk_UA = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Один", "Два", "Три"]), "Один, Два, Три"); + test.equal(fmt.format(["Один", "Два", "Три"]), "Один, Два і Три"); test.done(); }, @@ -120,7 +120,7 @@ module.exports.testlistfmt_uk_UA = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Один", "Два", "Три", "Чотири"]), "Один, Два, Три, Чотири"); + test.equal(fmt.format(["Один", "Два", "Три", "Чотири"]), "Один, Два, Три і Чотири"); test.done(); }, testListFmtUnitStyleukUANumberFormatOneFull: function(test) { diff --git a/js/test/strings-ext/testlistfmt_ur.js b/js/test/strings-ext/testlistfmt_ur.js index 53f4a75f89..14085e3b39 100644 --- a/js/test/strings-ext/testlistfmt_ur.js +++ b/js/test/strings-ext/testlistfmt_ur.js @@ -51,7 +51,7 @@ module.exports.testlistfmt_ur = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ایک کو", "دو"]), "ایک کو اور دو"); + test.equal(fmt.format(["ایک کو", "دو"]), "ایک کو، دو"); test.done(); }, @@ -62,7 +62,7 @@ module.exports.testlistfmt_ur = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ایک کو", "دو", "تین"]), "ایک کو، دو، اور تین"); + test.equal(fmt.format(["ایک کو", "دو", "تین"]), "ایک کو، دو، تین"); test.done(); }, @@ -73,7 +73,7 @@ module.exports.testlistfmt_ur = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ایک کو", "دو", "تین", "چار"]), "ایک کو، دو، تین، اور چار"); + test.equal(fmt.format(["ایک کو", "دو", "تین", "چار"]), "ایک کو، دو، تین، چار"); test.done(); }, testListFmtUnitStyleurArabPKNumberFormatOne: function(test) { @@ -197,7 +197,7 @@ module.exports.testlistfmt_ur = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ایک کو", "دو"]), "ایک کو اور دو"); + test.equal(fmt.format(["ایک کو", "دو"]), "ایک کو، دو"); test.done(); }, @@ -208,7 +208,7 @@ module.exports.testlistfmt_ur = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ایک کو", "دو", "تین"]), "ایک کو، دو، اور تین"); + test.equal(fmt.format(["ایک کو", "دو", "تین"]), "ایک کو، دو، تین"); test.done(); }, @@ -219,7 +219,7 @@ module.exports.testlistfmt_ur = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ایک کو", "دو", "تین", "چار"]), "ایک کو، دو، تین، اور چار"); + test.equal(fmt.format(["ایک کو", "دو", "تین", "چار"]), "ایک کو، دو، تین، چار"); test.done(); }, testListFmtUnitStyleurArabINNumberFormatOne: function(test) { diff --git a/js/test/strings-ext/testlistfmtasync.js b/js/test/strings-ext/testlistfmtasync.js index 431b622649..e1174e8f41 100644 --- a/js/test/strings-ext/testlistfmtasync.js +++ b/js/test/strings-ext/testlistfmtasync.js @@ -43,7 +43,7 @@ module.exports.testlistfmtasync = { onLoad: function(fmt) { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["true", "false"]), "true and false"); + test.equal(fmt.format(["true", "false"]), "true, false"); test.done(); } }); @@ -56,7 +56,7 @@ module.exports.testlistfmtasync = { onLoad: function(fmt) { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["এক", "দুই", "তিন", "চার"]), "এক, দুই, তিন এবং চার"); + test.equal(fmt.format(["এক", "দুই", "তিন", "চার"]), "এক, দুই, তিন, চার"); test.done(); } }); @@ -74,4 +74,4 @@ module.exports.testlistfmtasync = { } }); } -}; +}; \ No newline at end of file From e3fda3d9cdae4b79fb66f2b9703dac4bbd4d59b8 Mon Sep 17 00:00:00 2001 From: Goun Lee Date: Mon, 16 Mar 2020 17:35:58 +0900 Subject: [PATCH 04/14] Fix test failures.. --- js/test/strings-ext/testlistfmt.js | 80 +++++++++++----------- js/test/strings-ext/testlistfmt_am_ET.js | 4 +- js/test/strings-ext/testlistfmt_ar.js | 84 ++++++++++++------------ 3 files changed, 84 insertions(+), 84 deletions(-) diff --git a/js/test/strings-ext/testlistfmt.js b/js/test/strings-ext/testlistfmt.js index d5aacb6e7a..d37d4b1b85 100644 --- a/js/test/strings-ext/testlistfmt.js +++ b/js/test/strings-ext/testlistfmt.js @@ -125,7 +125,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["true", "false"]), "true and false"); + test.equal(fmt.format(["true", "false"]), "true, false"); test.done(); }, @@ -143,7 +143,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one and two"); + test.equal(fmt.format(["one", "two"]), "one, two"); test.done(); }, @@ -152,7 +152,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, and three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); test.done(); }, @@ -161,7 +161,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, and four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); test.done(); }, @@ -183,7 +183,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one and two"); + test.equal(fmt.format(["one", "two"]), "one, two"); test.done(); }, @@ -194,7 +194,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, and three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); test.done(); }, @@ -205,7 +205,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, and four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); test.done(); }, @@ -403,7 +403,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["জানু", "ফেব্ৰু"]), 'জানু আৰু ফেব্ৰু'); + test.equal(fmt.format(["জানু", "ফেব্ৰু"]), 'জানু, ফেব্ৰু'); test.done(); }, testListFmtasINMonthThree: function(test) { @@ -413,7 +413,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["জানু", "ফেব্ৰু", "মাৰ্চ"]), 'জানু, ফেব্ৰু আৰু মাৰ্চ'); + test.equal(fmt.format(["জানু", "ফেব্ৰু", "মাৰ্চ"]), 'জানু, ফেব্ৰু, মাৰ্চ'); test.done(); }, testListFmtasINMonthFour: function(test) { @@ -423,7 +423,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["জানু", "ফেব্ৰু", "মাৰ্চ", "এপ্ৰিল"]), 'জানু, ফেব্ৰু, মাৰ্চ আৰু এপ্ৰিল'); + test.equal(fmt.format(["জানু", "ফেব্ৰু", "মাৰ্চ", "এপ্ৰিল"]), 'জানু, ফেব্ৰু, মাৰ্চ, এপ্ৰিল'); test.done(); }, //az-Latn-AZ @@ -444,7 +444,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "iki"]), "bir və iki"); + test.equal(fmt.format(["bir", "iki"]), "bir, iki"); test.done(); }, testListFmtazLatnAZNumberFormatThree: function(test) { @@ -454,7 +454,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "iki", "üç"]), "bir, iki və üç"); + test.equal(fmt.format(["bir", "iki", "üç"]), "bir, iki, üç"); test.done(); }, testListFmtazLatnAZNumberFormatFour: function(test) { @@ -464,7 +464,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "iki", "üç", "dörd"]), "bir, iki, üç və dörd"); + test.equal(fmt.format(["bir", "iki", "üç", "dörd"]), "bir, iki, üç, dörd"); test.done(); }, testListFmtUnitStyleazLatnAZNumberFormatOne: function(test) { @@ -590,7 +590,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["един", "два"]), "един идва"); + test.equal(fmt.format(["един", "два"]), "един, два"); test.done(); }, testListFmtbgBGNumberFormatThree: function(test) { @@ -772,7 +772,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["এক", "দুই"]), "এক এবং দুই"); + test.equal(fmt.format(["এক", "দুই"]), "এক, দুই"); test.done(); }, testListFmtbnINNumberFormatThree: function(test) { @@ -782,7 +782,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["এক", "দুই", "তিন"]), "এক, দুই এবং তিন"); + test.equal(fmt.format(["এক", "দুই", "তিন"]), "এক, দুই, তিন"); test.done(); }, testListFmtbnINNumberFormatFour: function(test) { @@ -792,7 +792,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["এক", "দুই", "তিন", "চার"]), "এক, দুই, তিন এবং চার"); + test.equal(fmt.format(["এক", "দুই", "তিন", "চার"]), "এক, দুই, তিন, চার"); test.done(); }, @@ -814,7 +814,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["jeden", "dva"]), "jeden a dva"); + test.equal(fmt.format(["jeden", "dva"]), "jeden, dva"); test.done(); }, testListFmtcsCZNumberFormatThree: function(test) { @@ -824,7 +824,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["jeden", "dva", "tři"]), "jeden, dva a tři"); + test.equal(fmt.format(["jeden", "dva", "tři"]), "jeden, dva, tři"); test.done(); }, testListFmtcsCZNumberFormatFour: function(test) { @@ -834,7 +834,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["jeden", "dva", "tři", "čtyři"]), "jeden, dva, tři a čtyři"); + test.equal(fmt.format(["jeden", "dva", "tři", "čtyři"]), "jeden, dva, tři, čtyři"); test.done(); }, @@ -1038,7 +1038,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Üks", "Kaks"]), "Üks ja Kaks"); + test.equal(fmt.format(["Üks", "Kaks"]), "Üks, Kaks"); test.done(); }, testListFmtetEENumberFormatThree: function(test) { @@ -1048,7 +1048,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Üks", "Kaks", "kolm"]), "Üks, Kaks ja kolm"); + test.equal(fmt.format(["Üks", "Kaks", "kolm"]), "Üks, Kaks, kolm"); test.done(); }, testListFmtetEENumberFormatFour: function(test) { @@ -1058,7 +1058,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Üks", "Kaks", "kolm", "Neli"]), "Üks, Kaks, kolm ja Neli"); + test.equal(fmt.format(["Üks", "Kaks", "kolm", "Neli"]), "Üks, Kaks, kolm, Neli"); test.done(); }, @@ -2065,7 +2065,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["satu", "dua"]), "satu dan dua"); + test.equal(fmt.format(["satu", "dua"]), "satu, dua"); test.done(); }, @@ -2076,7 +2076,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["satu", "dua", "tiga"]), "satu, dua, dan tiga"); + test.equal(fmt.format(["satu", "dua", "tiga"]), "satu, dua, tiga"); test.done(); }, @@ -2087,7 +2087,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["satu", "dua", "tiga", "empat"]), "satu, dua, tiga, dan empat"); + test.equal(fmt.format(["satu", "dua", "tiga", "empat"]), "satu, dua, tiga, empat"); test.done(); }, @@ -2275,7 +2275,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["unu", "Două"]), "unu și Două"); + test.equal(fmt.format(["unu", "Două"]), "unu, Două"); test.done(); }, @@ -2286,7 +2286,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["unu", "Două", "Trei"]), "unu, Două și Trei"); + test.equal(fmt.format(["unu", "Două", "Trei"]), "unu, Două, Trei"); test.done(); }, @@ -2297,7 +2297,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["unu", "Două", "Trei", "patru"]), "unu, Două, Trei și patru"); + test.equal(fmt.format(["unu", "Două", "Trei", "patru"]), "unu, Două, Trei, patru"); test.done(); }, @@ -2558,7 +2558,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Moja", "Mbili"]), "Moja na Mbili"); + test.equal(fmt.format(["Moja", "Mbili"]), "Moja, Mbili"); test.done(); }, @@ -2652,7 +2652,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Biri", "Ikkita"]), "Biri va Ikkita"); + test.equal(fmt.format(["Biri", "Ikkita"]), "Biri, Ikkita"); test.done(); }, @@ -2663,7 +2663,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Biri", "Ikkita", "Uchta"]), "Biri, Ikkita va Uchta"); + test.equal(fmt.format(["Biri", "Ikkita", "Uchta"]), "Biri, Ikkita, Uchta"); test.done(); }, @@ -2674,7 +2674,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Biri", "Ikkita", "Uchta", "To'rtta"]), "Biri, Ikkita, Uchta va To'rtta"); + test.equal(fmt.format(["Biri", "Ikkita", "Uchta", "To'rtta"]), "Biri, Ikkita, Uchta, To\'rtta"); test.done(); }, @@ -2745,7 +2745,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["một", "hai"]), "một và hai"); + test.equal(fmt.format(["một", "hai"]), "một, hai"); test.done(); }, @@ -2756,7 +2756,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["một", "hai", "ba"]), "một, hai và ba"); + test.equal(fmt.format(["một", "hai", "ba"]), "một, hai, ba"); test.done(); }, @@ -2767,7 +2767,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["một", "hai", "ba", "bốn"]), "một, hai, ba và bốn"); + test.equal(fmt.format(["một", "hai", "ba", "bốn"]), "một, hai, ba, bốn"); test.done(); }, @@ -2853,7 +2853,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "два"]), "bir, два"); + test.equal(fmt.format(["bir", "два"]), "bir và два"); test.done(); }, @@ -2866,7 +2866,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "два", "три"]), "bir, два, три"); + test.equal(fmt.format(["bir", "два", "три"]), "bir, два và три"); test.done(); }, @@ -2879,7 +2879,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "два", "три", "четыре"]), "bir, два, три, четыре"); + test.equal(fmt.format(["bir", "два", "три", "четыре"]), "bir, два, три và четыре"); test.done(); }, @@ -2892,7 +2892,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "два", "три", "четыре", "пять"]), "bir, два, три, четыре, пять"); + test.equal(fmt.format(["bir", "два", "три", "четыре", "пять"]), "bir, два, три, четыре và пять"); test.done(); } }; diff --git a/js/test/strings-ext/testlistfmt_am_ET.js b/js/test/strings-ext/testlistfmt_am_ET.js index af526507e5..1a7053724c 100644 --- a/js/test/strings-ext/testlistfmt_am_ET.js +++ b/js/test/strings-ext/testlistfmt_am_ET.js @@ -62,7 +62,7 @@ module.exports.testlistfmt_am_ET = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["አንድ", "ሁለት", "ሶስት"]), "አንድ፣ ሁለት, እና ሶስት"); + test.equal(fmt.format(["አንድ", "ሁለት", "ሶስት"]), "አንድ, ሁለት, እና ሶስት"); test.done(); }, @@ -73,7 +73,7 @@ module.exports.testlistfmt_am_ET = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["አንድ", "ሁለት", "ሶስት", "አራት"]), "አንድ፣ ሁለት፣ ሶስት, እና አራት"); + test.equal(fmt.format(["አንድ", "ሁለት", "ሶስት", "አራት"]), "አንድ, ሁለት፣ ሶስት, እና አራት"); test.done(); }, testListFmtUnitStyleamETNumberFormatOne: function(test) { diff --git a/js/test/strings-ext/testlistfmt_ar.js b/js/test/strings-ext/testlistfmt_ar.js index 98b629dd5e..a7ff56ae2c 100644 --- a/js/test/strings-ext/testlistfmt_ar.js +++ b/js/test/strings-ext/testlistfmt_ar.js @@ -63,7 +63,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد، واثنان، وثلاثة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد واثنان وثلاثة"); test.done(); }, @@ -74,7 +74,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد، واثنان، وثلاثة، وأربعة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد واثنان وثلاثة وأربعة"); test.done(); }, @@ -110,7 +110,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد، واثنان، وثلاثة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد واثنان وثلاثة"); test.done(); }, @@ -122,7 +122,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد، واثنان، وثلاثة، وأربعة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد واثنان وثلاثة وأربعة"); test.done(); }, @@ -158,7 +158,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد، اثنان، وثلاثة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد واثنان وثلاثة"); test.done(); }, @@ -170,7 +170,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد، اثنان، ثلاثة، وأربعة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد واثنان وثلاثة وأربعة"); test.done(); }, @@ -206,7 +206,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد، اثنان، وثلاثة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد واثنان وثلاثة"); test.done(); }, @@ -218,7 +218,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد، اثنان، ثلاثة، وأربعة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد واثنان وثلاثة وأربعة"); test.done(); }, @@ -244,7 +244,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان"]), "واحد، اثنان"); + test.equal(fmt.format(["واحد", "اثنان"]), "واحد واثنان"); test.done(); }, @@ -256,7 +256,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد، اثنان، ثلاثة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد واثنان وثلاثة"); test.done(); }, @@ -268,7 +268,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد، اثنان، ثلاثة، أربعة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد واثنان وثلاثة وأربعة"); test.done(); }, @@ -448,7 +448,7 @@ module.exports.testlistfmt_ar = { }); test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد، واثنان، وثلاثة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد واثنان وثلاثة"); test.done(); }, @@ -459,7 +459,7 @@ module.exports.testlistfmt_ar = { }); test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد، واثنان، وثلاثة، وأربعة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد واثنان وثلاثة وأربعة"); test.done(); }, @@ -493,7 +493,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ﻭﺎﺣﺩ", "ﺎﺜﻧﺎﻧ", "ﺙﻼﺛﺓ"]), "ﻭﺎﺣﺩ، ﺎﺜﻧﺎﻧ، وﺙﻼﺛﺓ"); + test.equal(fmt.format(["ﻭﺎﺣﺩ", "ﺎﺜﻧﺎﻧ", "ﺙﻼﺛﺓ"]), "ﻭﺎﺣﺩ وﺎﺜﻧﺎﻧ وﺙﻼﺛﺓ"); test.done(); }, @@ -504,7 +504,7 @@ module.exports.testlistfmt_ar = { }); test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد، اثنان، ثلاثة، وأربعة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد واثنان وثلاثة وأربعة"); test.done(); }, @@ -539,7 +539,7 @@ module.exports.testlistfmt_ar = { }); test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد، واثنان، وثلاثة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد واثنان وثلاثة"); test.done(); }, @@ -550,7 +550,7 @@ module.exports.testlistfmt_ar = { }); test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد، واثنان، وثلاثة، وأربعة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد واثنان وثلاثة وأربعة"); test.done(); }, @@ -572,7 +572,7 @@ module.exports.testlistfmt_ar = { }); test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان"]), "واحد، اثنان"); + test.equal(fmt.format(["واحد", "اثنان"]), "واحد واثنان"); test.done(); }, @@ -583,7 +583,7 @@ module.exports.testlistfmt_ar = { }); test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد، اثنان، ثلاثة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد واثنان وثلاثة"); test.done(); }, @@ -594,7 +594,7 @@ module.exports.testlistfmt_ar = { }); test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد، اثنان، ثلاثة، أربعة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد واثنان وثلاثة وأربعة"); test.done(); }, @@ -676,7 +676,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد، واثنان، وثلاثة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد واثنان وثلاثة"); test.done(); }, @@ -687,7 +687,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد، واثنان، وثلاثة، وأربعة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد واثنان وثلاثة وأربعة"); test.done(); }, // ar-BH @@ -723,7 +723,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد، واثنان، وثلاثة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد واثنان وثلاثة"); test.done(); }, @@ -735,7 +735,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد، واثنان، وثلاثة، وأربعة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد واثنان وثلاثة وأربعة"); test.done(); }, @@ -772,7 +772,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد، اثنان، وثلاثة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد واثنان وثلاثة"); test.done(); }, @@ -784,7 +784,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد، اثنان، ثلاثة، وأربعة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد واثنان وثلاثة وأربعة"); test.done(); }, // ar-DZ @@ -820,7 +820,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد، اثنان، وثلاثة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد واثنان وثلاثة"); test.done(); }, @@ -832,7 +832,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد، اثنان، ثلاثة، وأربعة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد واثنان وثلاثة وأربعة"); test.done(); }, @@ -857,7 +857,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان"]), "واحد، اثنان"); + test.equal(fmt.format(["واحد", "اثنان"]), "واحد واثنان"); test.done(); }, @@ -869,7 +869,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد، اثنان، ثلاثة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد واثنان وثلاثة"); test.done(); }, @@ -881,7 +881,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد، اثنان، ثلاثة، أربعة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد واثنان وثلاثة وأربعة"); test.done(); }, @@ -1072,7 +1072,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد، واثنان، وثلاثة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد واثنان وثلاثة"); test.done(); }, @@ -1083,7 +1083,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد، واثنان، وثلاثة، وأربعة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد واثنان وثلاثة وأربعة"); test.done(); }, // ar-OM @@ -1119,7 +1119,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد، واثنان، وثلاثة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد واثنان وثلاثة"); test.done(); }, @@ -1131,7 +1131,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد، واثنان، وثلاثة، وأربعة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد واثنان وثلاثة وأربعة"); test.done(); }, @@ -1168,7 +1168,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد، اثنان، وثلاثة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد واثنان وثلاثة"); test.done(); }, @@ -1180,7 +1180,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد، اثنان، ثلاثة، وأربعة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد واثنان وثلاثة وأربعة"); test.done(); }, // ar-SA @@ -1216,7 +1216,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد، اثنان، وثلاثة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد واثنان وثلاثة"); test.done(); }, @@ -1228,7 +1228,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد، اثنان، ثلاثة، وأربعة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد واثنان وثلاثة وأربعة"); test.done(); }, @@ -1253,7 +1253,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان"]), "واحد، اثنان"); + test.equal(fmt.format(["واحد", "اثنان"]), "واحد واثنان"); test.done(); }, @@ -1265,7 +1265,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد، اثنان، ثلاثة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد واثنان وثلاثة"); test.done(); }, @@ -1277,7 +1277,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد، اثنان، ثلاثة، أربعة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد واثنان وثلاثة وأربعة"); test.done(); }, From a3a6ffc0fd8fbfaa9f8ef9f8d08f4d56368a32bb Mon Sep 17 00:00:00 2001 From: Goun Lee Date: Tue, 17 Mar 2020 11:33:09 +0900 Subject: [PATCH 05/14] Add some test cases for listfmt.. --- js/test/strings-ext/testlistfmt.js | 47 +++++++++++++++++++++++- js/test/strings-ext/testlistfmt_en.js | 12 ++++++ js/test/strings-ext/testlistfmt_th_TH.js | 45 ++++++++++++++++++++++- 3 files changed, 102 insertions(+), 2 deletions(-) diff --git a/js/test/strings-ext/testlistfmt.js b/js/test/strings-ext/testlistfmt.js index d37d4b1b85..1c0b3ab741 100644 --- a/js/test/strings-ext/testlistfmt.js +++ b/js/test/strings-ext/testlistfmt.js @@ -837,6 +837,17 @@ module.exports.testlistfmt = { test.equal(fmt.format(["jeden", "dva", "tři", "čtyři"]), "jeden, dva, tři, čtyři"); test.done(); }, + testListFmtcsCZNumberFormatFourLong: function(test) { + var fmt = new ListFmt({ + locale: "cs-CZ", + length: "long" + }); + + test.expect(2); + test.ok(fmt !== null); + test.equal(fmt.format(["jeden", "dva", "tři", "čtyři"]), "jeden, dva, tři a čtyři"); + test.done(); + }, testListFmtUnitStylecsCZNumberFormatOne: function(test) { var fmt = new ListFmt({ @@ -974,6 +985,29 @@ module.exports.testlistfmt = { test.equal(fmt.format(["en", "to", "tre", "fire"]), "en, to, tre og fire"); test.done(); }, + testListFmtdaDKNumberFormatFourDisjunction: function(test) { + var fmt = new ListFmt({ + locale: "da-DK", + style: "disjunction" + }); + + test.expect(2); + test.ok(fmt !== null); + test.equal(fmt.format(["en", "to", "tre", "fire"]), "en, to, tre el. fire"); + test.done(); + }, + testListFmtdaDKNumberFormatFourDisjunction: function(test) { + var fmt = new ListFmt({ + locale: "da-DK", + style: "disjunction", + length: "full" + }); + + test.expect(2); + test.ok(fmt !== null); + test.equal(fmt.format(["en", "to", "tre", "fire"]), "en, to, tre eller fire"); + test.done(); + }, testListFmtUnitStyledaDKNumberFormatOne: function(test) { var fmt = new ListFmt({ @@ -2894,5 +2928,16 @@ module.exports.testlistfmt = { test.ok(fmt !== null); test.equal(fmt.format(["bir", "два", "три", "четыре", "пять"]), "bir, два, три, четыре và пять"); test.done(); + }, + testListFmtUnitStyleviVNNumberFormatFiveFullDisjunction: function(test) { + var fmt = new ListFmt({ + locale: "vi-VN", + style: "disjunction" + }); + + test.expect(2); + test.ok(fmt !== null); + test.equal(fmt.format(["bir", "два", "три", "четыре", "пять"]), "bir, два, три, четыре hoặc пять"); + test.done(); } -}; +}; \ No newline at end of file diff --git a/js/test/strings-ext/testlistfmt_en.js b/js/test/strings-ext/testlistfmt_en.js index 7fff7694a4..a151a07cce 100644 --- a/js/test/strings-ext/testlistfmt_en.js +++ b/js/test/strings-ext/testlistfmt_en.js @@ -1151,6 +1151,18 @@ module.exports.testlistfmt_en = { test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three and four"); test.done(); }, + testListFmtenMPNumberFormatFourFull: function(test) { + var fmt = new ListFmt({ + locale: "en-MP", + length: "full", + style: "disjunction" + }); + + test.expect(2); + test.ok(fmt !== null); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, or four"); + test.done(); + }, // en-MW testListFmtUnitStyleenMWNumberFormatOne: function(test) { var fmt = new ListFmt({ diff --git a/js/test/strings-ext/testlistfmt_th_TH.js b/js/test/strings-ext/testlistfmt_th_TH.js index c9dd887138..f44cc52aed 100644 --- a/js/test/strings-ext/testlistfmt_th_TH.js +++ b/js/test/strings-ext/testlistfmt_th_TH.js @@ -168,11 +168,54 @@ module.exports.testlistfmt_th_TH = { style: "unit", length: "medium" }); - + test.expect(2); test.ok(fmt !== null); test.equal(fmt.format(["หนึ่ง", "สอง", "สาม", "สี่"]), "หนึ่ง สอง สาม และ สี่"); test.done(); }, + testListFmtUnitStylethTHNumberFormatOneDisjunction: function(test) { + var fmt = new ListFmt({ + locale: "th-TH", + style: "disjunction" + }); + test.expect(2); + test.ok(fmt !== null); + test.equal(fmt.format(["หนึ่ง"]), "หนึ่ง"); + test.done(); + }, + testListFmtUnitStylethTHNumberFormatTwoDisjunction: function(test) { + var fmt = new ListFmt({ + locale: "th-TH", + style: "disjunction" + }); + + test.expect(2); + test.ok(fmt !== null); + test.equal(fmt.format(["หนึ่ง", "สอง"]), "หนึ่งหรือสอง"); + test.done(); + }, + testListFmtUnitStylethTHNumberFormatThreeDisjunction: function(test) { + var fmt = new ListFmt({ + locale: "th-TH", + style: "disjunction" + }); + + test.expect(2); + test.ok(fmt !== null); + test.equal(fmt.format(["หนึ่ง", "สอง", "สาม"]), "หนึ่ง, สอง หรือ สาม"); + test.done(); + }, + testListFmtUnitStylethTHNumberFormatFourDisjunction: function(test) { + var fmt = new ListFmt({ + locale: "th-TH", + style: "disjunction" + }); + + test.expect(2); + test.ok(fmt !== null); + test.equal(fmt.format(["หนึ่ง", "สอง", "สาม", "สี่"]), "หนึ่ง, สอง, สาม หรือ สี่"); + test.done(); + } }; From de0b99d66e353abc7a83080ed710f7c0a51e8600 Mon Sep 17 00:00:00 2001 From: Goun Lee Date: Tue, 17 Mar 2020 12:09:37 +0900 Subject: [PATCH 06/14] Add en-MP locale for testing --- js/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/build.xml b/js/build.xml index 48674f1862..8a4e7868ad 100644 --- a/js/build.xml +++ b/js/build.xml @@ -51,7 +51,7 @@ limitations under the License. - + From b084fe0d6413062f3e09e7c3fcf1012b332540b7 Mon Sep 17 00:00:00 2001 From: Goun Lee Date: Tue, 17 Mar 2020 18:15:56 +0900 Subject: [PATCH 07/14] Changed default length as medium in ListFmt. Fixed test failures due to the change --- js/lib/ListFmt.js | 2 +- js/test/strings-ext/testlistfmt.js | 116 +++++++++++------------ js/test/strings-ext/testlistfmt_am_ET.js | 10 +- js/test/strings-ext/testlistfmt_ar.js | 16 ++-- js/test/strings-ext/testlistfmt_el.js | 18 ++-- js/test/strings-ext/testlistfmt_en.js | 112 +++++++++++----------- js/test/strings-ext/testlistfmt_es.js | 12 +-- js/test/strings-ext/testlistfmt_fa.js | 16 ++-- js/test/strings-ext/testlistfmt_fr.js | 46 ++++----- js/test/strings-ext/testlistfmt_gu_IN.js | 6 +- js/test/strings-ext/testlistfmt_he_IL.js | 6 +- js/test/strings-ext/testlistfmt_hi_IN.js | 6 +- js/test/strings-ext/testlistfmt_hr.js | 25 ++--- js/test/strings-ext/testlistfmt_it.js | 25 ++--- js/test/strings-ext/testlistfmt_ja_JP.js | 8 +- js/test/strings-ext/testlistfmt_kn_IN.js | 8 +- js/test/strings-ext/testlistfmt_ml_IN.js | 6 +- js/test/strings-ext/testlistfmt_mr_IN.js | 6 +- js/test/strings-ext/testlistfmt_ms.js | 24 ++--- js/test/strings-ext/testlistfmt_pa.js | 24 ++--- js/test/strings-ext/testlistfmt_pt.js | 20 ++-- js/test/strings-ext/testlistfmt_ru.js | 12 +-- js/test/strings-ext/testlistfmt_sv.js | 12 +-- js/test/strings-ext/testlistfmt_ta_IN.js | 6 +- js/test/strings-ext/testlistfmt_te_IN.js | 6 +- js/test/strings-ext/testlistfmt_th_TH.js | 4 +- js/test/strings-ext/testlistfmt_tr.js | 6 +- js/test/strings-ext/testlistfmt_uk_UA.js | 6 +- js/test/strings-ext/testlistfmt_ur.js | 18 ++-- js/test/strings-ext/testlistfmt_zh.js | 12 +-- js/test/strings-ext/testlistfmtasync.js | 4 +- 31 files changed, 290 insertions(+), 308 deletions(-) diff --git a/js/lib/ListFmt.js b/js/lib/ListFmt.js index 3b2d06c168..108a479f75 100644 --- a/js/lib/ListFmt.js +++ b/js/lib/ListFmt.js @@ -91,7 +91,7 @@ var ListFmt = function(options) { this.locale = new Locale(); this.sync = true; this.style = "standard"; - this.length = "short"; + this.length = "medium"; this.loadParams = {}; if (options) { diff --git a/js/test/strings-ext/testlistfmt.js b/js/test/strings-ext/testlistfmt.js index 1c0b3ab741..b45eff1fa1 100644 --- a/js/test/strings-ext/testlistfmt.js +++ b/js/test/strings-ext/testlistfmt.js @@ -125,7 +125,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["true", "false"]), "true, false"); + test.equal(fmt.format(["true", "false"]), "true & false"); test.done(); }, @@ -143,7 +143,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one, two"); + test.equal(fmt.format(["one", "two"]), "one & two"); test.done(); }, @@ -152,7 +152,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two, & three"); test.done(); }, @@ -161,7 +161,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, & four"); test.done(); }, @@ -183,7 +183,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one, two"); + test.equal(fmt.format(["one", "two"]), "one & two"); test.done(); }, @@ -194,7 +194,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two, & three"); test.done(); }, @@ -205,7 +205,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, & four"); test.done(); }, @@ -269,7 +269,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one two"); + test.equal(fmt.format(["one", "two"]), "one, two"); test.done(); }, @@ -280,7 +280,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one two three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); test.done(); }, @@ -291,7 +291,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one two three four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); test.done(); }, @@ -403,7 +403,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["জানু", "ফেব্ৰু"]), 'জানু, ফেব্ৰু'); + test.equal(fmt.format(["জানু", "ফেব্ৰু"]), 'জানু আৰু ফেব্ৰু'); test.done(); }, testListFmtasINMonthThree: function(test) { @@ -413,7 +413,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["জানু", "ফেব্ৰু", "মাৰ্চ"]), 'জানু, ফেব্ৰু, মাৰ্চ'); + test.equal(fmt.format(["জানু", "ফেব্ৰু", "মাৰ্চ"]), 'জানু, ফেব্ৰু আৰু মাৰ্চ'); test.done(); }, testListFmtasINMonthFour: function(test) { @@ -423,7 +423,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["জানু", "ফেব্ৰু", "মাৰ্চ", "এপ্ৰিল"]), 'জানু, ফেব্ৰু, মাৰ্চ, এপ্ৰিল'); + test.equal(fmt.format(["জানু", "ফেব্ৰু", "মাৰ্চ", "এপ্ৰিল"]), 'জানু, ফেব্ৰু, মাৰ্চ আৰু এপ্ৰিল'); test.done(); }, //az-Latn-AZ @@ -444,7 +444,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "iki"]), "bir, iki"); + test.equal(fmt.format(["bir", "iki"]), "bir və iki"); test.done(); }, testListFmtazLatnAZNumberFormatThree: function(test) { @@ -454,7 +454,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "iki", "üç"]), "bir, iki, üç"); + test.equal(fmt.format(["bir", "iki", "üç"]), "bir, iki və üç"); test.done(); }, testListFmtazLatnAZNumberFormatFour: function(test) { @@ -464,7 +464,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "iki", "üç", "dörd"]), "bir, iki, üç, dörd"); + test.equal(fmt.format(["bir", "iki", "üç", "dörd"]), "bir, iki, üç və dörd"); test.done(); }, testListFmtUnitStyleazLatnAZNumberFormatOne: function(test) { @@ -590,7 +590,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["един", "два"]), "един, два"); + test.equal(fmt.format(["един", "два"]), "един и два"); test.done(); }, testListFmtbgBGNumberFormatThree: function(test) { @@ -772,7 +772,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["এক", "দুই"]), "এক, দুই"); + test.equal(fmt.format(["এক", "দুই"]), "এক এবং দুই"); test.done(); }, testListFmtbnINNumberFormatThree: function(test) { @@ -782,7 +782,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["এক", "দুই", "তিন"]), "এক, দুই, তিন"); + test.equal(fmt.format(["এক", "দুই", "তিন"]), "এক, দুই এবং তিন"); test.done(); }, testListFmtbnINNumberFormatFour: function(test) { @@ -792,7 +792,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["এক", "দুই", "তিন", "চার"]), "এক, দুই, তিন, চার"); + test.equal(fmt.format(["এক", "দুই", "তিন", "চার"]), "এক, দুই, তিন এবং চার"); test.done(); }, @@ -814,7 +814,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["jeden", "dva"]), "jeden, dva"); + test.equal(fmt.format(["jeden", "dva"]), "jeden a dva"); test.done(); }, testListFmtcsCZNumberFormatThree: function(test) { @@ -824,7 +824,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["jeden", "dva", "tři"]), "jeden, dva, tři"); + test.equal(fmt.format(["jeden", "dva", "tři"]), "jeden, dva a tři"); test.done(); }, testListFmtcsCZNumberFormatFour: function(test) { @@ -834,7 +834,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["jeden", "dva", "tři", "čtyři"]), "jeden, dva, tři, čtyři"); + test.equal(fmt.format(["jeden", "dva", "tři", "čtyři"]), "jeden, dva, tři a čtyři"); test.done(); }, testListFmtcsCZNumberFormatFourLong: function(test) { @@ -868,7 +868,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["jeden", "dva"]), "jeden dva"); + test.equal(fmt.format(["jeden", "dva"]), "jeden, dva"); test.done(); }, testListFmtUnitStylecsCZNumberFormatThree: function(test) { @@ -879,7 +879,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["jeden", "dva", "tři"]), "jeden dva tři"); + test.equal(fmt.format(["jeden", "dva", "tři"]), "jeden, dva a tři"); test.done(); }, testListFmtUnitStylecsCZNumberFormatFour: function(test) { @@ -890,7 +890,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["jeden", "dva", "tři", "čtyři"]), "jeden dva tři čtyři"); + test.equal(fmt.format(["jeden", "dva", "tři", "čtyři"]), "jeden, dva, tři a čtyři"); test.done(); }, @@ -1072,7 +1072,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Üks", "Kaks"]), "Üks, Kaks"); + test.equal(fmt.format(["Üks", "Kaks"]), "Üks ja Kaks"); test.done(); }, testListFmtetEENumberFormatThree: function(test) { @@ -1082,7 +1082,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Üks", "Kaks", "kolm"]), "Üks, Kaks, kolm"); + test.equal(fmt.format(["Üks", "Kaks", "kolm"]), "Üks, Kaks ja kolm"); test.done(); }, testListFmtetEENumberFormatFour: function(test) { @@ -1092,7 +1092,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Üks", "Kaks", "kolm", "Neli"]), "Üks, Kaks, kolm, Neli"); + test.equal(fmt.format(["Üks", "Kaks", "kolm", "Neli"]), "Üks, Kaks, kolm ja Neli"); test.done(); }, @@ -1115,7 +1115,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Üks", "Kaks"]), "Üks Kaks"); + test.equal(fmt.format(["Üks", "Kaks"]), "Üks, Kaks"); test.done(); }, testListFmtUnitStyleetEENumberFormatThree: function(test) { @@ -1126,7 +1126,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Üks", "Kaks", "kolm"]), "Üks Kaks kolm"); + test.equal(fmt.format(["Üks", "Kaks", "kolm"]), "Üks, Kaks, kolm"); test.done(); }, testListFmtUnitStyleetEENumberFormatFour: function(test) { @@ -1137,7 +1137,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Üks", "Kaks", "kolm", "Neli"]), "Üks Kaks kolm Neli"); + test.equal(fmt.format(["Üks", "Kaks", "kolm", "Neli"]), "Üks, Kaks, kolm, Neli"); test.done(); }, testListFmtUnitStyleetEENumberFormatOneFull: function(test) { @@ -1250,7 +1250,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["yksi", "kaksi"]), "yksi kaksi"); + test.equal(fmt.format(["yksi", "kaksi"]), "yksi, kaksi"); test.done(); }, testListFmtUnitStylefiFINumberFormatThree: function(test) { @@ -1261,7 +1261,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["yksi", "kaksi", "kolmikko"]), "yksi kaksi kolmikko"); + test.equal(fmt.format(["yksi", "kaksi", "kolmikko"]), "yksi, kaksi, kolmikko"); test.done(); }, testListFmtUnitStylefiFINumberFormatFour: function(test) { @@ -1272,7 +1272,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["yksi", "kaksi", "kolmikko", "neljä"]), "yksi kaksi kolmikko neljä"); + test.equal(fmt.format(["yksi", "kaksi", "kolmikko", "neljä"]), "yksi, kaksi, kolmikko, neljä"); test.done(); }, @@ -1338,7 +1338,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ceann", "dhá"]), "ceann dhá"); + test.equal(fmt.format(["ceann", "dhá"]), "ceann, dhá"); test.done(); }, testListFmtgaIENumberFormatThree: function(test) { @@ -1349,7 +1349,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ceann", "dhá", "trí"]), "ceann dhá trí"); + test.equal(fmt.format(["ceann", "dhá", "trí"]), "ceann, dhá, trí"); test.done(); }, testListFmtgaIENumberFormatFour: function(test) { @@ -1360,7 +1360,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ceann", "dhá", "trí", "ceithre"]), "ceann dhá trí ceithre"); + test.equal(fmt.format(["ceann", "dhá", "trí", "ceithre"]), "ceann, dhá, trí, ceithre"); test.done(); }, @@ -1561,7 +1561,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Vienu", "Divi"]), "Vienu Divi"); + test.equal(fmt.format(["Vienu", "Divi"]), "Vienu un Divi"); test.done(); }, testListFmtUnitStylelvLVNumberFormatThree: function(test) { @@ -1572,7 +1572,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Vienu", "Divi", "Trīs"]), "Vienu Divi Trīs"); + test.equal(fmt.format(["Vienu", "Divi", "Trīs"]), "Vienu, Divi un Trīs"); test.done(); }, testListFmtUnitStylelvLVNumberFormatFour: function(test) { @@ -1583,7 +1583,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Vienu", "Divi", "Trīs", "Četri"]), "Vienu Divi Trīs Četri"); + test.equal(fmt.format(["Vienu", "Divi", "Trīs", "Četri"]), "Vienu, Divi, Trīs un Četri"); test.done(); }, testListFmtUnitStylelvLVNumberFormatOneLong: function(test) { @@ -2099,7 +2099,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["satu", "dua"]), "satu, dua"); + test.equal(fmt.format(["satu", "dua"]), "satu dan dua"); test.done(); }, @@ -2110,7 +2110,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["satu", "dua", "tiga"]), "satu, dua, tiga"); + test.equal(fmt.format(["satu", "dua", "tiga"]), "satu, dua, dan tiga"); test.done(); }, @@ -2121,7 +2121,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["satu", "dua", "tiga", "empat"]), "satu, dua, tiga, empat"); + test.equal(fmt.format(["satu", "dua", "tiga", "empat"]), "satu, dua, tiga, dan empat"); test.done(); }, @@ -2309,7 +2309,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["unu", "Două"]), "unu, Două"); + test.equal(fmt.format(["unu", "Două"]), "unu și Două"); test.done(); }, @@ -2320,7 +2320,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["unu", "Două", "Trei"]), "unu, Două, Trei"); + test.equal(fmt.format(["unu", "Două", "Trei"]), "unu, Două și Trei"); test.done(); }, @@ -2331,7 +2331,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["unu", "Două", "Trei", "patru"]), "unu, Două, Trei, patru"); + test.equal(fmt.format(["unu", "Două", "Trei", "patru"]), "unu, Două, Trei și patru"); test.done(); }, @@ -2592,7 +2592,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Moja", "Mbili"]), "Moja, Mbili"); + test.equal(fmt.format(["Moja", "Mbili"]), "Moja na Mbili"); test.done(); }, @@ -2686,7 +2686,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Biri", "Ikkita"]), "Biri, Ikkita"); + test.equal(fmt.format(["Biri", "Ikkita"]), "Biri va Ikkita"); test.done(); }, @@ -2697,7 +2697,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Biri", "Ikkita", "Uchta"]), "Biri, Ikkita, Uchta"); + test.equal(fmt.format(["Biri", "Ikkita", "Uchta"]), "Biri, Ikkita va Uchta"); test.done(); }, @@ -2708,7 +2708,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Biri", "Ikkita", "Uchta", "To'rtta"]), "Biri, Ikkita, Uchta, To\'rtta"); + test.equal(fmt.format(["Biri", "Ikkita", "Uchta", "To'rtta"]), "Biri, Ikkita, Uchta va To\'rtta"); test.done(); }, @@ -2779,7 +2779,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["một", "hai"]), "một, hai"); + test.equal(fmt.format(["một", "hai"]), "một và hai"); test.done(); }, @@ -2790,7 +2790,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["một", "hai", "ba"]), "một, hai, ba"); + test.equal(fmt.format(["một", "hai", "ba"]), "một, hai và ba"); test.done(); }, @@ -2801,7 +2801,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["một", "hai", "ba", "bốn"]), "một, hai, ba, bốn"); + test.equal(fmt.format(["một", "hai", "ba", "bốn"]), "một, hai, ba và bốn"); test.done(); }, @@ -2825,7 +2825,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "два"]), "bir два"); + test.equal(fmt.format(["bir", "два"]), "bir và два"); test.done(); }, @@ -2837,7 +2837,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "два", "три"]), "bir два три"); + test.equal(fmt.format(["bir", "два", "три"]), "bir, два và три"); test.done(); }, @@ -2849,7 +2849,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "два", "три", "четыре"]), "bir два три четыре"); + test.equal(fmt.format(["bir", "два", "три", "четыре"]), "bir, два, три và четыре"); test.done(); }, @@ -2861,7 +2861,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "два", "три", "четыре", "пять"]), "bir два три четыре пять"); + test.equal(fmt.format(["bir", "два", "три", "четыре", "пять"]), "bir, два, три, четыре và пять"); test.done(); }, diff --git a/js/test/strings-ext/testlistfmt_am_ET.js b/js/test/strings-ext/testlistfmt_am_ET.js index 1a7053724c..820eab63b6 100644 --- a/js/test/strings-ext/testlistfmt_am_ET.js +++ b/js/test/strings-ext/testlistfmt_am_ET.js @@ -62,7 +62,7 @@ module.exports.testlistfmt_am_ET = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["አንድ", "ሁለት", "ሶስት"]), "አንድ, ሁለት, እና ሶስት"); + test.equal(fmt.format(["አንድ", "ሁለት", "ሶስት"]), "አንድ፣ ሁለት, እና ሶስት"); test.done(); }, @@ -73,7 +73,7 @@ module.exports.testlistfmt_am_ET = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["አንድ", "ሁለት", "ሶስት", "አራት"]), "አንድ, ሁለት፣ ሶስት, እና አራት"); + test.equal(fmt.format(["አንድ", "ሁለት", "ሶስት", "አራት"]), "አንድ፣ ሁለት፣ ሶስት, እና አራት"); test.done(); }, testListFmtUnitStyleamETNumberFormatOne: function(test) { @@ -96,7 +96,7 @@ module.exports.testlistfmt_am_ET = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["አንድ", "ሁለት"]), "አንድ ሁለት"); + test.equal(fmt.format(["አንድ", "ሁለት"]), "አንድ፣ ሁለት"); test.done(); }, @@ -108,7 +108,7 @@ module.exports.testlistfmt_am_ET = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["አንድ", "ሁለት", "ሶስት"]), "አንድ፣ ሁለት ሶስት"); + test.equal(fmt.format(["አንድ", "ሁለት", "ሶስት"]), "አንድ፣ ሁለት፣ ሶስት"); test.done(); }, @@ -120,7 +120,7 @@ module.exports.testlistfmt_am_ET = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["አንድ", "ሁለት", "ሶስት", "አራት"]), "አንድ፣ ሁለት፣ ሶስት አራት"); + test.equal(fmt.format(["አንድ", "ሁለት", "ሶስት", "አራት"]), "አንድ፣ ሁለት፣ ሶስት፣ አራት"); test.done(); } }; diff --git a/js/test/strings-ext/testlistfmt_ar.js b/js/test/strings-ext/testlistfmt_ar.js index a7ff56ae2c..66a77ecf26 100644 --- a/js/test/strings-ext/testlistfmt_ar.js +++ b/js/test/strings-ext/testlistfmt_ar.js @@ -256,7 +256,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد واثنان وثلاثة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد، واثنان، وثلاثة"); test.done(); }, @@ -268,7 +268,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد واثنان وثلاثة وأربعة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد، واثنان، وثلاثة، وأربعة"); test.done(); }, @@ -583,7 +583,7 @@ module.exports.testlistfmt_ar = { }); test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد واثنان وثلاثة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد، واثنان، وثلاثة"); test.done(); }, @@ -594,7 +594,7 @@ module.exports.testlistfmt_ar = { }); test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد واثنان وثلاثة وأربعة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد، واثنان، وثلاثة، وأربعة"); test.done(); }, @@ -869,7 +869,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد واثنان وثلاثة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد، واثنان، وثلاثة"); test.done(); }, @@ -881,7 +881,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد واثنان وثلاثة وأربعة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد، واثنان، وثلاثة، وأربعة"); test.done(); }, @@ -1265,7 +1265,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد واثنان وثلاثة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد، واثنان، وثلاثة"); test.done(); }, @@ -1277,7 +1277,7 @@ module.exports.testlistfmt_ar = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد واثنان وثلاثة وأربعة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد، واثنان، وثلاثة، وأربعة"); test.done(); }, diff --git a/js/test/strings-ext/testlistfmt_el.js b/js/test/strings-ext/testlistfmt_el.js index 4932496845..dc90863205 100644 --- a/js/test/strings-ext/testlistfmt_el.js +++ b/js/test/strings-ext/testlistfmt_el.js @@ -51,7 +51,7 @@ module.exports.testlistfmt_el = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ένας", "δυο"]), "ένας, δυο"); + test.equal(fmt.format(["ένας", "δυο"]), "ένας και δυο"); test.done(); }, @@ -62,7 +62,7 @@ module.exports.testlistfmt_el = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ένας", "δυο", "τρία"]), "ένας, δυο, τρία"); + test.equal(fmt.format(["ένας", "δυο", "τρία"]), "ένας, δυο και τρία"); test.done(); }, @@ -73,7 +73,7 @@ module.exports.testlistfmt_el = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ένας", "δυο", "τρία", "τέσσερα"]), "ένας, δυο, τρία, τέσσερα"); + test.equal(fmt.format(["ένας", "δυο", "τρία", "τέσσερα"]), "ένας, δυο, τρία και τέσσερα"); test.done(); }, testListFmtUnitStyleelCYNumberFormatOne: function(test) { @@ -96,7 +96,7 @@ module.exports.testlistfmt_el = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ένας", "δυο"]), "ένας δυο"); + test.equal(fmt.format(["ένας", "δυο"]), "ένας, δυο"); test.done(); }, @@ -108,7 +108,7 @@ module.exports.testlistfmt_el = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ένας", "δυο", "τρία"]), "ένας δυο τρία"); + test.equal(fmt.format(["ένας", "δυο", "τρία"]), "ένας, δυο, τρία"); test.done(); }, @@ -120,7 +120,7 @@ module.exports.testlistfmt_el = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ένας", "δυο", "τρία", "τέσσερα"]), "ένας δυο τρία τέσσερα"); + test.equal(fmt.format(["ένας", "δυο", "τρία", "τέσσερα"]), "ένας, δυο, τρία, τέσσερα"); test.done(); }, testListFmtUnitStyleelCYNumberFormatOneMedium: function(test) { @@ -195,7 +195,7 @@ module.exports.testlistfmt_el = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ένας", "δυο"]), "ένας, δυο"); + test.equal(fmt.format(["ένας", "δυο"]), "ένας και δυο"); test.done(); }, @@ -206,7 +206,7 @@ module.exports.testlistfmt_el = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ένας", "δυο", "τρία"]), "ένας, δυο, τρία"); + test.equal(fmt.format(["ένας", "δυο", "τρία"]), "ένας, δυο και τρία"); test.done(); }, @@ -217,7 +217,7 @@ module.exports.testlistfmt_el = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ένας", "δυο", "τρία", "τέσσερα"]), "ένας, δυο, τρία, τέσσερα"); + test.equal(fmt.format(["ένας", "δυο", "τρία", "τέσσερα"]), "ένας, δυο, τρία και τέσσερα"); test.done(); }, testListFmtUnitStyleelGRNumberFormatOneLong: function(test) { diff --git a/js/test/strings-ext/testlistfmt_en.js b/js/test/strings-ext/testlistfmt_en.js index a151a07cce..c452cb984e 100644 --- a/js/test/strings-ext/testlistfmt_en.js +++ b/js/test/strings-ext/testlistfmt_en.js @@ -50,7 +50,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one, two"); + test.equal(fmt.format(["one", "two"]), "one & two"); test.done(); }, @@ -61,7 +61,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two, & three"); test.done(); }, @@ -72,7 +72,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, & four"); test.done(); }, @@ -83,7 +83,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four, five"); + test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four, & five"); test.done(); }, @@ -107,7 +107,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one two"); + test.equal(fmt.format(["one", "two"]), "one, two"); test.done(); }, @@ -119,7 +119,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one two three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); test.done(); }, @@ -131,7 +131,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one two three four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); test.done(); }, @@ -143,7 +143,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one two three four five"); + test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four, five"); test.done(); }, @@ -232,7 +232,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one, two"); + test.equal(fmt.format(["one", "two"]), "one and two"); test.done(); }, @@ -243,7 +243,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two and three"); test.done(); }, @@ -254,7 +254,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three and four"); test.done(); }, @@ -265,7 +265,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four, five"); + test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four and five"); test.done(); }, @@ -289,7 +289,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one, two"); + test.equal(fmt.format(["one", "two"]), "one and two"); test.done(); }, @@ -300,7 +300,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two and three"); test.done(); }, @@ -311,7 +311,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three and four"); test.done(); }, @@ -322,7 +322,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four, five"); + test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four and five"); test.done(); }, @@ -346,7 +346,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one, two"); + test.equal(fmt.format(["one", "two"]), "one and two"); test.done(); }, @@ -357,7 +357,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two and three"); test.done(); }, @@ -368,7 +368,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three and four"); test.done(); }, @@ -379,7 +379,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four, five"); + test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four and five"); test.done(); }, @@ -403,7 +403,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one two"); + test.equal(fmt.format(["one", "two"]), "one, two"); test.done(); }, @@ -415,7 +415,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one two three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); test.done(); }, @@ -427,7 +427,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one two three four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); test.done(); }, @@ -439,7 +439,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one two three four five"); + test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four, five"); test.done(); }, @@ -463,7 +463,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one, two"); + test.equal(fmt.format(["one", "two"]), "one and two"); test.done(); }, @@ -474,7 +474,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two and three"); test.done(); }, @@ -485,7 +485,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three and four"); test.done(); }, @@ -496,7 +496,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four, five"); + test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four and five"); test.done(); }, @@ -587,7 +587,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one, two"); + test.equal(fmt.format(["one", "two"]), "one and two"); test.done(); }, @@ -598,7 +598,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two and three"); test.done(); }, @@ -609,7 +609,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three and four"); test.done(); }, @@ -778,7 +778,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one two"); + test.equal(fmt.format(["one", "two"]), "one, two"); test.done(); }, @@ -790,7 +790,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one two three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); test.done(); }, @@ -802,7 +802,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one two three four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); test.done(); }, // en-IN @@ -981,7 +981,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one, two"); + test.equal(fmt.format(["one", "two"]), "one and two"); test.done(); }, @@ -992,7 +992,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two and three"); test.done(); }, @@ -1003,7 +1003,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three and four"); test.done(); }, @@ -1184,7 +1184,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one two"); + test.equal(fmt.format(["one", "two"]), "one, two"); test.done(); }, @@ -1196,7 +1196,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one two three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); test.done(); }, @@ -1208,7 +1208,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one two three four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); test.done(); }, // en-MY @@ -1387,7 +1387,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one, two"); + test.equal(fmt.format(["one", "two"]), "one & two"); test.done(); }, @@ -1398,7 +1398,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two, & three"); test.done(); }, @@ -1409,7 +1409,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, & four"); test.done(); }, @@ -1579,7 +1579,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one two"); + test.equal(fmt.format(["one", "two"]), "one, two"); test.done(); }, @@ -1591,7 +1591,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one two three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); test.done(); }, @@ -1603,7 +1603,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one two three four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); test.done(); }, // en-CN @@ -1782,7 +1782,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one, two"); + test.equal(fmt.format(["one", "two"]), "one and two"); test.done(); }, @@ -1793,7 +1793,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two and three"); test.done(); }, @@ -1804,7 +1804,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three and four"); test.done(); }, @@ -1974,7 +1974,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one two"); + test.equal(fmt.format(["one", "two"]), "one, two"); test.done(); }, @@ -1986,7 +1986,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one two three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); test.done(); }, @@ -1998,7 +1998,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one two three four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); test.done(); }, // en-SD @@ -2177,7 +2177,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two"]), "one, two"); + test.equal(fmt.format(["one", "two"]), "one and two"); test.done(); }, @@ -2188,7 +2188,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three"]), "one, two, three"); + test.equal(fmt.format(["one", "two", "three"]), "one, two and three"); test.done(); }, @@ -2199,7 +2199,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three, four"); + test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three and four"); test.done(); }, @@ -2210,7 +2210,7 @@ module.exports.testlistfmt_en = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four, five"); + test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four and five"); test.done(); } }; \ No newline at end of file diff --git a/js/test/strings-ext/testlistfmt_es.js b/js/test/strings-ext/testlistfmt_es.js index 59deb216f5..717ebec814 100644 --- a/js/test/strings-ext/testlistfmt_es.js +++ b/js/test/strings-ext/testlistfmt_es.js @@ -679,7 +679,7 @@ module.exports.testlistfmt_es = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["uno", "dos"]), "uno dos"); + test.equal(fmt.format(["uno", "dos"]), "uno y dos"); test.done(); }, @@ -691,7 +691,7 @@ module.exports.testlistfmt_es = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["uno", "dos", "tres"]), "uno dos tres"); + test.equal(fmt.format(["uno", "dos", "tres"]), "uno, dos, tres"); test.done(); }, @@ -703,7 +703,7 @@ module.exports.testlistfmt_es = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["uno", "dos", "tres", "cuatro"]), "uno dos tres cuatro"); + test.equal(fmt.format(["uno", "dos", "tres", "cuatro"]), "uno, dos, tres, cuatro"); test.done(); }, // es-GT @@ -1072,7 +1072,7 @@ module.exports.testlistfmt_es = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["uno", "dos"]), "uno dos"); + test.equal(fmt.format(["uno", "dos"]), "uno y dos"); test.done(); }, @@ -1084,7 +1084,7 @@ module.exports.testlistfmt_es = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["uno", "dos", "tres"]), "uno dos tres"); + test.equal(fmt.format(["uno", "dos", "tres"]), "uno, dos, tres"); test.done(); }, @@ -1096,7 +1096,7 @@ module.exports.testlistfmt_es = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["uno", "dos", "tres", "cuatro"]), "uno dos tres cuatro"); + test.equal(fmt.format(["uno", "dos", "tres", "cuatro"]), "uno, dos, tres, cuatro"); test.done(); }, // es-US diff --git a/js/test/strings-ext/testlistfmt_fa.js b/js/test/strings-ext/testlistfmt_fa.js index 03e9aa93e1..b7e940839e 100644 --- a/js/test/strings-ext/testlistfmt_fa.js +++ b/js/test/strings-ext/testlistfmt_fa.js @@ -49,7 +49,7 @@ module.exports.testlistfmt_fa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["یکی", "دو"]), "یکی،‏ دو"); + test.equal(fmt.format(["یکی", "دو"]), "یکی و دو"); test.done(); }, @@ -60,7 +60,7 @@ module.exports.testlistfmt_fa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["یکی", "دو", "سه"]), "یکی،‏ دو،‏ سه"); + test.equal(fmt.format(["یکی", "دو", "سه"]), "یکی،‏ دو، و سه"); test.done(); }, @@ -71,7 +71,7 @@ module.exports.testlistfmt_fa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["یکی", "دو", "سه", "چهار"]), "یکی،‏ دو،‏ سه،‏ چهار"); + test.equal(fmt.format(["یکی", "دو", "سه", "چهار"]), "یکی،‏ دو،‏ سه، و چهار"); test.done(); }, @@ -82,7 +82,7 @@ module.exports.testlistfmt_fa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["یکی", "دو", "سه", "چهار", "پنج"]), "یکی،‏ دو،‏ سه،‏ چهار،‏ پنج"); + test.equal(fmt.format(["یکی", "دو", "سه", "چهار", "پنج"]), "یکی،‏ دو،‏ سه،‏ چهار، و پنج"); test.done(); }, @@ -365,7 +365,7 @@ module.exports.testlistfmt_fa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["یکی", "دو"]), "یکی،‏ دو"); + test.equal(fmt.format(["یکی", "دو"]), "یکی و دو"); test.done(); }, @@ -376,7 +376,7 @@ module.exports.testlistfmt_fa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["یکی", "دو", "سه"]), "یکی،‏ دو،‏ سه"); + test.equal(fmt.format(["یکی", "دو", "سه"]), "یکی،‏ دو، و سه"); test.done(); }, @@ -387,7 +387,7 @@ module.exports.testlistfmt_fa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["یکی", "دو", "سه", "چهار"]), "یکی،‏ دو،‏ سه،‏ چهار"); + test.equal(fmt.format(["یکی", "دو", "سه", "چهار"]), "یکی،‏ دو،‏ سه، و چهار"); test.done(); }, @@ -398,7 +398,7 @@ module.exports.testlistfmt_fa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["یکی", "دو", "سه", "چهار", "پنج"]), "یکی،‏ دو،‏ سه،‏ چهار،‏ پنج"); + test.equal(fmt.format(["یکی", "دو", "سه", "چهار", "پنج"]), "یکی،‏ دو،‏ سه،‏ چهار، و پنج"); test.done(); }, diff --git a/js/test/strings-ext/testlistfmt_fr.js b/js/test/strings-ext/testlistfmt_fr.js index a815cd8251..25bac04b2f 100644 --- a/js/test/strings-ext/testlistfmt_fr.js +++ b/js/test/strings-ext/testlistfmt_fr.js @@ -49,7 +49,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux"]), "un, deux"); + test.equal(fmt.format(["un", "deux"]), "un et deux"); test.done(); }, @@ -60,7 +60,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux", "trois"]), "un, deux, trois"); + test.equal(fmt.format(["un", "deux", "trois"]), "un, deux et trois"); test.done(); }, @@ -71,7 +71,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux", "trois", "quatre"]), "un, deux, trois, quatre"); + test.equal(fmt.format(["un", "deux", "trois", "quatre"]), "un, deux, trois et quatre"); test.done(); }, @@ -82,7 +82,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux", "trois", "quatre", "cinq"]), "un, deux, trois, quatre, cinq"); + test.equal(fmt.format(["un", "deux", "trois", "quatre", "cinq"]), "un, deux, trois, quatre et cinq"); test.done(); }, @@ -108,7 +108,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux"]), "un deux"); + test.equal(fmt.format(["un", "deux"]), "un et deux"); test.done(); }, @@ -120,7 +120,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux", "trois"]), "un deux trois"); + test.equal(fmt.format(["un", "deux", "trois"]), "un, deux et trois"); test.done(); }, @@ -132,7 +132,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux", "trois", "quatre"]), "un deux trois quatre"); + test.equal(fmt.format(["un", "deux", "trois", "quatre"]), "un, deux, trois et quatre"); test.done(); }, @@ -144,7 +144,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux", "trois", "quatre", "cinq"]), "un deux trois quatre cinq"); + test.equal(fmt.format(["un", "deux", "trois", "quatre", "cinq"]), "un, deux, trois, quatre et cinq"); test.done(); }, @@ -361,7 +361,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux"]), "un, deux"); + test.equal(fmt.format(["un", "deux"]), "un et deux"); test.done(); }, @@ -372,7 +372,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux", "trois"]), "un, deux, trois"); + test.equal(fmt.format(["un", "deux", "trois"]), "un, deux et trois"); test.done(); }, @@ -383,7 +383,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux", "trois", "quatre"]), "un, deux, trois, quatre"); + test.equal(fmt.format(["un", "deux", "trois", "quatre"]), "un, deux, trois et quatre"); test.done(); }, @@ -554,7 +554,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux"]), "un deux"); + test.equal(fmt.format(["un", "deux"]), "un et deux"); test.done(); }, @@ -566,7 +566,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux", "trois"]), "un deux trois"); + test.equal(fmt.format(["un", "deux", "trois"]), "un, deux et trois"); test.done(); }, @@ -578,7 +578,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux", "trois", "quatre"]), "un deux trois quatre"); + test.equal(fmt.format(["un", "deux", "trois", "quatre"]), "un, deux, trois et quatre"); test.done(); }, // fr-BJ @@ -756,7 +756,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux"]), "un, deux"); + test.equal(fmt.format(["un", "deux"]), "un et deux"); test.done(); }, @@ -767,7 +767,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux", "trois"]), "un, deux, trois"); + test.equal(fmt.format(["un", "deux", "trois"]), "un, deux et trois"); test.done(); }, @@ -778,7 +778,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux", "trois", "quatre"]), "un, deux, trois, quatre"); + test.equal(fmt.format(["un", "deux", "trois", "quatre"]), "un, deux, trois et quatre"); test.done(); }, @@ -949,7 +949,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux"]), "un deux"); + test.equal(fmt.format(["un", "deux"]), "un et deux"); test.done(); }, @@ -961,7 +961,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux", "trois"]), "un deux trois"); + test.equal(fmt.format(["un", "deux", "trois"]), "un, deux et trois"); test.done(); }, @@ -973,7 +973,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux", "trois", "quatre"]), "un deux trois quatre"); + test.equal(fmt.format(["un", "deux", "trois", "quatre"]), "un, deux, trois et quatre"); test.done(); }, // fr-DZ @@ -1202,7 +1202,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux"]), "un deux"); + test.equal(fmt.format(["un", "deux"]), "un et deux"); test.done(); }, @@ -1214,7 +1214,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux", "trois"]), "un deux trois"); + test.equal(fmt.format(["un", "deux", "trois"]), "un, deux et trois"); test.done(); }, @@ -1226,7 +1226,7 @@ module.exports.testlistfmt_fr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["un", "deux", "trois", "quatre"]), "un deux trois quatre"); + test.equal(fmt.format(["un", "deux", "trois", "quatre"]), "un, deux, trois et quatre"); test.done(); }, // fr-RW diff --git a/js/test/strings-ext/testlistfmt_gu_IN.js b/js/test/strings-ext/testlistfmt_gu_IN.js index ab0b0e7ee7..83885b1cd2 100644 --- a/js/test/strings-ext/testlistfmt_gu_IN.js +++ b/js/test/strings-ext/testlistfmt_gu_IN.js @@ -51,7 +51,7 @@ module.exports.testlistfmt_gu_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["એક", "બે"]), "એક, બે"); + test.equal(fmt.format(["એક", "બે"]), "એક અને બે"); test.done(); }, @@ -62,7 +62,7 @@ module.exports.testlistfmt_gu_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["એક", "બે", "ત્રણ"]), "એક, બે, ત્રણ"); + test.equal(fmt.format(["એક", "બે", "ત્રણ"]), "એક, બે અને ત્રણ"); test.done(); }, @@ -73,7 +73,7 @@ module.exports.testlistfmt_gu_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["એક", "બે", "ત્રણ", "ચાર"]), "એક, બે, ત્રણ, ચાર"); + test.equal(fmt.format(["એક", "બે", "ત્રણ", "ચાર"]), "એક, બે, ત્રણ અને ચાર"); test.done(); }, testListFmtUnitStyleguINNumberFormatOne: function(test) { diff --git a/js/test/strings-ext/testlistfmt_he_IL.js b/js/test/strings-ext/testlistfmt_he_IL.js index 2c739b48e0..ed68f252e1 100644 --- a/js/test/strings-ext/testlistfmt_he_IL.js +++ b/js/test/strings-ext/testlistfmt_he_IL.js @@ -96,7 +96,7 @@ module.exports.testlistfmt_he_IL = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["אחד", "שתיים"]), "אחד שתיים"); + test.equal(fmt.format(["אחד", "שתיים"]), "אחד, שתיים"); test.done(); }, @@ -108,7 +108,7 @@ module.exports.testlistfmt_he_IL = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["אחד", "שתיים", "שְׁלוֹשָׁה"]), "אחד שתיים שְׁלוֹשָׁה"); + test.equal(fmt.format(["אחד", "שתיים", "שְׁלוֹשָׁה"]), "אחד, שתיים, שְׁלוֹשָׁה"); test.done(); }, @@ -120,7 +120,7 @@ module.exports.testlistfmt_he_IL = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["אחד", "שתיים", "שְׁלוֹשָׁה", "ארבעה"]), "אחד שתיים שְׁלוֹשָׁה ארבעה"); + test.equal(fmt.format(["אחד", "שתיים", "שְׁלוֹשָׁה", "ארבעה"]), "אחד, שתיים, שְׁלוֹשָׁה, ארבעה"); test.done(); }, testListFmtUnitStyleheILNumberFormatOneMedium: function(test) { diff --git a/js/test/strings-ext/testlistfmt_hi_IN.js b/js/test/strings-ext/testlistfmt_hi_IN.js index b22461fb69..835952f3b6 100644 --- a/js/test/strings-ext/testlistfmt_hi_IN.js +++ b/js/test/strings-ext/testlistfmt_hi_IN.js @@ -95,7 +95,7 @@ module.exports.testlistfmt_hi_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["एक", "दो"]), "एक दो"); + test.equal(fmt.format(["एक", "दो"]), "एक, दो"); test.done(); }, @@ -107,7 +107,7 @@ module.exports.testlistfmt_hi_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["एक", "दो", "तीन"]), "एक, दो तीन"); + test.equal(fmt.format(["एक", "दो", "तीन"]), "एक, दो, तीन"); test.done(); }, @@ -119,7 +119,7 @@ module.exports.testlistfmt_hi_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["एक", "दो", "तीन", "चार"]), "एक, दो, तीन चार"); + test.equal(fmt.format(["एक", "दो", "तीन", "चार"]), "एक, दो, तीन, चार"); test.done(); }, testListFmtUnitStylehiINNumberFormatOneMedium: function(test) { diff --git a/js/test/strings-ext/testlistfmt_hr.js b/js/test/strings-ext/testlistfmt_hr.js index 5a8930a40b..b525626ffd 100644 --- a/js/test/strings-ext/testlistfmt_hr.js +++ b/js/test/strings-ext/testlistfmt_hr.js @@ -96,7 +96,7 @@ module.exports.testlistfmt_hr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["jedan", "dva"]), "jedan dva"); + test.equal(fmt.format(["jedan", "dva"]), "jedan i dva"); test.done(); }, @@ -108,7 +108,7 @@ module.exports.testlistfmt_hr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["jedan", "dva", "три"]), "jedan dva три"); + test.equal(fmt.format(["jedan", "dva", "три"]), "jedan, dva i три"); test.done(); }, @@ -120,7 +120,7 @@ module.exports.testlistfmt_hr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["jedan", "dva", "три", "četiri"]), "jedan dva три četiri"); + test.equal(fmt.format(["jedan", "dva", "три", "četiri"]), "jedan, dva, три i četiri"); test.done(); }, @@ -132,17 +132,10 @@ module.exports.testlistfmt_hr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["jedan", "dva", "три", "četiri", "пять"]), "jedan dva три četiri пять"); + test.equal(fmt.format(["jedan", "dva", "три", "četiri", "пять"]), "jedan, dva, три, četiri i пять"); test.done(); }, - - - - - - - // hr-ME testListFmthrMENumberFormatOne: function(test) { @@ -209,7 +202,7 @@ module.exports.testlistfmt_hr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["jedan", "dva"]), "jedan dva"); + test.equal(fmt.format(["jedan", "dva"]), "jedan i dva"); test.done(); }, @@ -221,7 +214,7 @@ module.exports.testlistfmt_hr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["jedan", "dva", "три"]), "jedan dva три"); + test.equal(fmt.format(["jedan", "dva", "три"]), "jedan, dva i три"); test.done(); }, @@ -233,7 +226,7 @@ module.exports.testlistfmt_hr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["jedan", "dva", "три", "četiri"]), "jedan dva три četiri"); + test.equal(fmt.format(["jedan", "dva", "три", "četiri"]), "jedan, dva, три i četiri"); test.done(); }, @@ -245,12 +238,10 @@ module.exports.testlistfmt_hr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["jedan", "dva", "три", "četiri", "пять"]), "jedan dva три četiri пять"); + test.equal(fmt.format(["jedan", "dva", "три", "četiri", "пять"]), "jedan, dva, три, četiri i пять"); test.done(); }, - - testListFmtUnitStylehrMENumberFormatOneFull: function(test) { var fmt = new ListFmt({ locale: "hr-ME", diff --git a/js/test/strings-ext/testlistfmt_it.js b/js/test/strings-ext/testlistfmt_it.js index ab8ad78e6e..af2425ebc0 100644 --- a/js/test/strings-ext/testlistfmt_it.js +++ b/js/test/strings-ext/testlistfmt_it.js @@ -109,7 +109,7 @@ module.exports.testlistfmt_it = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["uno", "due"]), "uno due"); + test.equal(fmt.format(["uno", "due"]), "uno e due"); test.done(); }, @@ -121,7 +121,7 @@ module.exports.testlistfmt_it = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["uno", "due", "tre"]), "uno due tre"); + test.equal(fmt.format(["uno", "due", "tre"]), "uno, due e tre"); test.done(); }, @@ -133,7 +133,7 @@ module.exports.testlistfmt_it = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["uno", "due", "tre", "quattro"]), "uno due tre quattro"); + test.equal(fmt.format(["uno", "due", "tre", "quattro"]), "uno, due, tre e quattro"); test.done(); }, @@ -145,7 +145,7 @@ module.exports.testlistfmt_it = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["uno", "due", "tre", "quattro", "cinque"]), "uno due tre quattro cinque"); + test.equal(fmt.format(["uno", "due", "tre", "quattro", "cinque"]), "uno, due, tre, quattro e cinque"); test.done(); }, @@ -214,15 +214,6 @@ module.exports.testlistfmt_it = { test.done(); }, - - - - - - - - - // it-CH testListFmtitCHNumberFormatOne: function(test) { @@ -301,7 +292,7 @@ module.exports.testlistfmt_it = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["uno", "due"]), "uno due"); + test.equal(fmt.format(["uno", "due"]), "uno e due"); test.done(); }, @@ -313,7 +304,7 @@ module.exports.testlistfmt_it = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["uno", "due", "tre"]), "uno due tre"); + test.equal(fmt.format(["uno", "due", "tre"]), "uno, due e tre"); test.done(); }, @@ -325,7 +316,7 @@ module.exports.testlistfmt_it = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["uno", "due", "tre", "quattro"]), "uno due tre quattro"); + test.equal(fmt.format(["uno", "due", "tre", "quattro"]), "uno, due, tre e quattro"); test.done(); }, @@ -337,7 +328,7 @@ module.exports.testlistfmt_it = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["uno", "due", "tre", "quattro", "cinque"]), "uno due tre quattro cinque"); + test.equal(fmt.format(["uno", "due", "tre", "quattro", "cinque"]), "uno, due, tre, quattro e cinque"); test.done(); }, diff --git a/js/test/strings-ext/testlistfmt_ja_JP.js b/js/test/strings-ext/testlistfmt_ja_JP.js index c0e51f101f..98becbbd21 100644 --- a/js/test/strings-ext/testlistfmt_ja_JP.js +++ b/js/test/strings-ext/testlistfmt_ja_JP.js @@ -158,7 +158,7 @@ module.exports.testlistfmt_ja_JP = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["いち", "に"]), "いちに"); + test.equal(fmt.format(["いち", "に"]), "いち に"); test.done(); }, @@ -170,7 +170,7 @@ module.exports.testlistfmt_ja_JP = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["いち", "に", "さん"]), "いちにさん"); + test.equal(fmt.format(["いち", "に", "さん"]), "いち に さん"); test.done(); }, @@ -182,7 +182,7 @@ module.exports.testlistfmt_ja_JP = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["いち", "に", "さん", "し"]), "いちにさんし"); + test.equal(fmt.format(["いち", "に", "さん", "し"]), "いち に さん し"); test.done(); }, @@ -194,7 +194,7 @@ module.exports.testlistfmt_ja_JP = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["いち", "に", "さん", "し", "ご"]), "いちにさんしご"); + test.equal(fmt.format(["いち", "に", "さん", "し", "ご"]), "いち に さん し ご"); test.done(); }, diff --git a/js/test/strings-ext/testlistfmt_kn_IN.js b/js/test/strings-ext/testlistfmt_kn_IN.js index e52cc2a2bc..91b296d2fe 100644 --- a/js/test/strings-ext/testlistfmt_kn_IN.js +++ b/js/test/strings-ext/testlistfmt_kn_IN.js @@ -51,7 +51,7 @@ module.exports.testlistfmt_kn_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ಒಂದು", "ಎರಡು"]), "ಒಂದು, ಎರಡು"); + test.equal(fmt.format(["ಒಂದು", "ಎರಡು"]), "ಒಂದು ಮತ್ತು ಎರಡು"); test.done(); }, @@ -62,7 +62,7 @@ module.exports.testlistfmt_kn_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ಒಂದು", "ಎರಡು", "ಮೂರು"]), "ಒಂದು, ಎರಡು, ಮೂರು"); + test.equal(fmt.format(["ಒಂದು", "ಎರಡು", "ಮೂರು"]), "ಒಂದು, ಎರಡು, ಮತ್ತು ಮೂರು"); test.done(); }, @@ -73,7 +73,7 @@ module.exports.testlistfmt_kn_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ಒಂದು", "ಎರಡು", "ಮೂರು", "ನಾಲ್ಕು"]), "ಒಂದು, ಎರಡು, ಮೂರು, ನಾಲ್ಕು"); + test.equal(fmt.format(["ಒಂದು", "ಎರಡು", "ಮೂರು", "ನಾಲ್ಕು"]), "ಒಂದು, ಎರಡು, ಮೂರು, ಮತ್ತು ನಾಲ್ಕು"); test.done(); }, testListFmtUnitStyleknINNumberFormatOne: function(test) { @@ -96,7 +96,7 @@ module.exports.testlistfmt_kn_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ಒಂದು", "ಎರಡು"]), "ಒಂದು ಎರಡು"); + test.equal(fmt.format(["ಒಂದು", "ಎರಡು"]), "ಒಂದು, ಎರಡು"); test.done(); }, diff --git a/js/test/strings-ext/testlistfmt_ml_IN.js b/js/test/strings-ext/testlistfmt_ml_IN.js index 75a4c02175..060ec92212 100644 --- a/js/test/strings-ext/testlistfmt_ml_IN.js +++ b/js/test/strings-ext/testlistfmt_ml_IN.js @@ -96,7 +96,7 @@ module.exports.testlistfmt_ml_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ഒന്ന്", "രണ്ട്"]), "ഒന്ന്, രണ്ട്"); + test.equal(fmt.format(["ഒന്ന്", "രണ്ട്"]), "ഒന്ന് കൂടാതെ രണ്ട്"); test.done(); }, @@ -108,7 +108,7 @@ module.exports.testlistfmt_ml_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ഒന്ന്", "രണ്ട്", "മൂന്ന്"]), "ഒന്ന് രണ്ട് മൂന്ന്"); + test.equal(fmt.format(["ഒന്ന്", "രണ്ട്", "മൂന്ന്"]), "ഒന്ന്, രണ്ട്, മൂന്ന്"); test.done(); }, @@ -120,7 +120,7 @@ module.exports.testlistfmt_ml_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ഒന്ന്", "രണ്ട്", "മൂന്ന്", "നാല്"]), "ഒന്ന് രണ്ട് മൂന്ന് നാല്"); + test.equal(fmt.format(["ഒന്ന്", "രണ്ട്", "മൂന്ന്", "നാല്"]), "ഒന്ന്, രണ്ട്, മൂന്ന്, നാല്"); test.done(); }, testListFmtUnitStylemlINNumberFormatOneMedium: function(test) { diff --git a/js/test/strings-ext/testlistfmt_mr_IN.js b/js/test/strings-ext/testlistfmt_mr_IN.js index 60d3a2a1e1..dce557e0ab 100644 --- a/js/test/strings-ext/testlistfmt_mr_IN.js +++ b/js/test/strings-ext/testlistfmt_mr_IN.js @@ -95,7 +95,7 @@ module.exports.testlistfmt_mr_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["एक", "दोन"]), "एक दोन"); + test.equal(fmt.format(["एक", "दोन"]), "एक, दोन"); test.done(); }, @@ -107,7 +107,7 @@ module.exports.testlistfmt_mr_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["एक", "दोन", "तीन"]), "एक दोन तीन"); + test.equal(fmt.format(["एक", "दोन", "तीन"]), "एक, दोन, तीन"); test.done(); }, @@ -119,7 +119,7 @@ module.exports.testlistfmt_mr_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["एक", "दोन", "तीन", "चार"]), "एक दोन तीन चार"); + test.equal(fmt.format(["एक", "दोन", "तीन", "चार"]), "एक, दोन, तीन, चार"); test.done(); }, testListFmtUnitStylemrINNumberFormatOneFull: function(test) { diff --git a/js/test/strings-ext/testlistfmt_ms.js b/js/test/strings-ext/testlistfmt_ms.js index 54e1fc5897..3488e1a77b 100644 --- a/js/test/strings-ext/testlistfmt_ms.js +++ b/js/test/strings-ext/testlistfmt_ms.js @@ -51,7 +51,7 @@ module.exports.testlistfmt_ms = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["satu", "dua"]), "satu, dua"); + test.equal(fmt.format(["satu", "dua"]), "satu dan dua"); test.done(); }, @@ -62,7 +62,7 @@ module.exports.testlistfmt_ms = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["satu", "dua", "bertiga"]), "satu, dua, bertiga"); + test.equal(fmt.format(["satu", "dua", "bertiga"]), "satu, dua dan bertiga"); test.done(); }, @@ -73,7 +73,7 @@ module.exports.testlistfmt_ms = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["satu", "dua", "bertiga", "empat"]), "satu, dua, bertiga, empat"); + test.equal(fmt.format(["satu", "dua", "bertiga", "empat"]), "satu, dua, bertiga dan empat"); test.done(); }, testListFmtUnitStylemsLatnMYNumberFormatOne: function(test) { @@ -96,7 +96,7 @@ module.exports.testlistfmt_ms = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["satu", "dua"]), "satu dua"); + test.equal(fmt.format(["satu", "dua"]), "satu dan dua"); test.done(); }, @@ -108,7 +108,7 @@ module.exports.testlistfmt_ms = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["satu", "dua", "bertiga"]), "satu dua bertiga"); + test.equal(fmt.format(["satu", "dua", "bertiga"]), "satu, dua dan bertiga"); test.done(); }, @@ -120,7 +120,7 @@ module.exports.testlistfmt_ms = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["satu", "dua", "bertiga", "empat"]), "satu dua bertiga empat"); + test.equal(fmt.format(["satu", "dua", "bertiga", "empat"]), "satu, dua, bertiga dan empat"); test.done(); }, testListFmtUnitStylemsLatnMYNumberFormatOneMedium: function(test) { @@ -194,7 +194,7 @@ module.exports.testlistfmt_ms = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["satu", "dua"]), "satu, dua"); + test.equal(fmt.format(["satu", "dua"]), "satu dan dua"); test.done(); }, @@ -205,7 +205,7 @@ module.exports.testlistfmt_ms = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["satu", "dua", "bertiga"]), "satu, dua, bertiga"); + test.equal(fmt.format(["satu", "dua", "bertiga"]), "satu, dua dan bertiga"); test.done(); }, @@ -216,7 +216,7 @@ module.exports.testlistfmt_ms = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["satu", "dua", "bertiga", "empat"]), "satu, dua, bertiga, empat"); + test.equal(fmt.format(["satu", "dua", "bertiga", "empat"]), "satu, dua, bertiga dan empat"); test.done(); }, testListFmtUnitStylemsLatnSGNumberFormatOne: function(test) { @@ -239,7 +239,7 @@ module.exports.testlistfmt_ms = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["satu", "dua"]), "satu dua"); + test.equal(fmt.format(["satu", "dua"]), "satu dan dua"); test.done(); }, @@ -251,7 +251,7 @@ module.exports.testlistfmt_ms = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["satu", "dua", "bertiga"]), "satu dua bertiga"); + test.equal(fmt.format(["satu", "dua", "bertiga"]), "satu, dua dan bertiga"); test.done(); }, @@ -263,7 +263,7 @@ module.exports.testlistfmt_ms = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["satu", "dua", "bertiga", "empat"]), "satu dua bertiga empat"); + test.equal(fmt.format(["satu", "dua", "bertiga", "empat"]), "satu, dua, bertiga dan empat"); test.done(); }, testListFmtUnitStylemsLatnSGNumberFormatOneFull: function(test) { diff --git a/js/test/strings-ext/testlistfmt_pa.js b/js/test/strings-ext/testlistfmt_pa.js index 9d1c43f355..8ed485cedf 100644 --- a/js/test/strings-ext/testlistfmt_pa.js +++ b/js/test/strings-ext/testlistfmt_pa.js @@ -51,7 +51,7 @@ module.exports.testlistfmt_pa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ਇੱਕ", "ਦੋ"]), "ਇੱਕ, ਦੋ"); + test.equal(fmt.format(["ਇੱਕ", "ਦੋ"]), "ਇੱਕ ਅਤੇ ਦੋ"); test.done(); }, @@ -62,7 +62,7 @@ module.exports.testlistfmt_pa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ਇੱਕ", "ਦੋ", "ਤਿੰਨ"]), "ਇੱਕ, ਦੋ, ਤਿੰਨ"); + test.equal(fmt.format(["ਇੱਕ", "ਦੋ", "ਤਿੰਨ"]), "ਇੱਕ, ਦੋ ਅਤੇ ਤਿੰਨ"); test.done(); }, @@ -73,7 +73,7 @@ module.exports.testlistfmt_pa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ਇੱਕ", "ਦੋ", "ਤਿੰਨ", "ਚਾਰ"]), "ਇੱਕ, ਦੋ, ਤਿੰਨ, ਚਾਰ"); + test.equal(fmt.format(["ਇੱਕ", "ਦੋ", "ਤਿੰਨ", "ਚਾਰ"]), "ਇੱਕ, ਦੋ, ਤਿੰਨ ਅਤੇ ਚਾਰ"); test.done(); }, testListFmtUnitStylepaGuruINNumberFormatOne: function(test) { @@ -96,7 +96,7 @@ module.exports.testlistfmt_pa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ਇੱਕ", "ਦੋ"]), "ਇੱਕ ਦੋ"); + test.equal(fmt.format(["ਇੱਕ", "ਦੋ"]), "ਇੱਕ, ਦੋ"); test.done(); }, @@ -108,7 +108,7 @@ module.exports.testlistfmt_pa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ਇੱਕ", "ਦੋ", "ਤਿੰਨ"]), "ਇੱਕ ਦੋ ਤਿੰਨ"); + test.equal(fmt.format(["ਇੱਕ", "ਦੋ", "ਤਿੰਨ"]), "ਇੱਕ, ਦੋ, ਤਿੰਨ"); test.done(); }, @@ -120,7 +120,7 @@ module.exports.testlistfmt_pa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ਇੱਕ", "ਦੋ", "ਤਿੰਨ", "ਚਾਰ"]), "ਇੱਕ ਦੋ ਤਿੰਨ ਚਾਰ"); + test.equal(fmt.format(["ਇੱਕ", "ਦੋ", "ਤਿੰਨ", "ਚਾਰ"]), "ਇੱਕ, ਦੋ, ਤਿੰਨ, ਚਾਰ"); test.done(); }, @@ -143,7 +143,7 @@ module.exports.testlistfmt_pa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان"]), "واحد, اثنان"); + test.equal(fmt.format(["واحد", "اثنان"]), "واحد ਅਤੇ اثنان"); test.done(); }, @@ -154,7 +154,7 @@ module.exports.testlistfmt_pa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد, اثنان, ثلاثة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد, اثنان ਅਤੇ ثلاثة"); test.done(); }, @@ -165,7 +165,7 @@ module.exports.testlistfmt_pa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد, اثنان, ثلاثة, أربعة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد, اثنان, ثلاثة ਅਤੇ أربعة"); test.done(); }, @@ -189,7 +189,7 @@ module.exports.testlistfmt_pa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان"]), "واحد اثنان"); + test.equal(fmt.format(["واحد", "اثنان"]), "واحد, اثنان"); test.done(); }, @@ -201,7 +201,7 @@ module.exports.testlistfmt_pa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد اثنان ثلاثة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد, اثنان, ثلاثة"); test.done(); }, @@ -213,7 +213,7 @@ module.exports.testlistfmt_pa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد اثنان ثلاثة أربعة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد, اثنان, ثلاثة, أربعة"); test.done(); } }; diff --git a/js/test/strings-ext/testlistfmt_pt.js b/js/test/strings-ext/testlistfmt_pt.js index eae98f8e2c..9443d147ed 100644 --- a/js/test/strings-ext/testlistfmt_pt.js +++ b/js/test/strings-ext/testlistfmt_pt.js @@ -49,7 +49,7 @@ module.exports.testlistfmt_pt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["um", "dois"]), "um, dois"); + test.equal(fmt.format(["um", "dois"]), "um e dois"); test.done(); }, @@ -60,7 +60,7 @@ module.exports.testlistfmt_pt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["um", "dois", "três"]), "um, dois, três"); + test.equal(fmt.format(["um", "dois", "três"]), "um, dois e três"); test.done(); }, @@ -71,7 +71,7 @@ module.exports.testlistfmt_pt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["um", "dois", "três", "quatro"]), "um, dois, três, quatro"); + test.equal(fmt.format(["um", "dois", "três", "quatro"]), "um, dois, três e quatro"); test.done(); }, @@ -107,7 +107,7 @@ module.exports.testlistfmt_pt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["um", "dois"]), "um dois"); + test.equal(fmt.format(["um", "dois"]), "um e dois"); test.done(); }, @@ -119,7 +119,7 @@ module.exports.testlistfmt_pt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["um", "dois", "três"]), "um dois três"); + test.equal(fmt.format(["um", "dois", "três"]), "um, dois e três"); test.done(); }, @@ -131,7 +131,7 @@ module.exports.testlistfmt_pt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["um", "dois", "três", "quatro"]), "um dois três quatro"); + test.equal(fmt.format(["um", "dois", "três", "quatro"]), "um, dois, três e quatro"); test.done(); }, @@ -143,7 +143,7 @@ module.exports.testlistfmt_pt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["um", "dois", "três", "quatro", "cinco"]), "um dois três quatro cinco"); + test.equal(fmt.format(["um", "dois", "três", "quatro", "cinco"]), "um, dois, três, quatro e cinco"); test.done(); }, @@ -166,7 +166,7 @@ module.exports.testlistfmt_pt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["um", "dois"]), "um, dois"); + test.equal(fmt.format(["um", "dois"]), "um e dois"); test.done(); }, @@ -177,7 +177,7 @@ module.exports.testlistfmt_pt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["um", "dois", "três"]), "um, dois, três"); + test.equal(fmt.format(["um", "dois", "três"]), "um, dois e três"); test.done(); }, @@ -188,7 +188,7 @@ module.exports.testlistfmt_pt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["um", "dois", "três", "quatro"]), "um, dois, três, quatro"); + test.equal(fmt.format(["um", "dois", "três", "quatro"]), "um, dois, três e quatro"); test.done(); }, diff --git a/js/test/strings-ext/testlistfmt_ru.js b/js/test/strings-ext/testlistfmt_ru.js index b617be6905..c85e9749a8 100644 --- a/js/test/strings-ext/testlistfmt_ru.js +++ b/js/test/strings-ext/testlistfmt_ru.js @@ -50,7 +50,7 @@ module.exports.testlistfmt_ru = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["один", "два"]), "один, два"); + test.equal(fmt.format(["один", "два"]), "один и два"); test.done(); }, @@ -61,7 +61,7 @@ module.exports.testlistfmt_ru = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["один", "два", "три"]), "один, два, три"); + test.equal(fmt.format(["один", "два", "три"]), "один, два и три"); test.done(); }, @@ -72,7 +72,7 @@ module.exports.testlistfmt_ru = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["один", "два", "три", "четыре"]), "один, два, три, четыре"); + test.equal(fmt.format(["один", "два", "три", "четыре"]), "один, два, три и четыре"); test.done(); }, @@ -489,7 +489,7 @@ module.exports.testlistfmt_ru = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["один", "два"]), "один, два"); + test.equal(fmt.format(["один", "два"]), "один и два"); test.done(); }, @@ -500,7 +500,7 @@ module.exports.testlistfmt_ru = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["один", "два", "три"]), "один, два, три"); + test.equal(fmt.format(["один", "два", "три"]), "один, два и три"); test.done(); }, @@ -511,7 +511,7 @@ module.exports.testlistfmt_ru = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["один", "два", "три", "четыре"]), "один, два, три, четыре"); + test.equal(fmt.format(["один", "два", "три", "четыре"]), "один, два, три и четыре"); test.done(); }, testListFmtUnitStyleruUANumberFormatOne: function(test) { diff --git a/js/test/strings-ext/testlistfmt_sv.js b/js/test/strings-ext/testlistfmt_sv.js index 5fa85bb8c1..e5204d6760 100644 --- a/js/test/strings-ext/testlistfmt_sv.js +++ b/js/test/strings-ext/testlistfmt_sv.js @@ -96,7 +96,7 @@ module.exports.testlistfmt_bs = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ett", "två"]), "ett två"); + test.equal(fmt.format(["ett", "två"]), "ett, två"); test.done(); }, @@ -108,7 +108,7 @@ module.exports.testlistfmt_bs = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ett", "två", "tre"]), "ett två tre"); + test.equal(fmt.format(["ett", "två", "tre"]), "ett, två, tre"); test.done(); }, @@ -120,7 +120,7 @@ module.exports.testlistfmt_bs = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ett", "två", "tre", "fyra"]), "ett två tre fyra"); + test.equal(fmt.format(["ett", "två", "tre", "fyra"]), "ett, två, tre, fyra"); test.done(); }, testListFmtUnitStylesvFINumberFormatOneFull: function(test) { @@ -241,7 +241,7 @@ module.exports.testlistfmt_bs = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ett", "två"]), "ett två"); + test.equal(fmt.format(["ett", "två"]), "ett, två"); test.done(); }, @@ -253,7 +253,7 @@ module.exports.testlistfmt_bs = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ett", "två", "tre"]), "ett två tre"); + test.equal(fmt.format(["ett", "två", "tre"]), "ett, två, tre"); test.done(); }, @@ -265,7 +265,7 @@ module.exports.testlistfmt_bs = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ett", "två", "tre", "fyra"]), "ett två tre fyra"); + test.equal(fmt.format(["ett", "två", "tre", "fyra"]), "ett, två, tre, fyra"); test.done(); }, testListFmtUnitStylesvSENumberFormatOneMedium: function(test) { diff --git a/js/test/strings-ext/testlistfmt_ta_IN.js b/js/test/strings-ext/testlistfmt_ta_IN.js index 21f896d2a4..70b7126218 100644 --- a/js/test/strings-ext/testlistfmt_ta_IN.js +++ b/js/test/strings-ext/testlistfmt_ta_IN.js @@ -96,7 +96,7 @@ module.exports.testlistfmt_ta_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ஒரு", "இரண்டு"]), "ஒரு இரண்டு"); + test.equal(fmt.format(["ஒரு", "இரண்டு"]), "ஒரு மற்றும் இரண்டு"); test.done(); }, @@ -108,7 +108,7 @@ module.exports.testlistfmt_ta_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ஒரு", "இரண்டு", "மூன்று"]), "ஒரு இரண்டு மூன்று"); + test.equal(fmt.format(["ஒரு", "இரண்டு", "மூன்று"]), "ஒரு, இரண்டு மற்றும் மூன்று"); test.done(); }, @@ -120,7 +120,7 @@ module.exports.testlistfmt_ta_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ஒரு", "இரண்டு", "மூன்று", "நான்கு"]), "ஒரு இரண்டு மூன்று நான்கு"); + test.equal(fmt.format(["ஒரு", "இரண்டு", "மூன்று", "நான்கு"]), "ஒரு, இரண்டு, மூன்று மற்றும் நான்கு"); test.done(); }, testListFmtUnitStyletaINNumberFormatOneMedium: function(test) { diff --git a/js/test/strings-ext/testlistfmt_te_IN.js b/js/test/strings-ext/testlistfmt_te_IN.js index dab9847554..59818232c9 100644 --- a/js/test/strings-ext/testlistfmt_te_IN.js +++ b/js/test/strings-ext/testlistfmt_te_IN.js @@ -51,7 +51,7 @@ module.exports.testlistfmt_te_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ఒకటి", "రెండు"]), "ఒకటి, రెండు"); + test.equal(fmt.format(["ఒకటి", "రెండు"]), "ఒకటి మరియు రెండు"); test.done(); }, @@ -62,7 +62,7 @@ module.exports.testlistfmt_te_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ఒకటి", "రెండు", "మూడు"]), "ఒకటి, రెండు, మూడు"); + test.equal(fmt.format(["ఒకటి", "రెండు", "మూడు"]), "ఒకటి, రెండు మరియు మూడు"); test.done(); }, @@ -73,7 +73,7 @@ module.exports.testlistfmt_te_IN = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ఒకటి", "రెండు", "మూడు", "నాలుగు"]), "ఒకటి, రెండు, మూడు, నాలుగు"); + test.equal(fmt.format(["ఒకటి", "రెండు", "మూడు", "నాలుగు"]), "ఒకటి, రెండు, మూడు మరియు నాలుగు"); test.done(); }, testListFmtUnitStyleteINNumberFormatOne: function(test) { diff --git a/js/test/strings-ext/testlistfmt_th_TH.js b/js/test/strings-ext/testlistfmt_th_TH.js index f44cc52aed..0972b81277 100644 --- a/js/test/strings-ext/testlistfmt_th_TH.js +++ b/js/test/strings-ext/testlistfmt_th_TH.js @@ -108,7 +108,7 @@ module.exports.testlistfmt_th_TH = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["หนึ่ง", "สอง", "สาม"]), "หนึ่ง สอง สาม"); + test.equal(fmt.format(["หนึ่ง", "สอง", "สาม"]), "หนึ่ง สอง และ สาม"); test.done(); }, @@ -120,7 +120,7 @@ module.exports.testlistfmt_th_TH = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["หนึ่ง", "สอง", "สาม", "สี่"]), "หนึ่ง สอง สาม สี่"); + test.equal(fmt.format(["หนึ่ง", "สอง", "สาม", "สี่"]), "หนึ่ง สอง สาม และ สี่"); test.done(); }, testListFmtUnitStylethTHNumberFormatOneMedium: function(test) { diff --git a/js/test/strings-ext/testlistfmt_tr.js b/js/test/strings-ext/testlistfmt_tr.js index c0c9c6d4ff..acbe51a441 100644 --- a/js/test/strings-ext/testlistfmt_tr.js +++ b/js/test/strings-ext/testlistfmt_tr.js @@ -51,7 +51,7 @@ module.exports.testlistfmt_tr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "два"]), "bir, два"); + test.equal(fmt.format(["bir", "два"]), "bir ve два"); test.done(); }, @@ -62,7 +62,7 @@ module.exports.testlistfmt_tr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "два", "три"]), "bir, два, три"); + test.equal(fmt.format(["bir", "два", "три"]), "bir, два ve три"); test.done(); }, @@ -73,7 +73,7 @@ module.exports.testlistfmt_tr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "два", "три", "четыре"]), "bir, два, три, четыре"); + test.equal(fmt.format(["bir", "два", "три", "четыре"]), "bir, два, три ve четыре"); test.done(); }, diff --git a/js/test/strings-ext/testlistfmt_uk_UA.js b/js/test/strings-ext/testlistfmt_uk_UA.js index 9243ef9007..09bbd608f7 100644 --- a/js/test/strings-ext/testlistfmt_uk_UA.js +++ b/js/test/strings-ext/testlistfmt_uk_UA.js @@ -51,7 +51,7 @@ module.exports.testlistfmt_uk_UA = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Один", "Два"]), "Один, Два"); + test.equal(fmt.format(["Один", "Два"]), "Один і Два"); test.done(); }, @@ -62,7 +62,7 @@ module.exports.testlistfmt_uk_UA = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Один", "Два", "Три"]), "Один, Два, Три"); + test.equal(fmt.format(["Один", "Два", "Три"]), "Один, Два і Три"); test.done(); }, @@ -73,7 +73,7 @@ module.exports.testlistfmt_uk_UA = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["Один", "Два", "Три", "Чотири"]), "Один, Два, Три, Чотири"); + test.equal(fmt.format(["Один", "Два", "Три", "Чотири"]), "Один, Два, Три і Чотири"); test.done(); }, testListFmtUnitStyleukUANumberFormatOne: function(test) { diff --git a/js/test/strings-ext/testlistfmt_ur.js b/js/test/strings-ext/testlistfmt_ur.js index 14085e3b39..d4053e2bca 100644 --- a/js/test/strings-ext/testlistfmt_ur.js +++ b/js/test/strings-ext/testlistfmt_ur.js @@ -51,7 +51,7 @@ module.exports.testlistfmt_ur = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ایک کو", "دو"]), "ایک کو، دو"); + test.equal(fmt.format(["ایک کو", "دو"]), "ایک کو اور دو"); test.done(); }, @@ -62,7 +62,7 @@ module.exports.testlistfmt_ur = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ایک کو", "دو", "تین"]), "ایک کو، دو، تین"); + test.equal(fmt.format(["ایک کو", "دو", "تین"]), "ایک کو، دو، اور تین"); test.done(); }, @@ -73,7 +73,7 @@ module.exports.testlistfmt_ur = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ایک کو", "دو", "تین", "چار"]), "ایک کو، دو، تین، چار"); + test.equal(fmt.format(["ایک کو", "دو", "تین", "چار"]), "ایک کو، دو، تین، اور چار"); test.done(); }, testListFmtUnitStyleurArabPKNumberFormatOne: function(test) { @@ -197,7 +197,7 @@ module.exports.testlistfmt_ur = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ایک کو", "دو"]), "ایک کو، دو"); + test.equal(fmt.format(["ایک کو", "دو"]), "ایک کو اور دو"); test.done(); }, @@ -208,7 +208,7 @@ module.exports.testlistfmt_ur = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ایک کو", "دو", "تین"]), "ایک کو، دو، تین"); + test.equal(fmt.format(["ایک کو", "دو", "تین"]), "ایک کو، دو، اور تین"); test.done(); }, @@ -219,7 +219,7 @@ module.exports.testlistfmt_ur = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ایک کو", "دو", "تین", "چار"]), "ایک کو، دو، تین، چار"); + test.equal(fmt.format(["ایک کو", "دو", "تین", "چار"]), "ایک کو، دو، تین، اور چار"); test.done(); }, testListFmtUnitStyleurArabINNumberFormatOne: function(test) { @@ -242,7 +242,7 @@ module.exports.testlistfmt_ur = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ایک کو", "دو"]), "دو ایک کو"); + test.equal(fmt.format(["ایک کو", "دو"]), "دو، ایک کو"); test.done(); }, @@ -254,7 +254,7 @@ module.exports.testlistfmt_ur = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ایک کو", "دو", "تین"]), "تین دو ایک کو"); + test.equal(fmt.format(["ایک کو", "دو", "تین"]), "ایک کو، تین، دو"); test.done(); }, @@ -266,7 +266,7 @@ module.exports.testlistfmt_ur = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["ایک کو", "دو", "تین", "چار"]), "چار تین دو ایک کو"); + test.equal(fmt.format(["ایک کو", "دو", "تین", "چار"]), "ایک کو، دو، چار، تین"); test.done(); }, testListFmtUnitStyleurArabINNumberFormatOneFull: function(test) { diff --git a/js/test/strings-ext/testlistfmt_zh.js b/js/test/strings-ext/testlistfmt_zh.js index 6b69bbd818..cf20247053 100644 --- a/js/test/strings-ext/testlistfmt_zh.js +++ b/js/test/strings-ext/testlistfmt_zh.js @@ -428,7 +428,7 @@ module.exports.testlistfmt_zh = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["一", "二"]), "一二"); + test.equal(fmt.format(["一", "二"]), "一 二"); test.done(); }, @@ -440,7 +440,7 @@ module.exports.testlistfmt_zh = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["一", "二", "三"]), "一二三"); + test.equal(fmt.format(["一", "二", "三"]), "一 二 三"); test.done(); }, @@ -452,7 +452,7 @@ module.exports.testlistfmt_zh = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["一", "二", "三", "四"]), "一二三四"); + test.equal(fmt.format(["一", "二", "三", "四"]), "一 二 三 四"); test.done(); }, @@ -824,7 +824,7 @@ module.exports.testlistfmt_zh = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["一", "二"]), "一二"); + test.equal(fmt.format(["一", "二"]), "一 二"); test.done(); }, @@ -836,7 +836,7 @@ module.exports.testlistfmt_zh = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["一", "二", "三"]), "一二三"); + test.equal(fmt.format(["一", "二", "三"]), "一 二 三"); test.done(); }, @@ -848,7 +848,7 @@ module.exports.testlistfmt_zh = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["一", "二", "三", "四"]), "一二三四"); + test.equal(fmt.format(["一", "二", "三", "四"]), "一 二 三 四"); test.done(); }, diff --git a/js/test/strings-ext/testlistfmtasync.js b/js/test/strings-ext/testlistfmtasync.js index e1174e8f41..4dc5d58ccb 100644 --- a/js/test/strings-ext/testlistfmtasync.js +++ b/js/test/strings-ext/testlistfmtasync.js @@ -43,7 +43,7 @@ module.exports.testlistfmtasync = { onLoad: function(fmt) { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["true", "false"]), "true, false"); + test.equal(fmt.format(["true", "false"]), "true & false"); test.done(); } }); @@ -56,7 +56,7 @@ module.exports.testlistfmtasync = { onLoad: function(fmt) { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["এক", "দুই", "তিন", "চার"]), "এক, দুই, তিন, চার"); + test.equal(fmt.format(["এক", "দুই", "তিন", "চার"]), "এক, দুই, তিন এবং চার"); test.done(); } }); From 29ad50252cbb5a14474458c67d9d6acafc852c08 Mon Sep 17 00:00:00 2001 From: Goun Lee Date: Tue, 17 Mar 2020 18:17:08 +0900 Subject: [PATCH 08/14] Fixed fail test cases in units due to the listformatting change --- js/test/units/testunitfmt.js | 6 ++--- js/test/units/testunitfmt_usages.js | 38 ++++++++++++++--------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/js/test/units/testunitfmt.js b/js/test/units/testunitfmt.js index 3c7ca125a1..3f38814d2b 100644 --- a/js/test/units/testunitfmt.js +++ b/js/test/units/testunitfmt.js @@ -2610,7 +2610,7 @@ module.exports.testunitfmt = { maxFractionDigits: 4 }); var str = uf.format(m1); - test.equal(str, "6 feet 2.4 inches"); + test.equal(str, "6 feet, 2.4 inches"); test.done(); }, @@ -2648,7 +2648,7 @@ module.exports.testunitfmt = { maxFractionDigits: 4 }); var str = uf.format(m1); - test.equal(str, "6 ft 2.4 in"); + test.equal(str, "6 ft, 2.4 in"); test.done(); }, @@ -2666,7 +2666,7 @@ module.exports.testunitfmt = { locale: "en-US" }); var str = uf.format(m1); - test.equal(str, "1 gallon 1 cup 7 fluid ounces"); + test.equal(str, "1 gallon, 1 cup, 7 fluid ounces"); test.done(); }, diff --git a/js/test/units/testunitfmt_usages.js b/js/test/units/testunitfmt_usages.js index 83502e60d6..ef3ecb1646 100644 --- a/js/test/units/testunitfmt_usages.js +++ b/js/test/units/testunitfmt_usages.js @@ -47,7 +47,7 @@ module.exports.testunitfmt_usages = { locale: "en-US" }); var str = uf.format(m1); - test.equal(str, "6 ft 2 in"); + test.equal(str, "6 ft, 2 in"); test.done(); }, @@ -64,7 +64,7 @@ module.exports.testunitfmt_usages = { locale: "en-US" }); var str = uf.format(m1); - test.equal(str, "6 ft 2 in"); + test.equal(str, "6 ft, 2 in"); test.done(); }, @@ -81,7 +81,7 @@ module.exports.testunitfmt_usages = { locale: "en-US" }); var str = uf.format(m1); - test.equal(str, "6 ft 2 in"); + test.equal(str, "6 ft, 2 in"); test.done(); }, @@ -895,7 +895,7 @@ module.exports.testunitfmt_usages = { length: "long" }); var str = uf.format(m1); - test.equal(str, "6 pounds 4 ounces"); + test.equal(str, "6 pounds, 4 ounces"); test.done(); }, @@ -911,7 +911,7 @@ module.exports.testunitfmt_usages = { length: "long" }); var str = uf.format(m1); - test.equal(str, "7 pounds 1 ounce"); + test.equal(str, "7 pounds, 1 ounce"); test.done(); }, @@ -943,7 +943,7 @@ module.exports.testunitfmt_usages = { length: "short" }); var str = uf.format(m1); - test.equal(str, "6 lb 4 oz"); + test.equal(str, "6 lb, 4 oz"); test.done(); }, @@ -1555,7 +1555,7 @@ module.exports.testunitfmt_usages = { length: "long" }); var str = uf.format(m1); - test.equal(str, "1 tablespoon 0.2 teaspoons"); + test.equal(str, "1 tablespoon, 0.2 teaspoons"); test.done(); }, @@ -1603,7 +1603,7 @@ module.exports.testunitfmt_usages = { length: "long" }); var str = uf.format(m1); - test.equal(str, "1 pint 1 fluid ounce 1 tablespoon"); + test.equal(str, "1 pint, 1 fluid ounce, 1 tablespoon"); test.done(); }, @@ -1620,7 +1620,7 @@ module.exports.testunitfmt_usages = { measurementSystem: "metric" }); var str = uf.format(m1); - test.equal(str, "1 liter 234 milliliters"); + test.equal(str, "1 liter, 234 milliliters"); test.done(); }, @@ -1654,7 +1654,7 @@ module.exports.testunitfmt_usages = { locale: "en-GB" }); var str = uf.format(m1); - test.equal(str, "1 imperial tablespoon 0.2 imperial teaspoons"); + test.equal(str, "1 imperial tablespoon, 0.2 imperial teaspoons"); test.done(); }, @@ -1688,7 +1688,7 @@ module.exports.testunitfmt_usages = { locale: "en-GB" }); var str = uf.format(m1); - test.equal(str, "6 oz(i) 1.2 tsp(i)"); + test.equal(str, "6 oz(i), 1.2 tsp(i)"); test.done(); }, @@ -1705,7 +1705,7 @@ module.exports.testunitfmt_usages = { length: "long" }); var str = uf.format(m1); - test.equal(str, "1 pint 5 fluid ounces 0.1 teaspoons"); + test.equal(str, "1 pint, 5 fluid ounces, 0.1 teaspoons"); test.done(); }, @@ -1722,7 +1722,7 @@ module.exports.testunitfmt_usages = { locale: "en-GB" }); var str = uf.format(m1); - test.equal(str, "1 c(i) 2 oz(i) 2.4 tsp(i)"); + test.equal(str, "1 c(i), 2 oz(i), 2.4 tsp(i)"); test.done(); }, @@ -1772,7 +1772,7 @@ module.exports.testunitfmt_usages = { length: "long" }); var str = uf.format(m1); - test.equal(str, "1 tablespoon 0.2 teaspoons"); + test.equal(str, "1 tablespoon, 0.2 teaspoons"); test.done(); }, @@ -1820,7 +1820,7 @@ module.exports.testunitfmt_usages = { length: "long" }); var str = uf.format(m1); - test.equal(str, "2 cups 3 tablespoons"); + test.equal(str, "2 cups, 3 tablespoons"); test.done(); }, @@ -1837,7 +1837,7 @@ module.exports.testunitfmt_usages = { measurementSystem: "metric" }); var str = uf.format(m1); - test.equal(str, "1 liter 234 milliliters"); + test.equal(str, "1 liter, 234 milliliters"); test.done(); }, @@ -1871,7 +1871,7 @@ module.exports.testunitfmt_usages = { locale: "en-GB" }); var str = uf.format(m1); - test.equal(str, "1 imperial tablespoon 0.2 imperial teaspoons"); + test.equal(str, "1 imperial tablespoon, 0.2 imperial teaspoons"); test.done(); }, @@ -1922,7 +1922,7 @@ module.exports.testunitfmt_usages = { locale: "en-GB" }); var str = uf.format(m1); - test.equal(str, "2 imperial cups 3 imperial tablespoons"); + test.equal(str, "2 imperial cups, 3 imperial tablespoons"); test.done(); }, @@ -1939,7 +1939,7 @@ module.exports.testunitfmt_usages = { locale: "en-GB" }); var str = uf.format(m1); - test.equal(str, "1 c(i) 4 tbsp(i)"); + test.equal(str, "1 c(i), 4 tbsp(i)"); test.done(); }, From 6e7ea674f41c39a960abda7d80d4cad618d6b112 Mon Sep 17 00:00:00 2001 From: Goun Lee Date: Wed, 18 Mar 2020 10:28:46 +0900 Subject: [PATCH 09/14] Fixed test cases to use correct words in an example. --- js/test/strings-ext/testlistfmt.js | 26 +++++++++++++------------- js/test/strings-ext/testlistfmt_hr.js | 20 ++++++++++---------- js/test/strings-ext/testlistfmt_sv.js | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/js/test/strings-ext/testlistfmt.js b/js/test/strings-ext/testlistfmt.js index b45eff1fa1..97e3ab853f 100644 --- a/js/test/strings-ext/testlistfmt.js +++ b/js/test/strings-ext/testlistfmt.js @@ -2790,7 +2790,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["một", "hai", "ba"]), "một, hai và ba"); + test.equal(fmt.format(["một", "hai", "số ba"]), "một, hai và số ba"); test.done(); }, @@ -2801,7 +2801,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["một", "hai", "ba", "bốn"]), "một, hai, ba và bốn"); + test.equal(fmt.format(["một", "hai", "số ba", "bốn"]), "một, hai, số ba và bốn"); test.done(); }, @@ -2813,7 +2813,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir"]), "bir"); + test.equal(fmt.format(["một"]), "một"); test.done(); }, @@ -2825,7 +2825,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "два"]), "bir và два"); + test.equal(fmt.format(["một", "hai"]), "một và hai"); test.done(); }, @@ -2837,7 +2837,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "два", "три"]), "bir, два và три"); + test.equal(fmt.format(["một", "hai", "số ba"]), "một, hai và số ba"); test.done(); }, @@ -2849,7 +2849,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "два", "три", "четыре"]), "bir, два, три và четыре"); + test.equal(fmt.format(["một", "hai", "số ba", "bốn"]), "một, hai, số ba và bốn"); test.done(); }, @@ -2861,7 +2861,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "два", "три", "четыре", "пять"]), "bir, два, три, четыре và пять"); + test.equal(fmt.format(["một", "hai", "số ba", "bốn", "số năm"]), "một, hai, số ba, bốn và số năm"); test.done(); }, @@ -2874,7 +2874,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir"]), "bir"); + test.equal(fmt.format(["một"]), "một"); test.done(); }, @@ -2887,7 +2887,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "два"]), "bir và два"); + test.equal(fmt.format(["một", "hai"]), "một và hai"); test.done(); }, @@ -2900,7 +2900,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "два", "три"]), "bir, два và три"); + test.equal(fmt.format(["một", "hai", "số ba"]), "một, hai và số ba"); test.done(); }, @@ -2913,7 +2913,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "два", "три", "четыре"]), "bir, два, три và четыре"); + test.equal(fmt.format(["một", "hai", "số ba", "bốn"]), "một, hai, số ba và bốn"); test.done(); }, @@ -2926,7 +2926,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "два", "три", "четыре", "пять"]), "bir, два, три, четыре và пять"); + test.equal(fmt.format(["một", "hai", "số ba", "bốn", "số năm"]), "một, hai, số ba, bốn và số năm"); test.done(); }, testListFmtUnitStyleviVNNumberFormatFiveFullDisjunction: function(test) { @@ -2937,7 +2937,7 @@ module.exports.testlistfmt = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["bir", "два", "три", "четыре", "пять"]), "bir, два, три, четыре hoặc пять"); + test.equal(fmt.format(["một", "hai", "số ba", "bốn", "số năm"]), "một, hai, số ba, bốn hoặc số năm"); test.done(); } }; \ No newline at end of file diff --git a/js/test/strings-ext/testlistfmt_hr.js b/js/test/strings-ext/testlistfmt_hr.js index b525626ffd..fd95ba2893 100644 --- a/js/test/strings-ext/testlistfmt_hr.js +++ b/js/test/strings-ext/testlistfmt_hr.js @@ -61,7 +61,7 @@ module.exports.testlistfmt_hr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["jedan", "dva", "три"]), "jedan, dva i три"); + test.equal(fmt.format(["jedan", "dva", "tri"]), "jedan, dva i tri"); test.done(); }, @@ -108,7 +108,7 @@ module.exports.testlistfmt_hr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["jedan", "dva", "три"]), "jedan, dva i три"); + test.equal(fmt.format(["jedan", "dva", "tri"]), "jedan, dva i tri"); test.done(); }, @@ -132,7 +132,7 @@ module.exports.testlistfmt_hr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["jedan", "dva", "три", "četiri", "пять"]), "jedan, dva, три, četiri i пять"); + test.equal(fmt.format(["jedan", "dva", "три", "četiri", "pet"]), "jedan, dva, три, četiri i pet"); test.done(); }, @@ -167,7 +167,7 @@ module.exports.testlistfmt_hr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["jedan", "dva", "три"]), "jedan, dva i три"); + test.equal(fmt.format(["jedan", "dva", "tri"]), "jedan, dva i tri"); test.done(); }, @@ -214,7 +214,7 @@ module.exports.testlistfmt_hr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["jedan", "dva", "три"]), "jedan, dva i три"); + test.equal(fmt.format(["jedan", "dva", "tri"]), "jedan, dva i tri"); test.done(); }, @@ -226,7 +226,7 @@ module.exports.testlistfmt_hr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["jedan", "dva", "три", "četiri"]), "jedan, dva, три i četiri"); + test.equal(fmt.format(["jedan", "dva", "tri", "četiri"]), "jedan, dva, tri i četiri"); test.done(); }, @@ -238,7 +238,7 @@ module.exports.testlistfmt_hr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["jedan", "dva", "три", "četiri", "пять"]), "jedan, dva, три, četiri i пять"); + test.equal(fmt.format(["jedan", "dva", "три", "četiri", "pet"]), "jedan, dva, три, četiri i pet"); test.done(); }, @@ -277,7 +277,7 @@ module.exports.testlistfmt_hr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["jedan", "dva", "три"]), "jedan, dva i три"); + test.equal(fmt.format(["jedan", "dva", "tri"]), "jedan, dva i tri"); test.done(); }, @@ -290,7 +290,7 @@ module.exports.testlistfmt_hr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["jedan", "dva", "три", "četiri"]), "jedan, dva, три i četiri"); + test.equal(fmt.format(["jedan", "dva", "tri", "četiri"]), "jedan, dva, tri i četiri"); test.done(); }, @@ -303,7 +303,7 @@ module.exports.testlistfmt_hr = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["jedan", "dva", "три", "četiri", "пять"]), "jedan, dva, три, četiri i пять"); + test.equal(fmt.format(["jedan", "dva", "tri", "četiri", "pet"]), "jedan, dva, tri, četiri i pet"); test.done(); } }; diff --git a/js/test/strings-ext/testlistfmt_sv.js b/js/test/strings-ext/testlistfmt_sv.js index e5204d6760..006f4ba842 100644 --- a/js/test/strings-ext/testlistfmt_sv.js +++ b/js/test/strings-ext/testlistfmt_sv.js @@ -25,7 +25,7 @@ if (typeof(ilib) === "undefined") { var ilib = require("../../lib/ilib.js"); } -module.exports.testlistfmt_bs = { +module.exports.testlistfmt_sv = { setUp: function(callback) { ilib.clearCache(); callback(); From c171084546c9677c3e024cb84b6fdaa14ef2f34e Mon Sep 17 00:00:00 2001 From: Goun Lee Date: Thu, 19 Mar 2020 14:28:39 +0900 Subject: [PATCH 10/14] Update genlist.js tool code as all data have 4 length style. Fixed test cases to have correct expected value in punjabi language --- js/test/strings-ext/testlistfmt_pa.js | 6 +- tools/cldr/genlist.js | 89 ++++++++++++--------------- 2 files changed, 42 insertions(+), 53 deletions(-) diff --git a/js/test/strings-ext/testlistfmt_pa.js b/js/test/strings-ext/testlistfmt_pa.js index 8ed485cedf..63325b4e47 100644 --- a/js/test/strings-ext/testlistfmt_pa.js +++ b/js/test/strings-ext/testlistfmt_pa.js @@ -143,7 +143,7 @@ module.exports.testlistfmt_pa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان"]), "واحد ਅਤੇ اثنان"); + test.equal(fmt.format(["واحد", "اثنان"]), "واحد, اثنان"); test.done(); }, @@ -154,7 +154,7 @@ module.exports.testlistfmt_pa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد, اثنان ਅਤੇ ثلاثة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة"]), "واحد, اثنان, ثلاثة"); test.done(); }, @@ -165,7 +165,7 @@ module.exports.testlistfmt_pa = { test.expect(2); test.ok(fmt !== null); - test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد, اثنان, ثلاثة ਅਤੇ أربعة"); + test.equal(fmt.format(["واحد", "اثنان", "ثلاثة", "أربعة"]), "واحد, اثنان, ثلاثة, أربعة"); test.done(); }, diff --git a/tools/cldr/genlist.js b/tools/cldr/genlist.js index bb9a52310a..60ca1d741c 100644 --- a/tools/cldr/genlist.js +++ b/tools/cldr/genlist.js @@ -1,7 +1,7 @@ /* * genlist.js - ilib tool to generate the ilib format list data from cldr * - * Copyright © 2017-2019, JEDLSoft + * Copyright © 2017-2020, JEDLSoft * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,7 +52,7 @@ process.argv.forEach(function (val, index, array) { toDir = process.argv[2] || "tmp"; console.log("genlist - generate list formatter data.\n" + - "Copyright (c) 2017-2018 JEDLSoft\n"); + "Copyright (c) 2017-2020 JEDLSoft\n"); console.log("output dir: " + toDir); @@ -83,62 +83,51 @@ locales.forEach(function(locale) { }; if (cldrPatterns["listPattern-type-standard"]) { - if (comparePatterns(cldrPatterns["listPattern-type-standard-short"], cldrPatterns["listPattern-type-standard"]) || - comparePatterns(cldrPatterns["listPattern-type-standard-narrow"], cldrPatterns["listPattern-type-standard"])) { - patterns.standard.short = cldrPatterns["listPattern-type-standard"]; - patterns.standard.medium = cldrPatterns["listPattern-type-standard"]; - patterns.standard.long = cldrPatterns["listPattern-type-standard"]; - patterns.standard.full = cldrPatterns["listPattern-type-standard"]; - if (cldrPatterns["listPattern-type-standard-short"]) { - patterns.standard.short = cldrPatterns["listPattern-type-standard-short"]; - patterns.standard.medium = cldrPatterns["listPattern-type-standard-short"]; - } - if (cldrPatterns["listPattern-type-standard-narrow"]) { - patterns.standard.short = cldrPatterns["listPattern-type-standard-narrow"]; - } - } else { - patterns.standard = cldrPatterns["listPattern-type-standard"]; + patterns.standard.short = cldrPatterns["listPattern-type-standard"]; + patterns.standard.medium = cldrPatterns["listPattern-type-standard"]; + patterns.standard.long = cldrPatterns["listPattern-type-standard"]; + patterns.standard.full = cldrPatterns["listPattern-type-standard"]; + + if (cldrPatterns["listPattern-type-standard-short"]) { + patterns.standard.short = cldrPatterns["listPattern-type-standard-short"]; + patterns.standard.medium = cldrPatterns["listPattern-type-standard-short"]; + } + + if (cldrPatterns["listPattern-type-standard-narrow"]) { + patterns.standard.short = cldrPatterns["listPattern-type-standard-narrow"]; } } if (cldrPatterns["listPattern-type-or"]) { - if (comparePatterns(cldrPatterns["listPattern-type-or-short"], cldrPatterns["listPattern-type-or"]) || - comparePatterns(cldrPatterns["listPattern-type-or-narrow"], cldrPatterns["listPattern-type-or"])) { - patterns.or = {}; - patterns.or.short = cldrPatterns["listPattern-type-or"]; - patterns.or.medium = cldrPatterns["listPattern-type-or"]; - patterns.or.long = cldrPatterns["listPattern-type-or"]; - patterns.or.full = cldrPatterns["listPattern-type-or"]; - if (cldrPatterns["listPattern-type-or-short"]) { - patterns.or.short = cldrPatterns["listPattern-type-or-short"]; - patterns.or.medium = cldrPatterns["listPattern-type-or-short"]; - } - if (cldrPatterns["listPattern-type-or-narrow"]) { - patterns.or.short = cldrPatterns["listPattern-type-or-narrow"]; - } - } else { - patterns.or = cldrPatterns["listPattern-type-or"]; + patterns.or = {}; + patterns.or.short = cldrPatterns["listPattern-type-or"]; + patterns.or.medium = cldrPatterns["listPattern-type-or"]; + patterns.or.long = cldrPatterns["listPattern-type-or"]; + patterns.or.full = cldrPatterns["listPattern-type-or"]; + + if (cldrPatterns["listPattern-type-or-short"]) { + patterns.or.short = cldrPatterns["listPattern-type-or-short"]; + patterns.or.medium = cldrPatterns["listPattern-type-or-short"]; + } + + if (cldrPatterns["listPattern-type-or-narrow"]) { + patterns.or.short = cldrPatterns["listPattern-type-or-narrow"]; } } if (cldrPatterns["listPattern-type-unit"]) { - if (comparePatterns(cldrPatterns["listPattern-type-unit-short"], cldrPatterns["listPattern-type-unit"]) || - comparePatterns(cldrPatterns["listPattern-type-unit-narrow"], cldrPatterns["listPattern-type-unit"])) { - patterns.unit = {}; - patterns.unit.short = cldrPatterns["listPattern-type-unit"]; - patterns.unit.medium = cldrPatterns["listPattern-type-unit"]; - patterns.unit.long = cldrPatterns["listPattern-type-unit"]; - patterns.unit.full = cldrPatterns["listPattern-type-unit"]; - - if (cldrPatterns["listPattern-type-unit-short"]) { - patterns.unit.short = cldrPatterns["listPattern-type-unit-short"]; - patterns.unit.medium = cldrPatterns["listPattern-type-unit-short"]; - } - if (cldrPatterns["listPattern-type-unit-narrow"]) { - patterns.unit.short = cldrPatterns["listPattern-type-unit-narrow"]; - } - } else { - patterns.unit = cldrPatterns["listPattern-type-unit"]; + patterns.unit = {}; + patterns.unit.short = cldrPatterns["listPattern-type-unit"]; + patterns.unit.medium = cldrPatterns["listPattern-type-unit"]; + patterns.unit.long = cldrPatterns["listPattern-type-unit"]; + patterns.unit.full = cldrPatterns["listPattern-type-unit"]; + + if (cldrPatterns["listPattern-type-unit-short"]) { + patterns.unit.short = cldrPatterns["listPattern-type-unit-short"]; + patterns.unit.medium = cldrPatterns["listPattern-type-unit-short"]; + } + if (cldrPatterns["listPattern-type-unit-narrow"]) { + patterns.unit.short = cldrPatterns["listPattern-type-unit-narrow"]; } } From f10156beda23340dfde387f191ed5ebdcb1870f2 Mon Sep 17 00:00:00 2001 From: Goun Lee Date: Fri, 20 Mar 2020 10:34:43 +0900 Subject: [PATCH 11/14] Updated ReleaseNotes and Updated the copyright year for modified files --- docs/ReleaseNotes.md | 4 ++++ js/build.xml | 2 +- js/lib/ListFmt.js | 2 +- js/test/strings-ext/testlistfmt.js | 2 +- js/test/strings-ext/testlistfmt_am_ET.js | 2 +- js/test/strings-ext/testlistfmt_ar.js | 2 +- js/test/strings-ext/testlistfmt_el.js | 2 +- js/test/strings-ext/testlistfmt_en.js | 2 +- js/test/strings-ext/testlistfmt_es.js | 2 +- js/test/strings-ext/testlistfmt_fa.js | 2 +- js/test/strings-ext/testlistfmt_fr.js | 2 +- js/test/strings-ext/testlistfmt_gu_IN.js | 2 +- js/test/strings-ext/testlistfmt_he_IL.js | 2 +- js/test/strings-ext/testlistfmt_hi_IN.js | 2 +- js/test/strings-ext/testlistfmt_hr.js | 2 +- js/test/strings-ext/testlistfmt_it.js | 2 +- js/test/strings-ext/testlistfmt_ja_JP.js | 2 +- js/test/strings-ext/testlistfmt_kn_IN.js | 2 +- js/test/strings-ext/testlistfmt_ml_IN.js | 2 +- js/test/strings-ext/testlistfmt_mr_IN.js | 2 +- js/test/strings-ext/testlistfmt_ms.js | 2 +- js/test/strings-ext/testlistfmt_pa.js | 2 +- js/test/strings-ext/testlistfmt_pt.js | 2 +- js/test/strings-ext/testlistfmt_ru.js | 2 +- js/test/strings-ext/testlistfmt_sv.js | 2 +- js/test/strings-ext/testlistfmt_ta_IN.js | 2 +- js/test/strings-ext/testlistfmt_te_IN.js | 2 +- js/test/strings-ext/testlistfmt_th_TH.js | 2 +- js/test/strings-ext/testlistfmt_tr.js | 2 +- js/test/strings-ext/testlistfmt_uk_UA.js | 2 +- js/test/strings-ext/testlistfmt_ur.js | 2 +- js/test/strings-ext/testlistfmt_zh.js | 2 +- js/test/strings-ext/testlistfmtasync.js | 2 +- 33 files changed, 36 insertions(+), 32 deletions(-) diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md index 814a141405..7a4b1f6314 100644 --- a/docs/ReleaseNotes.md +++ b/docs/ReleaseNotes.md @@ -14,6 +14,10 @@ New Features: * updated methods are: getDisplayName, getOffset, getOffsetStr, getOffsetMillis, and inDaylightTime +Bug Fixes: +* Changed a default length style to `medium` in List Formatting. + + Build 008 ------- Published as version 14.5.0 diff --git a/js/build.xml b/js/build.xml index 8a4e7868ad..f6acc29d1c 100644 --- a/js/build.xml +++ b/js/build.xml @@ -1,7 +1,7 @@