Merge pull request #192 from iLib-js/disjunction

Support disjunction style in the list formatter

docs/ReleaseNotes.md

@@ -7,6 +7,8 @@ Published as version 14.3.0
 
 New Features:
 * Now uses webpack4 to package up all of the classes and data
+* Added style "disjunction" to the list formatter do you can now format lists with "or" as well:
+    * "One, Two, Three, or Four" vs. "One, Two, Three, and Four"
 
 Bug Fixes:
 * Updated to IANA time zone data version 2019a

js/data/locale/af/list.json

@@ -3,6 +3,10 @@
         "2": "{0} en {1}",
         "end": "{0} en {1}"
     },
+    "or": {
+        "2": "{0} of {1}",
+        "end": "{0} of {1}"
+    },
     "unit": {
         "2": "{0} en {1}",
         "end": "{0} en {1}"

js/data/locale/am/list.json

@@ -5,6 +5,12 @@
         "middle": "{0}፣ {1}",
         "end": "{0}, እና {1}"
     },
+    "or": {
+        "2": "{0} ወይም {1}",
+        "start": "{0}፣ {1}",
+        "middle": "{0}፣ {1}",
+        "end": "{0} ወይም {1}"
+    },
     "unit": {
         "short": {
             "2": "{0} {1}",

js/data/locale/ar/list.json

@@ -25,6 +25,12 @@
             "end": "{0}، و{1}"
         }
     },
+    "or": {
+        "2": "{0} أو {1}",
+        "start": "{0} و{1}",
+        "middle": "{0} و{1}",
+        "end": "{0} أو {1}"
+    },
     "unit": {
         "short": {
             "2": "{0}، {1}",

js/data/locale/as/list.json

@@ -0,0 +1,36 @@
+{
+    "standard": {
+        "2": "{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}"
+        }
+    }
+}

js/data/locale/ast/list.json

@@ -3,6 +3,10 @@
         "2": "{0} y {1}",
         "end": "{0} y {1}"
     },
+    "or": {
+        "2": "{0} o {1}",
+        "end": "{0} o {1}"
+    },
     "unit": {
         "2": "{0} y {1}",
         "end": "{0} y {1}"

js/data/locale/az/Cyrl/list.json

@@ -2,5 +2,9 @@
     "standard": {
         "2": "{0}, {1}",
         "end": "{0}, {1}"
+    },
+    "or": {
+        "2": "{0} or {1}",
+        "end": "{0}, or {1}"
     }
 }

js/data/locale/az/list.json

@@ -2,5 +2,9 @@
     "standard": {
         "2": "{0} və {1}",
         "end": "{0} və {1}"
+    },
+    "or": {
+        "2": "{0} yaxud {1}",
+        "end": "{0}, yaxud {1}"
     }
 }

js/data/locale/be/list.json

@@ -3,6 +3,10 @@
         "2": "{0} і {1}",
         "end": "{0} і {1}"
     },
+    "or": {
+        "2": "{0} ці {1}",
+        "end": "{0} ці {1}"
+    },
     "unit": {
         "2": "{0} {1}",
         "start": "{0} {1}",

js/data/locale/bg/list.json

@@ -25,6 +25,10 @@
             "end": "{0} и {1}"
         }
     },
+    "or": {
+        "2": "{0} или {1}",
+        "end": "{0} или {1}"
+    },
     "unit": {
         "short": {
             "2": "{0} и {1}",

js/data/locale/bn/list.json

@@ -2,5 +2,9 @@
     "standard": {
         "2": "{0} এবং {1}",
         "end": "{0} এবং {1}"
+    },
+    "or": {
+        "2": "{0} বা {1}",
+        "end": "{0}, বা {1}"
     }
 }

js/data/locale/br/list.json

@@ -0,0 +1,6 @@
+{
+    "or": {
+        "2": "{0} pe {1}",
+        "end": "{0}, pe {1}"
+    }
+}

js/data/locale/bs/Cyrl/list.json

@@ -3,6 +3,10 @@
         "2": "{0} и {1}",
         "end": "{0} и {1}"
     },
+    "or": {
+        "2": "{0} or {1}",
+        "end": "{0}, or {1}"
+    },
     "unit": {
         "2": "{0} и {1}",
         "end": "{0} и {1}"

js/data/locale/bs/list.json

@@ -3,6 +3,10 @@
         "2": "{0} i {1}",
         "end": "{0} i {1}"
     },
+    "or": {
+        "2": "{0} ili {1}",
+        "end": "{0} ili {1}"
+    },
     "unit": {
         "2": "{0} i {1}",
         "end": "{0} i {1}"

js/data/locale/ca/list.json

@@ -3,6 +3,10 @@
         "2": "{0} i {1}",
         "end": "{0} i {1}"
     },
+    "or": {
+        "2": "{0} o {1}",
+        "end": "{0} o {1}"
+    },
     "unit": {
         "2": "{0} i {1}",
         "end": "{0} i {1}"

js/data/locale/ccp/list.json

@@ -0,0 +1,6 @@
+{
+    "standard": {
+        "2": "{0} 𑄃𑄳𑄃 {1}",
+        "end": "{0} 𑄃𑄳𑄃 {1}"
+    }
+}

js/data/locale/chr/list.json

@@ -1,7 +1,11 @@
 {
     "standard": {
         "2": "{0} ᎠᎴ {1}",
-        "end": "{0} ᎠᎴ {1}"
+        "end": "{0}, ᎠᎴ {1}"
+    },
+    "or": {
+        "2": "{0} ᎠᎴᏱᎩ {1}",
+        "end": "{0}, ᎠᎴᏱᎩ {1}"
     },
     "unit": {
         "short": {

js/data/locale/cs/list.json

@@ -3,6 +3,10 @@
         "2": "{0} a {1}",
         "end": "{0} a {1}"
     },
+    "or": {
+        "2": "{0} nebo {1}",
+        "end": "{0} nebo {1}"
+    },
     "unit": {
         "short": {
             "2": "{0} {1}",

js/data/locale/cy/list.json

@@ -2,5 +2,9 @@
     "standard": {
         "2": "{0} a(c) {1}",
         "end": "{0}, a(c) {1}"
+    },
+    "or": {
+        "2": "{0} neu {1}",
+        "end": "{0} neu {1}"
     }
 }

js/data/locale/da/list.json

@@ -3,6 +3,10 @@
         "2": "{0} og {1}",
         "end": "{0} og {1}"
     },
+    "or": {
+        "2": "{0} eller {1}",
+        "end": "{0} eller {1}"
+    },
     "unit": {
         "2": "{0} og {1}",
         "end": "{0} og {1}"

js/data/locale/de/list.json

@@ -3,6 +3,10 @@
         "2": "{0} und {1}",
         "end": "{0} und {1}"
     },
+    "or": {
+        "2": "{0} oder {1}",
+        "end": "{0} oder {1}"
+    },
     "unit": {
         "end": "{0} und {1}"
     }

js/data/locale/el/list.json

@@ -3,6 +3,10 @@
         "2": "{0} και {1}",
         "end": "{0} και {1}"
     },
+    "or": {
+        "2": "{0} ή {1}",
+        "end": "{0} ή {1}"
+    },
     "unit": {
         "short": {
             "2": "{0} {1}",

js/data/locale/en/AU/list.json

@@ -1,5 +1,8 @@
 {
     "standard": {
         "end": "{0} and {1}"
+    },
+    "or": {
+        "end": "{0} or {1}"
     }
 }

js/data/locale/en/GB/list.json

@@ -1,5 +1,8 @@
 {
     "standard": {
         "end": "{0} and {1}"
+    },
+    "or": {
+        "end": "{0} or {1}"
     }
 }

js/data/locale/es/list.json

@@ -3,6 +3,10 @@
         "2": "{0} y {1}",
         "end": "{0} y {1}"
     },
+    "or": {
+        "2": "{0} o {1}",
+        "end": "{0} o {1}"
+    },
     "unit": {
         "short": {
             "2": "{0} {1}",

js/data/locale/et/list.json

@@ -3,6 +3,10 @@
         "2": "{0} ja {1}",
         "end": "{0} ja {1}"
     },
+    "or": {
+        "2": "{0} või {1}",
+        "end": "{0} või {1}"
+    },
     "unit": {
         "short": {
             "2": "{0} {1}",

js/data/locale/eu/list.json

@@ -3,6 +3,10 @@
         "2": "{0} eta {1}",
         "end": "{0} eta {1}"
     },
+    "or": {
+        "2": "{0} edo {1}",
+        "end": "{0} edo {1}"
+    },
     "unit": {
         "2": "{0} eta {1}",
         "end": "{0} eta {1}"

js/data/locale/fa/list.json

@@ -5,6 +5,12 @@
         "middle": "{0}،‏ {1}",
         "end": "{0}، و {1}"
     },
+    "or": {
+        "2": "{0} یا {1}",
+        "start": "{0}، {1}",
+        "middle": "{0}، {1}",
+        "end": "{0}، یا {1}"
+    },
     "unit": {
         "short": {
             "2": "{0} {1}",

js/data/locale/fi/list.json

@@ -3,6 +3,10 @@
         "2": "{0} ja {1}",
         "end": "{0} ja {1}"
     },
+    "or": {
+        "2": "{0} tai {1}",
+        "end": "{0} tai {1}"
+    },
     "unit": {
         "short": {
             "2": "{0} {1}",

js/data/locale/fil/list.json

@@ -3,6 +3,10 @@
         "2": "{0} at {1}",
         "end": "{0}, at {1}"
     },
+    "or": {
+        "2": "{0} o {1}",
+        "end": "{0}, o {1}"
+    },
     "unit": {
         "short": {
             "2": "{0} {1}",

js/data/locale/fo/list.json

@@ -3,6 +3,10 @@
         "2": "{0} og {1}",
         "end": "{0} og {1}"
     },
+    "or": {
+        "2": "{0} ella {1}",
+        "end": "{0}, ella {1}"
+    },
     "unit": {
         "short": {
             "2": "{0} {1}",

js/data/locale/fr/list.json

@@ -3,6 +3,10 @@
         "2": "{0} et {1}",
         "end": "{0} et {1}"
     },
+    "or": {
+        "2": "{0} ou {1}",
+        "end": "{0} ou {1}"
+    },
     "unit": {
         "short": {
             "2": "{0} {1}",

js/data/locale/ga/list.json

@@ -3,6 +3,10 @@
         "2": "{0} agus {1}",
         "end": "{0}, agus {1}"
     },
+    "or": {
+        "2": "{0} nó {1}",
+        "end": "{0}, nó {1}"
+    },
     "unit": {
         "short": {
             "2": "{0} {1}",