Fix an bad test and improve error messaging

Author: jdesrosiers

src/test-suite/tests/allOf.json

@@ -26,12 +26,12 @@
     {
       "description": "allOf pass",
       "schema": {
-        "oneOf": [
-          { "type": "string" },
+        "allOf": [
+          { "type": "number" },
           { "minimum": 3 }
         ]
       },
-      "instance": 42,
+      "instance": 5,
       "errors": []
     }
   ]

src/translations/en-US.ftl

@@ -1,49 +1,49 @@
 // Any type keywords
 boolean-schema-message = A value is not allowed here
 type-message = Expected a {$expectedTypes}
-const-message = Expected {$expected}
-enum-message = Expected {$expected}
+const-message = Expected exactly {$expected}
+enum-message = Expected one of {$expected}
 format-message = Expected a value matching the '{$format}' format
-unknown-message = Failed the '{$keyword}' keyword
+unknown-message = Validation failed for '{$keyword}'
 
 // Number keywords
 exclusiveMaximum-message = Expected a number less than {$exclusiveMaximum}
 exclusiveMinimum-message = Expected a number greater than {$exclusiveMinimum}
-maximum-message = Expected a number less than {$maximum}
-minimum-message = Expected a number greater than {$minimum}
+maximum-message = Expected a number less than or equal to {$maximum}
+minimum-message = Expected a number greater than or equal to {$minimum}
 multipleOf-message = Expected a number that is a multiple of {$multipleOf}
 
 // String keywords
-maxLength-message = Expected a string with at most {$maxLength} characters
+maxLength-message = Expected a string with no more than {$maxLength} characters
 minLength-message = Expected a string with at least {$minLength} characters
 pattern-message = Expected a string matching the regular expression /{$pattern}/
 
 // Array keywords
-maxItems-message = Expected an array with at most {$maxItems} items
+maxItems-message = Expected an array with no more than {$maxItems} items
 minItems-message = Expected an array with at least {$minItems} items
 contains-message = Expected an array that contains {$minContains ->
-  [1] at least one item that passes
- *[other] at least {$minContains} items that pass
+  [1] at least one item matching
+ *[other] at least {$minContains} items matching
 } the 'contains' schema
-contains-range-message = Expected an array that contains between {$minContains} and {$maxContains} items that pass the 'contains' schema
-contains-exact-message = Expected an array that contains {$minContains ->
-  [1] one item that passes
- *[other] {$minContains} items that pass
+contains-range-message = Expected an array containing between {$minContains} and {$maxContains} items matching the 'contains' schema
+contains-exact-message = Expected an array containing {$minContains ->
+  [1] exactly one item matching
+ *[other] exactly {$minContains} items matching
 } the 'contains' schema
-uniqueItems-message = Duplicated item
+uniqueItems-message = Array items must be unique
 
 // Object keywords
-maxProperties-message = Expected an object with at most {$maxProperties} properties
+maxProperties-message = Expected an object with no more than {$maxProperties} properties
 minProperties-message = Expected an object with at least {$minProperties} properties
-required-message = Required {$count ->
-  [one] property {$required} is
- *[other] properties {$required} are
-} missing
+required-message = Missing required {$count ->
+  [one] property: {$required}
+ *[other] properties: {$required}
+}
 
 // Applicators
-anyOf-message = Expected none of the alternatives match
-oneOf-message = {$matchCount ->
-  [0] None
-  *[other] More than one
-} of the alternatives match
+anyOf-message = Expected the value to match at least one alternative
+oneOf-message = Expected the value to match exactly one alternative, {$matchCount ->
+  [0] but none
+ *[other] but more than one
+} matched
 not-message = Expected a value that doesn't match the 'not' schema