From 0edb9bccbd1066d8919b314c56956b58bfbdd1cc Mon Sep 17 00:00:00 2001
From: Marie Payne <116597610+mpayne-coveo@users.noreply.github.com>
Date: Thu, 16 Nov 2023 21:15:21 -0500
Subject: [PATCH] Escape single quotes in validation messages (#898)

---
 .../networknt/schema/JsonSchemaFactory.java   |  2 +-
 src/main/resources/jsv-messages.properties    | 10 +++---
 .../resources/jsv-messages_cs_CZ.properties   |  6 ++--
 .../resources/jsv-messages_da_DK.properties   | 10 +++---
 src/main/resources/jsv-messages_de.properties | 18 +++++-----
 .../resources/jsv-messages_fa_IR.properties   |  8 ++---
 .../resources/jsv-messages_fi_FI.properties   |  4 +--
 src/main/resources/jsv-messages_fr.properties | 32 ++++++++---------
 .../resources/jsv-messages_fr_CA.properties   | 26 +++++++-------
 .../resources/jsv-messages_he_IL.properties   | 10 +++---
 .../resources/jsv-messages_hr_HR.properties   | 10 +++---
 .../resources/jsv-messages_hu_HU.properties   |  2 +-
 .../resources/jsv-messages_ja_JP.properties   |  6 ++--
 .../resources/jsv-messages_ko_KR.properties   | 10 +++---
 .../resources/jsv-messages_nb_NO.properties   |  8 ++---
 .../resources/jsv-messages_nl_NL.properties   | 14 ++++----
 .../resources/jsv-messages_pl_PL.properties   | 10 +++---
 .../resources/jsv-messages_pt_BR.properties   | 10 +++---
 .../resources/jsv-messages_ru_RU.properties   |  2 +-
 .../resources/jsv-messages_sk_SK.properties   |  6 ++--
 .../resources/jsv-messages_sv_SE.properties   |  6 ++--
 .../resources/jsv-messages_th_TH.properties   | 10 +++---
 .../resources/jsv-messages_tr_TR.properties   | 14 ++++----
 .../resources/jsv-messages_uk_UA.properties   |  4 +--
 .../resources/jsv-messages_vi_VN.properties   | 10 +++---
 .../com/networknt/schema/Issue898Test.java    | 34 +++++++++++++++++++
 src/test/resources/data/issue898.json         |  4 +++
 src/test/resources/schema/issue898.json       | 17 ++++++++++
 28 files changed, 179 insertions(+), 124 deletions(-)
 create mode 100644 src/test/java/com/networknt/schema/Issue898Test.java
 create mode 100644 src/test/resources/data/issue898.json
 create mode 100644 src/test/resources/schema/issue898.json

diff --git a/src/main/java/com/networknt/schema/JsonSchemaFactory.java b/src/main/java/com/networknt/schema/JsonSchemaFactory.java
index 0f3a5ecd1..77ce452c6 100644
--- a/src/main/java/com/networknt/schema/JsonSchemaFactory.java
+++ b/src/main/java/com/networknt/schema/JsonSchemaFactory.java
@@ -48,7 +48,7 @@ public static class Builder {
         private final Map<String, URIFactory> uriFactoryMap = new HashMap<String, URIFactory>();
         private final Map<String, URIFetcher> uriFetcherMap = new HashMap<String, URIFetcher>();
         private URNFactory urnFactory;
-        private final Map<String, JsonMetaSchema> jsonMetaSchemas = new HashMap<String, JsonMetaSchema>();
+        private final ConcurrentMap<String, JsonMetaSchema> jsonMetaSchemas = new ConcurrentHashMap<String, JsonMetaSchema>();
         private final Map<String, String> uriMap = new HashMap<String, String>();
         private boolean enableUriSchemaCache = true;
         private final CompositeURITranslator uriTranslators = new CompositeURITranslator();
diff --git a/src/main/resources/jsv-messages.properties b/src/main/resources/jsv-messages.properties
index f180cb232..623e19f73 100644
--- a/src/main/resources/jsv-messages.properties
+++ b/src/main/resources/jsv-messages.properties
@@ -1,4 +1,4 @@
-$ref = {0}: has an error with 'refs'
+$ref = {0}: has an error with ''refs''
 additionalProperties = {0}.{1}: is not defined in the schema and the schema does not allow additional properties
 allOf = {0}: should be valid to all the schemas {1}
 anyOf = {0}: should be valid to any of the schemas {1}
@@ -6,12 +6,12 @@ const = {0}: must be a constant value {1}
 contains = {0}: does not contain an element that passes these validations: {2}
 contains.max = {0}: must contain fewer than {1} element(s) that passes these validations: {2}
 contains.min = {0}: must contain at least {1} element(s) that passes these validations: {2}
-crossEdits = {0}: has an error with 'cross edits'
+crossEdits = {0}: has an error with ''cross edits''
 dateTime = {0}: {1} is an invalid {2}
 dependencies = {0}: has an error with dependencies {1}
 dependentRequired = {0}: has a missing property "{1}" which is dependent required because "{2}" is present
 dependentSchemas = {0}: has an error with dependentSchemas {1}
-edits = {0}: has an error with 'edits'
+edits = {0}: has an error with ''edits''
 enum = {0}: does not have a value in the enumeration {1}
 exclusiveMaximum = {0}: must have an exclusive maximum value of {1}
 exclusiveMinimum = {0}: must have an exclusive minimum value of {1}
@@ -35,9 +35,9 @@ not = {0}: should not be valid to the schema {1}
 notAllowed = {0}.{1}: is not allowed but it is in the data
 oneOf = {0}: should be valid to one and only one schema, but {1} are valid
 pattern = {0}: does not match the regex pattern {1}
-patternProperties = {0}: has some error with 'pattern properties'
+patternProperties = {0}: has some error with ''pattern properties''
 prefixItems = {0}[{1}]: no validator found at this index
-properties = {0}: has an error with 'properties'
+properties = {0}: has an error with ''properties''
 propertyNames = Property name {0} is not valid for validation: {1}
 readOnly = {0}: is a readonly field, it cannot be changed
 required = {0}.{1}: is missing but it is required
diff --git a/src/main/resources/jsv-messages_cs_CZ.properties b/src/main/resources/jsv-messages_cs_CZ.properties
index 1da9e7b79..cf9855bba 100644
--- a/src/main/resources/jsv-messages_cs_CZ.properties
+++ b/src/main/resources/jsv-messages_cs_CZ.properties
@@ -1,4 +1,4 @@
-$ref = {0}: obsahuje chybu s 'refs'
+$ref = {0}: obsahuje chybu s ''refs''
 additionalProperties = {0}.{1}: nen� definov�no ve sch�matu a sch�ma neumo??uje dal?� vlastnosti
 allOf = {0}: m?lo by b�t platn� pro v?echna sch�mata {1}
 anyOf = {0}: m?lo by b�t platn� pro kter�koli ze sch�mat {1}
@@ -6,12 +6,12 @@ const = {0}: mus
 contains = {0}: neobsahuje prvek, kter� pro?el t?mito ov??en�mi: {2}
 contains.max = {0}: mus� obsahovat m�n? ne? {1} prvk?, kter� projdou t?mito ov??en�mi: {2}
 contains.min = {0}: mus� obsahovat alespo? {1} prvk?, kter� projdou t?mito ov??en�mi: {2}
-crossEdits = {0}: obsahuje chybu s 'cross edits'
+crossEdits = {0}: obsahuje chybu s ''cross edits''
 dateTime = {0}: {1} je neplatn� {2}
 dependencies = {0}: obsahuje chybu se z�vislostmi {1}
 dependentRequired = {0}: m� chyb?j�c� vlastnost "{1}", kter� je z�visl�, povinn�, proto?e "{2}" je p?�tomen
 dependentSchemas = {0}: obsahuje chybu s dependentSchemas {1}
-edits = {0}: obsahuje chybu s '�pravy'
+edits = {0}: obsahuje chybu s ''�pravy''
 enum = {0}: nem� hodnotu ve v�?tu {1}
 exclusiveMaximum = {0}: mus� m�t exkluzivn� maxim�ln� hodnotu {1}
 exclusiveMinimum = {0}: mus� m�t exkluzivn� minim�ln� hodnotu {1}
diff --git a/src/main/resources/jsv-messages_da_DK.properties b/src/main/resources/jsv-messages_da_DK.properties
index 4793f1f4a..c162bc0a2 100644
--- a/src/main/resources/jsv-messages_da_DK.properties
+++ b/src/main/resources/jsv-messages_da_DK.properties
@@ -1,4 +1,4 @@
-$ref = {0}: har en fejl med 'refs'
+$ref = {0}: har en fejl med ''refs''
 additionalProperties = {0}.{1}: er ikke defineret i skemaet, og skemaet tillader ikke yderligere egenskaber
 allOf = {0}: b�r v�re gyldig for alle skemaerne {1}
 anyOf = {0}: b�r v�re gyldig for et hvilket som helst af skemaerne {1}
@@ -6,12 +6,12 @@ const = {0}: skal v
 contains = {0}: indeholder ikke et element, der best�r disse valideringer: {2}
 contains.max = {0}: skal indeholde f�rre end {1} element(er), der best�r disse valideringer: {2}
 contains.min = {0}: skal indeholde mindst {1} element(er), der best�r disse valideringer: {2}
-crossEdits = {0}: har en fejl med 'krydsredigeringer'
+crossEdits = {0}: har en fejl med ''krydsredigeringer''
 dateTime = {0}: {1} er en ugyldig {2}
 dependencies = {0}: har en fejl med afh�ngigheder {1}
 dependentRequired = {0}: har en manglende egenskab "{1}", som er afh�ngig p�kr�vet, fordi "{2}" er til stede
 dependentSchemas = {0}: har en fejl med dependentSchemas {1}
-edits = {0}: har en fejl med 'redigeringer'
+edits = {0}: har en fejl med ''redigeringer''
 enum = {0}: har ikke en v�rdi i opregningen {1}
 exclusiveMaximum = {0}: skal have en eksklusiv maksimumv�rdi p� {1}
 exclusiveMinimum = {0}: skal have en eksklusiv minimumsv�rdi p� {1}
@@ -35,9 +35,9 @@ not = {0}: b
 notAllowed = {0}.{1}: er ikke tilladt, men det er i dataene
 oneOf = {0}: b�r v�re gyldig for �t og kun �t skema, men {1} er gyldige
 pattern = {0}: matcher ikke regex-m�nsteret {1}
-patternProperties = {0}: har en fejl med 'm�nsteregenskaber'
+patternProperties = {0}: har en fejl med ''m�nsteregenskaber''
 prefixItems = {0}[{1}]: ingen validator fundet i dette indeks
-properties = {0}: har en fejl med 'egenskaber'
+properties = {0}: har en fejl med ''egenskaber''
 propertyNames = Ejendomsnavnet {0} er ikke gyldigt til validering: {1}
 readOnly = {0}: er et skrivebeskyttet felt, det kan ikke �ndres
 required = {0}.{1}: mangler, men det er p�kr�vet
diff --git a/src/main/resources/jsv-messages_de.properties b/src/main/resources/jsv-messages_de.properties
index 4562a01a0..cad9df48a 100644
--- a/src/main/resources/jsv-messages_de.properties
+++ b/src/main/resources/jsv-messages_de.properties
@@ -1,19 +1,19 @@
-$ref = {0}: Ein Fehler mit 'refs' ist aufgetreten
-additionalProperties = {0}.{1} ist nicht im Schema definiert und das Schema verbietet 'additionalProperties'
+$ref = {0}: Ein Fehler mit ''refs'' ist aufgetreten
+additionalProperties = {0}.{1} ist nicht im Schema definiert und das Schema verbietet ''additionalProperties''
 allOf = {0} muss g�ltig f�r alle Schemata {1} sein
 anyOf = {0} muss g�ltig f�r mindestens ein Schema {1} sein
 const = {0} muss den konstanten Wert {1} annehmen
 contains = {0} beinhaltet kein Element, das diese Validierung besteht: {2}
-crossEdits = {0}: Ein Fehler mit 'cross edits' ist aufgetreten
+crossEdits = {0}: Ein Fehler mit ''cross edits'' ist aufgetreten
 dateTime = {0}: {1} ist ein ung�ltiges {2}
 dependencies = {0} hat einen Fehler mit Abh�ngigkeiten {1}
-dependentRequired = {0} fehlt eine Eigenschaft, welche 'dependentRequired' {1} ist
-dependentSchemas = {0}: Ein Fehler mit 'dependentSchemas' {1} ist aufgetreten
-edits = {0}: Ein Fehler mit 'edits' ist aufgetreten
+dependentRequired = {0} fehlt eine Eigenschaft, welche ''dependentRequired'' {1} ist
+dependentSchemas = {0}: Ein Fehler mit ''dependentSchemas'' {1} ist aufgetreten
+edits = {0}: Ein Fehler mit ''edits'' ist aufgetreten
 enum = {0}: Ein Wert in der Aufz�hlung {1} fehlt
 exclusiveMaximum = {0} muss gr��er sein als {1}
 exclusiveMinimum = {0} muss kleiner sein als {1}
-false = Das boolesche Schema 'false' ist ung�ltig
+false = Das boolesche Schema ''false'' ist ung�ltig
 format = {0} muss dem Format {1} entsprechen {2}
 id = {0}: {1} ist ein ung�ltiges Segment f�r die URI {2}
 items = {0}[{1}]: Kein Validator an diesem Index gefunden
@@ -30,8 +30,8 @@ not = {0} darf nicht g
 notAllowed = {0}.{1} ist nicht erlaubt und darf folglich nicht auftreten
 oneOf = {0} sollte f�r genau ein Schema g�ltig sein, aber {1} sind g�ltig
 pattern = {0} stimmt nicht mit dem regul�ren Ausdruck {1} �berein
-patternProperties = {0} stimmt nicht �berein mit dem Format definiert in 'pattern properties'
-properties = {0}: Ein Fehler mit 'properties' ist aufgetreten
+patternProperties = {0} stimmt nicht �berein mit dem Format definiert in ''pattern properties''
+properties = {0}: Ein Fehler mit ''properties'' ist aufgetreten
 propertyNames = Eigenschaftsname {0} ist ung�ltig f�r die Validierung: {1}
 readOnly = {0} ist ein schreibgesch�tztes Feld und kann nicht ver�ndert werden
 required = {0}.{1} ist ein Pflichtfeld aber fehlt
diff --git a/src/main/resources/jsv-messages_fa_IR.properties b/src/main/resources/jsv-messages_fa_IR.properties
index 75b5751aa..2274d6353 100644
--- a/src/main/resources/jsv-messages_fa_IR.properties
+++ b/src/main/resources/jsv-messages_fa_IR.properties
@@ -1,4 +1,4 @@
-$ref = {0}: دارای خطا با 'refs'
+$ref = {0}: دارای خطا با ''refs''
 additionalProperties = {0}.{1}: در طرحواره تعریف نشده است و طرح ویژگی های اضافی را اجازه نمی دهد
 allOf = {0}: باید برای همه طرحواره ها معتبر باشد {1}
 anyOf = {0}: باید برای هر یک از طرحواره ها معتبر باشد {1}
@@ -9,7 +9,7 @@ dateTime = {0}: {1} نامعتبر است {2}
 dependencies = {0}: دارای خطای وابستگی است {1}
 dependentRequired = {0}: دارای یک مشخصه گم شده است که اجباری است {1}
 dependentSchemas = {0}: دارای خطا با dependentSchemas است {1}
-edits = {0}: دارای خطا با 'ویرایش ها' است
+edits = {0}: دارای خطا با ''ویرایش ها'' است
 enum = {0}: مقدار در درون لیست مجازها نیست {1}
 exclusiveMaximum = {0}: باید حداکثر مقدار مطلق داشته باشد {1}
 exclusiveMinimum = {0}: باید حداقل مقدار انحصاری داشته باشد {1}
@@ -31,9 +31,9 @@ notAllowed = {0}.{1}: مجاز نیست اما در داده ها وجود دا
 # needs to be re-worked by a native speaker
 #oneOf = {0}: باید برای یک و تنها یکی از طرحواره ها معتبر باشد، اما بیش از یکی معتبر است: {1}
 pattern = {0}: با الگوی regex مطابقت ندارد {1}
-patternProperties = {0}: دارای مقداری خطا با 'خواص الگو'
+patternProperties = {0}: دارای مقداری خطا با ''خواص الگو''
 prefixItems = {0}[{1}]: هیچ اعتبارسنجی در این فهرست یافت نشد
-properties = {0}: دارای خطا با 'خواص'
+properties = {0}: دارای خطا با ''خواص''
 propertyNames = نام مشخصه {0} برای اعتبارسنجی معتبر نیست: {1}
 readOnly = {0}: یک فیلد فقط خواندنی است، نمی توان آن را تغییر داد
 required = {0}.{1}: وجود ندارد اما لازم است
diff --git a/src/main/resources/jsv-messages_fi_FI.properties b/src/main/resources/jsv-messages_fi_FI.properties
index 1f84ee5cf..64561cb6c 100644
--- a/src/main/resources/jsv-messages_fi_FI.properties
+++ b/src/main/resources/jsv-messages_fi_FI.properties
@@ -1,4 +1,4 @@
-$ref = {0}: siin� on virhe koskien 'refs'
+$ref = {0}: siin� on virhe koskien ''refs''
 additionalProperties = {0}.{1}: ei ole m��ritetty skeemassa, eik� skeema salli lis�ominaisuuksia
 allOf = {0}: pit�isi olla voimassa kaikissa malleissa {1}
 anyOf = {0}: pit�isi olla voimassa miss� tahansa skeemassa {1}
@@ -37,7 +37,7 @@ oneOf = {0}: pit
 pattern = {0}: ei vastaa s��nn�llisen lausekkeen mallia {1}
 patternProperties = {0}: siin� on virhe kuvion ominaisuuksissa
 prefixItems = {0}[{1}]: t�st� hakemistosta ei l�ydy vahvistusta
-properties = {0}: siin� on virhe 'ominaisuuksissa'
+properties = {0}: siin� on virhe ''ominaisuuksissa''
 propertyNames = Kiinteist�n nimi {0} ei kelpaa vahvistusta varten: {1}
 readOnly = {0}: on vain luku -kentt�, sit� ei voi muuttaa
 required = {0}.{1}: puuttuu, mutta se on pakollinen
diff --git a/src/main/resources/jsv-messages_fr.properties b/src/main/resources/jsv-messages_fr.properties
index b9bc8807a..302b15f3b 100644
--- a/src/main/resources/jsv-messages_fr.properties
+++ b/src/main/resources/jsv-messages_fr.properties
@@ -1,37 +1,37 @@
-$ref = {0}: a une erreur avec 'refs'
-additionalProperties = {0}.{1} n'est pas d�fini dans le sch�ma et le sch�ma n'autorise pas de propri�t�s suppl�mentaires
+$ref = {0}: a une erreur avec ''refs''
+additionalProperties = {0}.{1} n''est pas d�fini dans le sch�ma et le sch�ma n''autorise pas de propri�t�s suppl�mentaires
 allOf = {0}: devrait �tre valide pour tous les sch�mas de {1}
 anyOf = {0}: devrait �tre valide pour au moins un sch�ma de {1}
 const = {0}: doit �tre une valeur constante {1}
 contains = {0}: ne contient pas un �l�ment qui passe ces validations: {2}
-crossEdits = {0}: a une erreur avec 'cross edits'
-dateTime = {0}: {1} n'est pas valide {2}
+crossEdits = {0}: a une erreur avec ''cross edits''
+dateTime = {0}: {1} n''est pas valide {2}
 dependencies = {0} a une erreur avec les d�pendances {1}
-dependentRequired = {0}: a une propri�t� manquante qui est 'dependentRequired' {1}
-dependentSchemas = {0}: a une erreur avec 'dependentSchemas' {1}
-edits = {0}: a une erreur avec 'edits'
-enum = {0}: n'a pas de valeur dans l'�num�ration {1}
+dependentRequired = {0}: a une propri�t� manquante qui est ''dependentRequired'' {1}
+dependentSchemas = {0}: a une erreur avec ''dependentSchemas'' {1}
+edits = {0}: a une erreur avec ''edits''
+enum = {0}: n''a pas de valeur dans l''�num�ration {1}
 exclusiveMaximum = {0}: doit avoir une valeur maximale exclusive de {1}
 exclusiveMinimum = {0}: doit avoir une valeur minimale exclusive de {1}
-false = Le sch�ma du boolean "false" n'est pas valide
+false = Le sch�ma du boolean "false" n''est pas valide
 format = {0}: ne correspond pas � {1} du mod�le {2}
-id = {0}: {1} est un segment invalide pour l'URI {2}
+id = {0}: {1} est un segment invalide pour l''URI {2}
 items = {0}[{1}]: Aucun validateur trouv� sur cet index
 maxItems = {0}: doit avoir un maximum de {1} �l�ments dans le tableau
 maxLength = {0}: ne doit pas d�passer {1} caract�res
 maxProperties = {0}: peut avoir au plus {1} propri�t�s
 maximum = {0}: ne doit pas d�passer la valeur {1}
 minItems = {0}: doit contenir au moins {1} �l�ments
-minLength = {0}: doit �tre long d'au moins {1} caract�res
+minLength = {0}: doit �tre long d''au moins {1} caract�res
 minProperties = {0}: doit avoir au moins {1} propri�t�s
 minimum = {0}: doit avoir une valeur minimale de {1}
 multipleOf = {0}: doit �tre un multiple de {1}
 not = {0}: ne doit pas �tre valide pour le sch�ma {1}
-notAllowed = {0}.{1} n'est pas autoris� mais est dans les donn�es
+notAllowed = {0}.{1} n''est pas autoris� mais est dans les donn�es
 oneOf = {0}: doit �tre valide pour un et un seul sch�ma, mais {1} sont valides
-pattern = {0} ne correspond pas � l'expression r�guli�re {1}
-patternProperties = {0}: a des erreurs avec 'pattern properties'
-properties = {0} : a une erreur avec 'properties'
+pattern = {0} ne correspond pas � l''expression r�guli�re {1}
+patternProperties = {0}: a des erreurs avec ''pattern properties''
+properties = {0} : a une erreur avec ''properties''
 propertyNames = Le nom de la propri�t� {0} ne valide pas: {1}
 readOnly = {0}: est un champ en lecture seule et ne peut pas �tre modifi�
 required = {0}.{1} est un champ obligatoire mais manquant
@@ -39,4 +39,4 @@ type = {0}: {1} a 
 unevaluatedProperties = Des propri�t�s sont non �valu�es dans les chemins suivants {0}
 unionType = {0} : {1} trouv�, mais {2} est requis
 uniqueItems = {0}: les �l�ments du tableau doivent �tre uniques
-uuid = {0}: {1} n'est pas valide {2}
+uuid = {0}: {1} n''est pas valide {2}
diff --git a/src/main/resources/jsv-messages_fr_CA.properties b/src/main/resources/jsv-messages_fr_CA.properties
index fb8389fea..7028ebcb3 100644
--- a/src/main/resources/jsv-messages_fr_CA.properties
+++ b/src/main/resources/jsv-messages_fr_CA.properties
@@ -1,9 +1,9 @@
-$ref = {0} : a une erreur avec 'refs'
-additionalProperties = {0}.{1} : n'est pas d�fini dans le sch�ma et le sch�ma n'autorise pas les propri�t�s suppl�mentaires
+$ref = {0} : a une erreur avec ''refs''
+additionalProperties = {0}.{1} : n''est pas d�fini dans le sch�ma et le sch�ma n''autorise pas les propri�t�s suppl�mentaires
 allOf = {0} : doit �tre valide pour tous les sch�mas {1}
-anyOf = {0} : doit �tre valide pour l'un des sch�mas {1}
+anyOf = {0} : doit �tre valide pour l''un des sch�mas {1}
 const = {0} : doit �tre une valeur constante {1}
-contains = {0} : ne contient pas d'�l�ment qui passe ces validations : {2}
+contains = {0} : ne contient pas d''�l�ment qui passe ces validations : {2}
 contains.max = {0} : doit contenir moins de {1} �l�ment(s) qui r�ussissent ces validations : {2}
 contains.min = {0} : doit contenir au moins {1} �l�ment(s) qui r�ussissent ces validations : {2}
 crossEdits = {0} : a une erreur avec les "�ditions crois�es"
@@ -11,18 +11,18 @@ dateTime = {0} : {1} est un {2} invalide
 dependencies = {0} : a une erreur avec les d�pendances {1}
 dependentRequired = {0} : a une propri�t� manquante "{1}" qui est d�pendante requise car "{2}" est pr�sent
 dependentSchemas = {0} : a une erreur avec d�pendantSchemas {1}
-edits = {0} : a une erreur avec 'edits'
-enum = {0} : n'a pas de valeur dans l'�num�ration {1}
+edits = {0} : a une erreur avec ''edits''
+enum = {0} : n''a pas de valeur dans l''�num�ration {1}
 exclusiveMaximum = {0} : doit avoir une valeur maximale exclusive de {1}
 exclusiveMinimum = {0} : doit avoir une valeur minimale exclusive de {1}
-false = le sch�ma bool�en false n'est pas valide
+false = le sch�ma bool�en false n''est pas valide
 format = {0} : ne correspond pas au mod�le {1} {2}
-id = {0} : {1} est un segment non valide pour l'URI {2}
+id = {0} : {1} est un segment non valide pour l''URI {2}
 items = {0}[{1}] : aucun validateur trouv� � cet index
 maxContains = {0} : doit �tre un entier non n�gatif dans {1}
 maxItems = {0} : il doit y avoir un maximum de {1} �l�ments dans le tableau
 maxLength = {0} : ne peut contenir que {1} caract�res
-maxProperties = {0} : ne peut avoir qu'un maximum de {1} propri�t�s
+maxProperties = {0} : ne peut avoir qu''un maximum de {1} propri�t�s
 maximum = {0} : doit avoir une valeur maximale de {1}
 minContains = {0} : doit �tre un entier non n�gatif dans {1}
 minContainsVsMaxContains = {0} : minContains doit �tre inf�rieur ou �gal � maxContains dans {1}
@@ -32,13 +32,13 @@ minProperties = {0} : doit avoir un minimum de {1} propri
 minimum = {0} : doit avoir une valeur minimale de {1}
 multipleOf = {0} : doit �tre un multiple de {1}
 not = {0} : ne doit pas �tre valide pour le sch�ma {1}
-notAllowed = {0}.{1} : n'est pas autoris� mais il est dans les donn�es
+notAllowed = {0}.{1} : n''est pas autoris� mais il est dans les donn�es
 oneOf = {0} : doit �tre valide pour un et un seul sch�ma, mais {1} sont valides
 pattern = {0} : ne correspond pas au mod�le regex {1}
-patternProperties = {0} : a une erreur avec les 'propri�t�s du mod�le'
+patternProperties = {0} : a une erreur avec les ''propri�t�s du mod�le''
 prefixItems = {0}[{1}] : aucun validateur trouv� � cet index
-properties = {0} : a une erreur avec 'propri�t�s'
-propertyNames = Le nom de la propri�t� {0} n'est pas valide pour la validation : {1}
+properties = {0} : a une erreur avec ''propri�t�s''
+propertyNames = Le nom de la propri�t� {0} n''est pas valide pour la validation : {1}
 readOnly = {0} : est un champ en lecture seule, il ne peut pas �tre modifi�
 required = {0}.{1} : manque mais est obligatoire
 type = {0} : {1} trouv�, {2} attendu
diff --git a/src/main/resources/jsv-messages_he_IL.properties b/src/main/resources/jsv-messages_he_IL.properties
index 8059ad3f0..540fb13c8 100644
--- a/src/main/resources/jsv-messages_he_IL.properties
+++ b/src/main/resources/jsv-messages_he_IL.properties
@@ -1,4 +1,4 @@
-$ref = {0}: יש שגיאה עם 'refs'
+$ref = {0}: יש שגיאה עם ''refs''
 additionalProperties = {0}.{1}: אינו מוגדר בסכימה והסכימה אינה מאפשרת מאפיינים נוספים
 allOf = {0}: צריך להיות חוקי לכל הסכמות {1}
 anyOf = {0}: צריך להיות חוקי לכל אחת מהסכימות {1}
@@ -6,12 +6,12 @@ const = {0}: חייב להיות ערך קבוע {1}
 contains = {0}: אינו מכיל רכיב שעובר את האימותים הבאים: {2}
 contains.max = {0}: חייב להכיל פחות מ-{1} רכיבים שעוברים אימותים אלה: {2}
 contains.min = {0}: חייב להכיל לפחות {1} רכיבים שעוברים אימותים אלה: {2}
-crossEdits = {0}: יש שגיאה עם 'עריכות צולבות'
+crossEdits = {0}: יש שגיאה עם ''עריכות צולבות''
 dateTime = {0}: {1} הוא {2} לא חוקי
 dependencies = {0}: יש שגיאה עם תלויות {1}
 dependentRequired = {0}: יש לו מאפיין חסר "{1}" אשר נדרש תלוי כי "{2}" קיים
 dependentSchemas = {0}: יש שגיאה עם dependentSchemas {1}
-edits = {0}: יש שגיאה עם 'עריכות'
+edits = {0}: יש שגיאה עם ''עריכות''
 enum = {0}: אין ערך בספירה {1}
 exclusiveMaximum = {0}: חייב להיות בעל ערך מקסימלי בלעדי של {1}
 exclusiveMinimum = {0}: חייב להיות בעל ערך מינימלי בלעדי של {1}
@@ -35,9 +35,9 @@ not = {0}: לא אמור להיות חוקי לסכימה {1}
 notAllowed = {0}.{1}: אסור אבל הוא נמצא בנתונים
 oneOf = {0}: צריך להיות חוקי לסכימה אחת ויחידה, אבל {1} חוקיים
 pattern = {0}: אינו תואם לתבנית הביטוי הרגולרי {1}
-patternProperties = {0}: יש שגיאה כלשהי עם 'מאפייני דפוס'
+patternProperties = {0}: יש שגיאה כלשהי עם ''מאפייני דפוס''
 prefixItems = {0}[{1}]: לא נמצא מאמת באינדקס זה
-properties = {0}: יש שגיאה עם 'מאפיינים'
+properties = {0}: יש שגיאה עם ''מאפיינים''
 propertyNames = שם הנכס {0} אינו חוקי לאימות: {1}
 readOnly = {0}: הוא שדה לקריאה בלבד, לא ניתן לשנות אותו
 required = {0}.{1}: חסר אך נדרש
diff --git a/src/main/resources/jsv-messages_hr_HR.properties b/src/main/resources/jsv-messages_hr_HR.properties
index 217a4bd62..f86431817 100644
--- a/src/main/resources/jsv-messages_hr_HR.properties
+++ b/src/main/resources/jsv-messages_hr_HR.properties
@@ -1,4 +1,4 @@
-$ref = {0}: ima pogre?ku s 'refs'
+$ref = {0}: ima pogre?ku s ''refs''
 additionalProperties = {0}.{1}: nije definirano u shemi i shema ne dopu?ta dodatna svojstva
 allOf = {0}: trebalo bi biti va?e?e za sve sheme {1}
 anyOf = {0}: trebalo bi biti va?e?e za bilo koju od shema {1}
@@ -6,12 +6,12 @@ const = {0}: mora biti konstantna vrijednost {1}
 contains = {0}: ne sadr?i element koji prolazi ove provjere: {2}
 contains.max = {0}: mora sadr?avati manje od {1} elemenata koji prolaze ove provjere: {2}
 contains.min = {0}: mora sadr?avati najmanje {1} elementa koji prolaze ove provjere: {2}
-crossEdits = {0}: ima pogre?ku s 'cross edits'
+crossEdits = {0}: ima pogre?ku s ''cross edits''
 dateTime = {0}: {1} je neva?e?i {2}
 dependencies = {0}: ima pogre?ku s ovisnostima {1}
 dependentRequired = {0}: nedostaje svojstvo "{1}" koje je ovisno potrebno jer je "{2}" prisutno
 dependentSchemas = {0}: ima pogre?ku s dependentSchemas {1}
-edits= {0}: ima pogre?ku s 'ure?ivanja'
+edits= {0}: ima pogre?ku s ''ure?ivanja''
 enum = {0}: nema vrijednost u enumeraciji {1}
 exclusiveMaximum = {0}: mora imati isklju?ivu maksimalnu vrijednost od {1}
 exclusiveMinimum = {0}: mora imati isklju?ivu minimalnu vrijednost od {1}
@@ -35,9 +35,9 @@ not = {0}: ne bi trebalo biti va?e?e za shemu {1}
 notAllowed = {0}.{1}: nije dopu?teno, ali je u podacima
 oneOf = {0}: trebalo bi biti va?e?e za jednu i samo jednu shemu, ali {1} su va?e?e
 pattern = {0}: ne odgovara uzorku regularnog izraza {1}
-patternProperties = {0}: ima neke pogre?ke s 'pattern properties'
+patternProperties = {0}: ima neke pogre?ke s ''pattern properties''
 prefixItems = {0}[{1}]: u ovom indeksu nije prona?en validator
-properties = {0}: ima gre?ku sa 'svojstvima'
+properties = {0}: ima gre?ku sa ''svojstvima''
 propertyNames = Ime svojstva {0} nije va?e?e za provjeru: {1}
 readOnly = {0}: polje je samo za ?itanje, ne mo?e se mijenjati
 required = {0}.{1}: nedostaje, ali je obavezno
diff --git a/src/main/resources/jsv-messages_hu_HU.properties b/src/main/resources/jsv-messages_hu_HU.properties
index 07f901a41..05eb66e99 100644
--- a/src/main/resources/jsv-messages_hu_HU.properties
+++ b/src/main/resources/jsv-messages_hu_HU.properties
@@ -1,4 +1,4 @@
-$ref = {0}: hib�s a 'refs'
+$ref = {0}: hib�s a ''refs''
 additionalProperties = {0}.{1}: nincs megadva a s�m�ban, �s a s�ma nem enged�lyez tov�bbi tulajdons�gokat
 allOf = {0}: �rv�nyesnek kell lennie az �sszes s�m�ra {1}
 anyOf = {0}: �rv�nyesnek kell lennie a(z) {1} s�m�k b�rmelyik�re
diff --git a/src/main/resources/jsv-messages_ja_JP.properties b/src/main/resources/jsv-messages_ja_JP.properties
index 9d9823074..297d7e9f3 100644
--- a/src/main/resources/jsv-messages_ja_JP.properties
+++ b/src/main/resources/jsv-messages_ja_JP.properties
@@ -1,4 +1,4 @@
-$ref = {0}: 'refs' にエラーがあります
+$ref = {0}: ''refs'' にエラーがあります
 additionalProperties = {0}.{1}: スキーマで定義されておらず、スキーマでは追加のプロパティが許可されていません
 allOf = {0}: すべてのスキーマ {1} に対して有効である必要があります
 anyOf = {0}: スキーマ {1} のいずれかに対して有効である必要があります。
@@ -11,7 +11,7 @@ dateTime = {0}: {1} は無効な {2} です
 dependencies = {0}: 依存関係 {1} にエラーがあります
 dependentRequired = {0}: プロパティ「{1}」が欠落していますが、「{2}」が存在するため依存必須です。
 dependentSchemas = {0}:dependentSchemas {1} にエラーがあります
-edits = {0}: 'edits' にエラーがあります
+edits = {0}: ''edits'' にエラーがあります
 enum = {0}: 列挙型 {1} に値がありません
 exclusiveMaximum = {0}: 排他的な最大値は {1} でなければなりません
 exclusiveMinimum = {0}: 排他的な最小値は {1} でなければなりません
@@ -37,7 +37,7 @@ oneOf = {0}: 1 つのスキーマに対してのみ有効である必要があ
 pattern = {0}: 正規表現パターン {1} に一致しません
 patternProperties = {0}: 「パターン プロパティ」にエラーがあります
 prefixItems = {0}[{1}]: このインデックスにバリデータが見つかりません
-properties = {0}: 'プロパティ' にエラーがあります
+properties = {0}: ''プロパティ'' にエラーがあります
 propertyNames = プロパティ名 {0} は検証には無効です: {1}
 readOnly = {0}: は読み取り専用フィールドです。変更できません
 required = {0}.{1}: がありませんが、必須です
diff --git a/src/main/resources/jsv-messages_ko_KR.properties b/src/main/resources/jsv-messages_ko_KR.properties
index ddc7eab5f..d57e1664b 100644
--- a/src/main/resources/jsv-messages_ko_KR.properties
+++ b/src/main/resources/jsv-messages_ko_KR.properties
@@ -1,4 +1,4 @@
-$ref = {0}: 'refs'에 오류가 있습니다.
+$ref = {0}: ''refs''에 오류가 있습니다.
 additionalProperties = {0}.{1}: 스키마에 정의되어 있지 않으며 스키마에서 추가 속성을 허용하지 않습니다.
 allOf = {0}: 모든 스키마 {1}에 대해 유효해야 합니다.
 anyOf = {0}: 스키마 {1} 중 하나에 대해 유효해야 합니다.
@@ -6,12 +6,12 @@ const = {0}: 상수 값이어야 함 {1}
 contains = {0}: 다음 유효성 검사를 통과하는 요소를 포함하지 않음: {2}
 contains.max = {0}: 다음 유효성 검사를 통과하는 {1}개 미만의 요소를 포함해야 합니다. {2}
 contains.min = {0}: 다음 유효성 검사를 통과하는 {1}개 이상의 요소를 포함해야 합니다. {2}
-crossEdits = {0}: '교차 편집' 오류가 있습니다.
+crossEdits = {0}: ''교차 편집'' 오류가 있습니다.
 dateTime = {0}: {1}은(는) 잘못된 {2}입니다.
 dependencies = {0}: 종속성 {1}에 오류가 있습니다.
 dependentRequired = {0}: "{2}"이(가) 존재하기 때문에 종속 필수 속성 "{1}"이(가) 누락되었습니다.
 dependentSchemas = {0}: 종속 스키마 {1}에 오류가 있습니다.
-edits = {0}: 'edits'에 오류가 있습니다.
+edits = {0}: ''edits''에 오류가 있습니다.
 enum = {0}: 열거형 {1}에 값이 없습니다.
 exclusiveMaximum = {0}: {1}의 배타적 최대값을 가져야 합니다.
 exclusiveMinimum = {0}: 배타적 최소값은 {1}이어야 합니다.
@@ -35,9 +35,9 @@ not = {0}: {1} 스키마에 유효하지 않아야 합니다.
 notAllowed = {0}.{1}: 허용되지 않지만 데이터에 있음
 oneOf = {0}: 하나의 스키마에만 유효해야 하지만 {1}은 유효합니다.
 pattern = {0}: 정규식 패턴 {1}과 일치하지 않습니다.
-patternProperties = {0}: '패턴 속성'에 일부 오류가 있습니다.
+patternProperties = {0}: ''패턴 속성''에 일부 오류가 있습니다.
 prefixItems = {0}[{1}]: 이 인덱스에서 유효성 검사기를 찾을 수 없습니다.
-properties = {0}: '속성'에 오류가 있습니다.
+properties = {0}: ''속성''에 오류가 있습니다.
 propertyNames = 속성 이름 {0}은(는) 유효성 검사에 유효하지 않습니다: {1}
 readOnly = {0}: 읽기 전용 필드이므로 변경할 수 없습니다.
 required = {0}.{1}: 누락되었지만 필수입니다.
diff --git a/src/main/resources/jsv-messages_nb_NO.properties b/src/main/resources/jsv-messages_nb_NO.properties
index f95583acc..af95d2475 100644
--- a/src/main/resources/jsv-messages_nb_NO.properties
+++ b/src/main/resources/jsv-messages_nb_NO.properties
@@ -1,4 +1,4 @@
-$ref = {0}: har en feil med 'refs'
+$ref = {0}: har en feil med ''refs''
 additionalProperties = {0}.{1}: er ikke definert i skjemaet og skjemaet tillater ikke flere egenskaper
 allOf = {0}: skal v�re gyldig for alle skjemaene {1}
 anyOf = {0}: b�r v�re gyldig for alle skjemaene {1}
@@ -11,7 +11,7 @@ dateTime = {0}: {1} er en ugyldig {2}
 dependencies = {0}: har en feil med avhengigheter {1}
 dependentRequired = {0}: har en manglende egenskap "{1}" som er avhengig n�dvendig fordi "{2}" er tilstede
 dependentSchemas = {0}: har en feil med dependentSchemas {1}
-edits = {0}: har en feil med 'edits'
+edits = {0}: har en feil med ''edits''
 enum = {0}: har ikke en verdi i oppregningen {1}
 exclusiveMaximum = {0}: m� ha en eksklusiv maksimumsverdi p� {1}
 exclusiveMinimum = {0}: m� ha en eksklusiv minimumsverdi p� {1}
@@ -35,9 +35,9 @@ not = {0}: skal ikke v
 notAllowed = {0}.{1}: er ikke tillatt, men det er i dataene
 oneOf = {0}: skal v�re gyldig for ett og bare ett skjema, men {1} er gyldige
 pattern = {0}: samsvarer ikke med regex-m�nsteret {1}
-patternProperties = {0}: har en feil med 'm�nsteregenskaper'
+patternProperties = {0}: har en feil med ''m�nsteregenskaper''
 prefixItems = {0}[{1}]: ingen validator funnet i denne indeksen
-properties = {0}: har en feil med 'egenskaper'
+properties = {0}: har en feil med ''egenskaper''
 propertyNames = Eiendomsnavnet {0} er ikke gyldig for validering: {1}
 readOnly = {0}: er et skrivebeskyttet felt, det kan ikke endres
 required = {0}.{1}: mangler, men er p�krevd
diff --git a/src/main/resources/jsv-messages_nl_NL.properties b/src/main/resources/jsv-messages_nl_NL.properties
index 1ab682875..ec29cbfd3 100644
--- a/src/main/resources/jsv-messages_nl_NL.properties
+++ b/src/main/resources/jsv-messages_nl_NL.properties
@@ -1,17 +1,17 @@
-$ref = {0}: heeft een fout met 'refs'
+$ref = {0}: heeft een fout met ''refs''
 additionalProperties = {0}.{1}: is niet gedefinieerd in het schema en het schema staat geen aanvullende eigenschappen toe
-allOf = {0}: zou geldig moeten zijn voor alle schema's {1}
-anyOf = {0}: zou geldig moeten zijn voor elk van de schema's {1}
+allOf = {0}: zou geldig moeten zijn voor alle schema''s {1}
+anyOf = {0}: zou geldig moeten zijn voor elk van de schema''s {1}
 const = {0}: moet een constante waarde zijn {1}
 contains = {0}: bevat geen element dat deze validaties doorstaat: {2}
 contains.max = {0}: moet minder dan {1} element(en) bevatten die deze validaties doorstaan: {2}
 contains.min = {0}: moet ten minste {1} element(en) bevatten die deze validaties doorstaan: {2}
-crossEdits = {0}: heeft een fout met 'cross edits'
+crossEdits = {0}: heeft een fout met ''cross edits''
 dateTime = {0}: {1} is een ongeldige {2}
 dependencies = {0}: heeft een fout met afhankelijkheden {1}
 dependentRequired = {0}: heeft een ontbrekende eigenschap "{1}" die afhankelijk is vereist omdat "{2}" aanwezig is
 dependentSchemas = {0}: heeft een fout met dependSchemas {1}
-edits = {0}: heeft een fout met 'edits'
+edits = {0}: heeft een fout met ''edits''
 enum = {0}: heeft geen waarde in de opsomming {1}
 exclusiveMaximum = {0}: moet een exclusieve maximale waarde hebben van {1}
 exclusiveMinimum = {0}: moet een exclusieve minimumwaarde hebben van {1}
@@ -35,9 +35,9 @@ not = {0}: zou niet geldig moeten zijn voor het schema {1}
 notAllowed = {0}.{1}: is niet toegestaan ??maar staat wel in de data
 oneOf = {0}: zou geldig moeten zijn voor ��n en slechts ��n schema, maar {1} is geldig
 pattern = {0}: komt niet overeen met het regex-patroon {1}
-patternProperties = {0}: heeft een fout met 'pattern properties'
+patternProperties = {0}: heeft een fout met ''pattern properties''
 prefixItems = {0}[{1}]: geen validator gevonden bij deze index
-properties = {0}: heeft een fout met 'properties'
+properties = {0}: heeft een fout met ''properties''
 propertyNames = Eigenschapsnaam {0} is niet geldig voor validatie: {1}
 readOnly = {0}: is een alleen-lezen veld, het kan niet worden gewijzigd
 required = {0}.{1}: ontbreekt maar is vereist
diff --git a/src/main/resources/jsv-messages_pl_PL.properties b/src/main/resources/jsv-messages_pl_PL.properties
index b8afee156..9273863b5 100644
--- a/src/main/resources/jsv-messages_pl_PL.properties
+++ b/src/main/resources/jsv-messages_pl_PL.properties
@@ -1,4 +1,4 @@
-$ref = {0}: zawiera błąd z 'refs'
+$ref = {0}: zawiera błąd z ''refs''
 additionalProperties = {0}.{1}: nie jest zdefiniowane w schemacie, a schemat nie zezwala na dodatkowe właściwości
 allOf = {0}: powinien być ważny dla wszystkich schematów {1}
 anyOf = {0}: powinien być ważny dla dowolnego ze schematów {1}
@@ -6,12 +6,12 @@ const = {0}: musi być stałą wartością {1}
 contains = {0}: nie zawiera elementu, który przechodzi te walidacje: {2}
 contains.max = {0}: musi zawierać mniej niż {1} elementów, które pomyślnie przejdą te weryfikacje: {2}
 contains.min = {0}: musi zawierać co najmniej {1} elementów, które pomyślnie przejdą te walidacje: {2}
-crossEdits = {0}: wystąpił błąd dotyczący 'crossEdits'
+crossEdits = {0}: wystąpił błąd dotyczący ''crossEdits''
 dateTime = {0}: {1} jest nieprawidłowym {2}
 dependencies = {0}: wystąpił błąd z zależnościami {1}
 dependentRequired = {0}: ma brakującą właściwość "{1}", która jest wymagana, ponieważ występuje "{2}"
 dependentSchemas = {0}: wystąpił błąd w zależnych schematach {1}
-edits = {0}: zawiera błąd z 'edits'
+edits = {0}: zawiera błąd z ''edits''
 enum = {0}: nie ma wartości w enumeracji {1}
 exclusiveMaximum = {0}: musi mieć wyłączną maksymalną wartość {1}
 exclusiveMinimum = {0}: musi mieć wyłączną minimalną wartość {1}
@@ -35,9 +35,9 @@ not = {0}: nie powinno być poprawne dla schematu {1}
 notAllowed = {0}.{1}: nie jest dozwolone, ale jest w danych
 oneOf = {0}: powinien być ważny dla jednego i tylko jednego schematu, ale {1} jest ważny
 pattern = {0}: nie pasuje do wzorca wyrażenia regularnego {1}
-patternProperties = {0}: wystąpił błąd dotyczący 'patternProperties'
+patternProperties = {0}: wystąpił błąd dotyczący ''patternProperties''
 prefixItems = {0}[{1}]: nie znaleziono walidatora o tym indeksie
-properties = {0}: wystąpił błąd dotyczący 'properties'
+properties = {0}: wystąpił błąd dotyczący ''properties''
 propertyNames = Nazwa właściwości {0} jest nieprawidłowa do sprawdzenia poprawności: {1}
 readOnly = {0}: jest polem tylko do odczytu, nie można go zmienić
 required = {0}.{1}: brakuje, ale jest wymagane
diff --git a/src/main/resources/jsv-messages_pt_BR.properties b/src/main/resources/jsv-messages_pt_BR.properties
index 492c71dd3..f736f84de 100644
--- a/src/main/resources/jsv-messages_pt_BR.properties
+++ b/src/main/resources/jsv-messages_pt_BR.properties
@@ -1,4 +1,4 @@
-$ref = {0}: tem um erro com 'refs'
+$ref = {0}: tem um erro com ''refs''
 additionalProperties = {0}.{1}: n�o est� definido no esquema e o esquema n�o permite propriedades adicionais
 allOf = {0}: deve ser v�lido para todos os esquemas {1}
 anyOf = {0}: deve ser v�lido para qualquer um dos esquemas {1}
@@ -6,12 +6,12 @@ const = {0}: deve ser um valor constante {1}
 contains = {0}: n�o cont�m um elemento que passe nestas valida��es: {2}
 contains.max = {0}: deve conter menos de {1} elemento(s) que passam nestas valida��es: {2}
 contains.min = {0}: deve conter pelo menos {1} elemento(s) que passe(m) nestas valida��es: {2}
-crossEdits = {0}: tem um erro com 'edi��es cruzadas'
+crossEdits = {0}: tem um erro com ''edi��es cruzadas''
 dateTime = {0}: {1} � um {2} inv�lido
 dependencies = {0}: tem um erro com depend�ncias {1}
 dependentRequired = {0}: tem uma propriedade ausente "{1}" que � dependente necess�ria porque "{2}" est� presente
 dependentSchemas = {0}: tem um erro com DependentSchemas {1}
-edits = {0}: tem um erro com 'edi��es'
+edits = {0}: tem um erro com ''edi��es''
 enum = {0}: n�o tem valor na enumera��o {1}
 exclusiveMaximum = {0}: deve ter um valor m�ximo exclusivo de {1}
 exclusiveMinimum = {0}: deve ter um valor m�nimo exclusivo de {1}
@@ -35,9 +35,9 @@ not = {0}: n
 notAllowed = {0}.{1}: n�o � permitido, mas est� nos dados
 oneOf = {0}: deve ser v�lido para um e apenas um esquema, mas {1} s�o v�lidos
 pattern = {0}: n�o corresponde ao padr�o regex {1}
-patternProperties = {0}: tem algum erro com 'propriedades do padr�o'
+patternProperties = {0}: tem algum erro com ''propriedades do padr�o''
 prefixItems = {0}[{1}]: nenhum validador encontrado neste �ndice
-properties = {0}: tem um erro com 'propriedades'
+properties = {0}: tem um erro com ''propriedades''
 propertyNames = O nome da propriedade {0} n�o � v�lido para valida��o: {1}
 readOnly = {0}: � um campo somente leitura, n�o pode ser alterado
 required = {0}.{1}: est� faltando, mas � obrigat�rio
diff --git a/src/main/resources/jsv-messages_ru_RU.properties b/src/main/resources/jsv-messages_ru_RU.properties
index e66990aa1..96679ab73 100644
--- a/src/main/resources/jsv-messages_ru_RU.properties
+++ b/src/main/resources/jsv-messages_ru_RU.properties
@@ -1,4 +1,4 @@
-$ref = {0}: ошибка с 'refs'
+$ref = {0}: ошибка с ''refs''
 additionalProperties = {0}.{1}: не определено в схеме, и схема не допускает дополнительных свойств.
 allOf = {0}: должно быть действительным для всех схем {1}
 anyOf = {0}: должно быть допустимо для любой из схем {1}
diff --git a/src/main/resources/jsv-messages_sk_SK.properties b/src/main/resources/jsv-messages_sk_SK.properties
index 5f0bf0507..3522c490d 100644
--- a/src/main/resources/jsv-messages_sk_SK.properties
+++ b/src/main/resources/jsv-messages_sk_SK.properties
@@ -1,4 +1,4 @@
-$ref = {0}: obsahuje chybu s 'refs'
+$ref = {0}: obsahuje chybu s ''refs''
 additionalProperties = {0}.{1}: nie je definovan� v sch�me a sch�ma neumo??uje ?al?ie vlastnosti
 allOf = {0}: malo by by? platn� pre v?etky sch�my {1}
 anyOf = {0}: malo by by? platn� pre ktor�ko?vek sch�mu {1}
@@ -6,12 +6,12 @@ const = {0}: mus
 contains = {0}: neobsahuje prvok, ktor� vyhovuje t�mto overeniam: {2}
 contains.max = {0}: mus� obsahova? menej ako {1} prvkov, ktor� prejd� t�mito overeniami: {2}
 contains.min = {0}: mus� obsahova? aspo? {1} prvkov, ktor� prejd� t�mito overeniami: {2}
-crossEdits = {0}: obsahuje chybu s 'cross edits'
+crossEdits = {0}: obsahuje chybu s ''cross edits''
 dateTime = {0}: {1} je neplatn� {2}
 dependencies = {0}: obsahuje chybu so z�vislos?ami {1}
 dependentRequired = {0}: m� ch�baj�cu vlastnos? "{1}", ktor� je z�visl�, povinn�, preto?e "{2}" je pr�tomn�
 dependentSchemas = {0}: obsahuje chybu s dependentSchemas {1}
-edits = {0}: obsahuje chybu s '�pravy'
+edits = {0}: obsahuje chybu s ''�pravy''
 enum = {0}: nem� hodnotu v enumer�cii {1}
 exclusiveMaximum = {0}: mus� ma? v�lu?n� maxim�lnu hodnotu {1}
 exclusiveMinimum = {0}: mus� ma? v�lu?n� minim�lnu hodnotu {1}
diff --git a/src/main/resources/jsv-messages_sv_SE.properties b/src/main/resources/jsv-messages_sv_SE.properties
index d2308d94c..9ff39f2a7 100644
--- a/src/main/resources/jsv-messages_sv_SE.properties
+++ b/src/main/resources/jsv-messages_sv_SE.properties
@@ -1,4 +1,4 @@
-$ref = {0}: har ett fel med 'refs'
+$ref = {0}: har ett fel med ''refs''
 additionalProperties = {0}.{1}: �r inte definierat i schemat och schemat till�ter inte ytterligare egenskaper
 allOf = {0}: b�r vara giltig f�r alla scheman {1}
 anyOf = {0}: b�r vara giltigt f�r n�got av schemana {1}
@@ -11,7 +11,7 @@ dateTime = {0}: {1} 
 dependencies = {0}: har ett fel med beroenden {1}
 dependentRequired = {0}: har en saknad egenskap "{1}" som �r beroende kr�vs eftersom "{2}" �r n�rvarande
 dependentSchemas = {0}: har ett fel med dependentSchemas {1}
-edits = {0}: har ett fel med 'edits'
+edits = {0}: har ett fel med ''edits''
 enum = {0}: har inget v�rde i uppr�kningen {1}
 exclusiveMaximum = {0}: m�ste ha ett exklusivt maxv�rde p� {1}
 exclusiveMinimum = {0}: m�ste ha ett exklusivt l�gsta v�rde p� {1}
@@ -35,7 +35,7 @@ not = {0}: b
 notAllowed = {0}.{1}: �r inte till�tet men det finns i data
 oneOf = {0}: b�r vara giltigt f�r ett och endast ett schema, men {1} �r giltiga
 pattern = {0}: matchar inte regexm�nstret {1}
-patternProperties = {0}: har n�got fel med 'm�nsteregenskaper'
+patternProperties = {0}: har n�got fel med ''m�nsteregenskaper''
 prefixItems = {0}[{1}]: ingen validator hittades i detta index
 properties = {0}: har ett fel med "egenskaper"
 propertyNames = Egenskapens namn {0} �r inte giltigt f�r validering: {1}
diff --git a/src/main/resources/jsv-messages_th_TH.properties b/src/main/resources/jsv-messages_th_TH.properties
index e1783e826..a9b166d6a 100644
--- a/src/main/resources/jsv-messages_th_TH.properties
+++ b/src/main/resources/jsv-messages_th_TH.properties
@@ -1,4 +1,4 @@
-$ref = {0}: มีข้อผิดพลาดกับ 'refs'
+$ref = {0}: มีข้อผิดพลาดกับ ''refs''
 additionalProperties = {0}.{1}: ไม่ได้กำหนดไว้ในสคีมาและสคีมาไม่อนุญาตให้ใช้คุณสมบัติเพิ่มเติม
 allOf = {0}: ควรใช้ได้กับสกีมาทั้งหมด {1}
 anyOf = {0}: ควรใช้ได้กับ schema ใดๆ {1}
@@ -6,12 +6,12 @@ const = {0}: ต้องเป็นค่าคงที่ {1}
 contains = {0}: ไม่มีองค์ประกอบที่ผ่านการตรวจสอบเหล่านี้: {2}
 contains.max = {0}: ต้องมีน้อยกว่า {1} องค์ประกอบที่ผ่านการตรวจสอบเหล่านี้: {2}
 contains.min = {0}: ต้องมีอย่างน้อย {1} องค์ประกอบที่ผ่านการตรวจสอบเหล่านี้: {2}
-crossEdits = {0}: มีข้อผิดพลาดกับ 'การแก้ไขข้าม'
+crossEdits = {0}: มีข้อผิดพลาดกับ ''การแก้ไขข้าม''
 dateTime = {0}: {1} เป็น {2} ที่ไม่ถูกต้อง
 dependencies = {0}: มีข้อผิดพลาดกับการพึ่งพา {1}
 dependentRequired = {0}: ขาดคุณสมบัติ "{1}" ซึ่งจำเป็นต้องพึ่งพาเนื่องจาก "{2}" มีอยู่
 dependentSchemas = {0}: มีข้อผิดพลาดกับ dependentSchemas {1}
-edits = {0}: มีข้อผิดพลาดกับ 'แก้ไข'
+edits = {0}: มีข้อผิดพลาดกับ ''แก้ไข''
 enum = {0}: ไม่มีค่าในการแจงนับ {1}
 exclusiveMaximum = {0}: ต้องมีค่าสูงสุดเฉพาะตัวที่ {1}
 exclusiveMinimum = {0}: ต้องมีค่าต่ำสุดเฉพาะตัวเป็น {1}
@@ -35,9 +35,9 @@ not = {0}: ไม่ควรใช้ได้กับสคีมา {1}
 notAllowed = {0}.{1}: ไม่อนุญาต แต่อยู่ในข้อมูล
 oneOf = {0}: ควรใช้ได้กับหนึ่งสคีมาหนึ่งอันเท่านั้น แต่ {1} นั้นถูกต้อง
 pattern = {0}: ไม่ตรงกับรูปแบบ regex {1}
-patternProperties = {0}: มีข้อผิดพลาดบางอย่างกับ 'คุณสมบัติรูปแบบ'
+patternProperties = {0}: มีข้อผิดพลาดบางอย่างกับ ''คุณสมบัติรูปแบบ''
 prefixItems = {0}[{1}]: ไม่พบตัวตรวจสอบที่ดัชนีนี้
-properties = {0}: มีข้อผิดพลาดกับ 'คุณสมบัติ'
+properties = {0}: มีข้อผิดพลาดกับ ''คุณสมบัติ''
 propertyNames = ชื่อคุณสมบัติ {0} ไม่ถูกต้องสำหรับการตรวจสอบความถูกต้อง: {1}
 readOnly = {0}: เป็นฟิลด์แบบอ่านอย่างเดียว ไม่สามารถเปลี่ยนแปลงได้
 required = {0}.{1}: ขาดหายไป แต่จำเป็น
diff --git a/src/main/resources/jsv-messages_tr_TR.properties b/src/main/resources/jsv-messages_tr_TR.properties
index f6f2a3f69..3ec345e1e 100644
--- a/src/main/resources/jsv-messages_tr_TR.properties
+++ b/src/main/resources/jsv-messages_tr_TR.properties
@@ -1,4 +1,4 @@
-$ref = {0}: 'refs' ile ilgili bir hata var
+$ref = {0}: ''refs'' ile ilgili bir hata var
 additionalProperties = {0}.{1}: ?emada tan?ml? de?il ve ?ema ek �zelliklere izin vermiyor
 allOf = {0}: {1} t�m ?emalar? i�in ge�erli olmal?d?r
 anyOf = {0}: {1} ?emalar?ndan herhangi biri i�in ge�erli olmal?d?r
@@ -11,13 +11,13 @@ dateTime = {0}: {1} ge
 dependencies = {0}: {1} ba??ml?l?klar?nda bir hata var
 dependentRequired = {0}: "{2}" mevcut oldu?u i�in ba??ml? olan "{1}" �zelli?i eksik
 dependentSchemas = {0}: DependSchemas {1} ile ilgili bir hata var
-edits = {0}: 'd�zenlemeler' ile ilgili bir hata var
+edits = {0}: ''d�zenlemeler'' ile ilgili bir hata var
 enum = {0}: {1} numaraland?rmas?nda bir de?er yok
 exclusiveMaximum = {0}: {1} gibi �zel bir maksimum de?ere sahip olmal?d?r
 exclusiveMinimum = {0}: {1} gibi �zel bir minimum de?ere sahip olmal?d?r
 false = Boolean ?emas? false ge�erli de?il
 format = {0}: {1} kal?b? {2} ile e?le?miyor
-id = {0}: {1}, {2} URI'si i�in ge�ersiz bir segmenttir
+id = {0}: {1}, {2} URI''si i�in ge�ersiz bir segmenttir
 items = {0}[{1}]: bu dizinde do?rulay?c? bulunamad?
 maxContains = {0}: {1} i�inde negatif olmayan bir tamsay? olmal?d?r
 maxItems = {0}: dizide en fazla {1} �?e olmal?d?r
@@ -25,19 +25,19 @@ maxLength = {0}: yaln?zca {1} karakter uzunlu?unda olabilir
 maxProperties = {0}: yaln?zca en fazla {1} �zelli?e sahip olabilir
 maximum = {0}: maksimum de?er {1} olmal?d?r
 minContains = {0}: {1} i�inde negatif olmayan bir tamsay? olmal?d?r
-minContainsVsMaxContains = {0}: minContains, {1} i�indeki maxContains'ten k���k veya ona e?it olmal?d?r
+minContainsVsMaxContains = {0}: minContains, {1} i�indeki maxContains''ten k���k veya ona e?it olmal?d?r
 minItems = {0}: dizide en az {1} �?e olmal?d?r
 minLength = {0}: en az {1} karakter uzunlu?unda olmal?d?r
 minProperties = {0}: en az {1} �zellik olmal?d?r
 minimum = {0}: minimum de?er {1} olmal?d?r
-multipleOf = {0}: {1}'in kat? olmal?d?r
+multipleOf = {0}: {1}''in kat? olmal?d?r
 not = {0}: {1} ?emas? i�in ge�erli olmamal?d?r
 notAllowed = {0}.{1}: izin verilmez, ancak verilerde bulunur
 oneOf = {0}: yaln?zca bir ve yaln?zca bir ?ema i�in ge�erli olmal?d?r, ancak {1} ge�erlidir
 pattern = {0}: normal ifade kal?b? {1} ile e?le?miyor
-patternProperties = {0}: 'kal?p �zelliklerinde' baz? hatalar var
+patternProperties = {0}: ''kal?p �zelliklerinde'' baz? hatalar var
 prefixItems = {0}[{1}]: bu dizinde do?rulay?c? bulunamad?
-properties = {0}: '�zellikler' ile ilgili bir hata var
+properties = {0}: ''�zellikler'' ile ilgili bir hata var
 propertyNames = M�lk ad? {0} do?rulama i�in ge�erli de?il: {1}
 readOnly = {0}: salt okunur bir aland?r, de?i?tirilemez
 required = {0}.{1}: eksik ama gerekli
diff --git a/src/main/resources/jsv-messages_uk_UA.properties b/src/main/resources/jsv-messages_uk_UA.properties
index 30e3f6f1d..22c22c814 100644
--- a/src/main/resources/jsv-messages_uk_UA.properties
+++ b/src/main/resources/jsv-messages_uk_UA.properties
@@ -1,4 +1,4 @@
-ref = {0}: містить помилку з 'refs'
+ref = {0}: містить помилку з ''refs''
 additionalProperties = {0}.{1}: не визначено в схемі, і схема не дозволяє додаткові властивості
 allOf = {0}: має бути дійсним для всіх схем {1}
 anyOf = {0}: має бути дійсним для будь-якої зі схем {1}
@@ -11,7 +11,7 @@ dateTime = {0}: {1} є недійсним {2}
 dependencies = {0}: містить помилку із залежностями {1}
 dependentRequired = {0}: має відсутню властивість "{1}", яка є залежною, оскільки присутня "{2}"
 dependentSchemas = {0}: є помилка з dependentSchemas {1}
-edits = {0}: містить помилку з 'edits'
+edits = {0}: містить помилку з ''edits''
 enum = {0}: не має значення в переліку {1}
 exclusiveMaximum = {0}: має мати виняткове максимальне значення {1}
 exclusiveMinimum = {0}: повинно мати виняткове мінімальне значення {1}
diff --git a/src/main/resources/jsv-messages_vi_VN.properties b/src/main/resources/jsv-messages_vi_VN.properties
index c950797fc..81fa75368 100644
--- a/src/main/resources/jsv-messages_vi_VN.properties
+++ b/src/main/resources/jsv-messages_vi_VN.properties
@@ -1,4 +1,4 @@
-$ref = {0}: c� l?i v?i 'refs'
+$ref = {0}: c� l?i v?i ''refs''
 additionalProperties = {0}.{1}: kh�ng ???c x�c ??nh trong l??c ?? v� l??c ?? kh�ng cho ph�p c�c thu?c t�nh b? sung
 allOf = {0}: ph?i h?p l? v?i t?t c? c�c l??c ?? {1}
 anyOf = {0}: ph?i h?p l? v?i b?t k? l??c ?? n�o {1}
@@ -6,12 +6,12 @@ const = {0}: ph?i l
 contains= {0}: kh�ng ch?a ph?n t? v??t qua c�c x�c th?c sau: {2}
 contains.max = {0}: ph?i ch?a �t h?n {1} ph?n t? v??t qua c�c x�c th?c sau: {2}
 contains.min = {0}: ph?i ch?a �t nh?t {1} ph?n t? v??t qua c�c x�c th?c sau: {2}
-crossEdits = {0}: c� l?i v?i 'ch?nh s?a ch�o'
+crossEdits = {0}: c� l?i v?i ''ch?nh s?a ch�o''
 dateTime = {0}: {1} l� {2} kh�ng h?p l?
 dependencies = {0}: c� l?i v?i ph? thu?c {1}
 dependentRequired = {0}: c� thu?c t�nh b? thi?u "{1}" thu?c t�nh ph? thu?c b?t bu?c v� c� "{2}"
 dependentSchemas = {0}: c� l?i v?i ph? thu?cSchemas {1}
-edits = {0}: c� l?i v?i 'ch?nh s?a'
+edits = {0}: c� l?i v?i ''ch?nh s?a''
 enum = {0}: kh�ng c� gi� tr? trong ki?u li?t k� {1}
 exclusiveMaximum = {0}: ph?i c� gi� tr? t?i ?a ??c quy?n l� {1}
 exclusiveMinimum = {0}: ph?i c� gi� tr? t?i thi?u ??c quy?n l� {1}
@@ -35,9 +35,9 @@ not = {0}: kh
 notAllowed = {0}.{1}: kh�ng ???c ph�p nh?ng c� trong d? li?u
 oneOf = {0}: ph?i h?p l? v?i m?t v� ch? m?t l??c ??, nh?ng {1} h?p l?
 pattern = {0}: kh�ng kh?p v?i m?u bi?u th?c ch�nh quy {1}
-patternProperties = {0}: c� m?t s? l?i v?i 'thu?c t�nh m?u'
+patternProperties = {0}: c� m?t s? l?i v?i ''thu?c t�nh m?u''
 prefixItems = {0}[{1}]: kh�ng t�m th?y tr�nh x�c th?c n�o t?i ch? m?c n�y
-properties = {0}: c� l?i v?i 'thu?c t�nh'
+properties = {0}: c� l?i v?i ''thu?c t�nh''
 propertyNames = T�n thu?c t�nh {0} kh�ng h?p l? ?? x�c th?c: {1}
 readOnly = {0}: l� tr??ng ch? ??c, kh�ng thay ??i ???c
 required = {0}.{1}: b? thi?u nh?ng b?t bu?c
diff --git a/src/test/java/com/networknt/schema/Issue898Test.java b/src/test/java/com/networknt/schema/Issue898Test.java
new file mode 100644
index 000000000..ae04e6c82
--- /dev/null
+++ b/src/test/java/com/networknt/schema/Issue898Test.java
@@ -0,0 +1,34 @@
+package com.networknt.schema;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Locale;
+
+import static java.util.stream.Collectors.toList;
+
+class Issue898Test extends BaseJsonSchemaValidatorTest {
+
+    @BeforeAll
+    static void setDefaultLocale() {
+        Locale.setDefault(Locale.FRENCH);
+    }
+
+    @Test
+    void testMessagesWithSingleQuotes() throws Exception {
+        JsonSchema schema = getJsonSchemaFromClasspath("schema/issue898.json", SpecVersion.VersionFlag.V202012);
+        JsonNode node = getJsonNodeFromClasspath("data/issue898.json");
+
+        List<String> messages = schema.validate(node).stream()
+                .map(ValidationMessage::getMessage)
+                .collect(toList());
+
+        Assertions.assertEquals(2, messages.size());
+        Assertions.assertEquals("$.foo: n'a pas de valeur dans l'énumération [foo1, foo2]", messages.get(0));
+        Assertions.assertEquals("$.bar ne correspond pas à l'expression régulière (bar)+", messages.get(1));
+    }
+
+}
diff --git a/src/test/resources/data/issue898.json b/src/test/resources/data/issue898.json
new file mode 100644
index 000000000..1dc70e475
--- /dev/null
+++ b/src/test/resources/data/issue898.json
@@ -0,0 +1,4 @@
+{
+  "foo": "foo3",
+  "bar": "baz"
+}
\ No newline at end of file
diff --git a/src/test/resources/schema/issue898.json b/src/test/resources/schema/issue898.json
new file mode 100644
index 000000000..ab4137c7c
--- /dev/null
+++ b/src/test/resources/schema/issue898.json
@@ -0,0 +1,17 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "type": "object",
+  "properties": {
+    "foo": {
+      "type": "string",
+      "enum": [
+        "foo1",
+        "foo2"
+      ]
+    },
+    "bar": {
+      "type": "string",
+      "pattern": "(bar)+"
+    }
+  }
+}
\ No newline at end of file