fix(locales): fix incompeteMessageFallback to be a string rather than…

… an object (#1853)

* fix(aria-allowed-role): allow role combobox on input tel, search, url, and email

* fix(locale structure): structure message correct when building translations

* fix(possible merge conflict): revert the code to negate any merge conflicts

* fix(possible merge conflict): revert the code to negate any merge conflicts

* fix: ci failing due to prior commits

* fix: reverting files due to prior commit

build/tasks/add-locale.js

@@ -62,9 +62,10 @@ module.exports = function(grunt) {
 							return out;
 						}, {}),
 						incompleteFallbackMessage: result.misc.reduce(function(out, misc) {
-							out[misc.incompleteFallbackMessage] = misc.metadata;
-							return out;
-						}, {})
+							return misc.incompleteFallbackMessage
+								? misc.incompleteFallbackMessage
+								: out;
+						}, '')
 					};
 
 					// update locale file if exists

lib/core/base/audit.js

@@ -291,7 +291,7 @@ Audit.prototype.applyLocale = function(locale) {
 	if (locale.incompleteFallbackMessage) {
 		this.data.incompleteFallbackMessage = mergeFallbackMessage(
 			this.data.incompleteFallbackMessage,
-			locale.incompleteFallbackMessage.undefined.failureMessage
+			locale.incompleteFallbackMessage
 		);
 	}
 

locales/de.json

@@ -619,9 +619,5 @@
 			"failureMessage": "Korrigiere alle der folgenden Punkte:{{~it:value}}\n  {{=value.split('\\n').join('\\n  ')}}{{~}}"
 		}
 	},
-	"incompleteFallbackMessage": {
-		"undefined": {
-			"failureMessage": ""
-		}
-	}
+	"incompleteFallbackMessage": ""
 }

locales/es.json

@@ -769,9 +769,5 @@
 			"failureMessage": "Corregir (todas) las siguientes incidencias:{{~it:value}}\n  {{=value.split('\\n').join('\\n  ')}}{{~}}"
 		}
 	},
-	"incompleteFallbackMessage": {
-		"undefined": {
-			"failureMessage": "Corregir (todas) las siguientes incidencias:{{~it:value}}\n  {{=value.split('\\n').join('\\n  ')}}{{~}}"
-		}
-	}
+	"incompleteFallbackMessage": "Corregir (todas) las siguientes incidencias:{{~it:value}}\n  {{=value.split('\\n').join('\\n  ')}}{{~}}"
 }

locales/fr.json

@@ -659,9 +659,5 @@
 			"failureMessage": "Corriger tous les éléments suivants : {{~it:value}}\n  {{=value.split('\\n').join('\\n  ')}}{{~}}"
 		}
 	},
-	"incompleteFallbackMessage": {
-		"undefined": {
-			"failureMessage": "Corriger tous les éléments suivants : {{~it:value}}\n  {{=value.split('\\n').join('\\n  ')}}{{~}}"
-		}
-	}
+	"incompleteFallbackMessage": "Corriger tous les éléments suivants : {{~it:value}}\n  {{=value.split('\\n').join('\\n  ')}}{{~}}"
 }

locales/ja.json

@@ -778,9 +778,5 @@
 			"failureMessage": "次のすべてを修正します:{{~it:value}}\n  {{=value.split('\\n').join('\\n  ')}}{{~}}"
 		}
 	},
-	"incompleteFallbackMessage": {
-		"undefined": {
-			"failureMessage": "次のすべてを修正します:{{~it:value}}\n  {{=value.split('\\n').join('\\n  ')}}{{~}}"
-		}
-	}
+	"incompleteFallbackMessage": "次のすべてを修正します:{{~it:value}}\n  {{=value.split('\\n').join('\\n  ')}}{{~}}"
 }

locales/nl.json

@@ -32,9 +32,5 @@
 			"failureMessage": "Gebruik een van de volgende oplossingen:{{~it:value}}\n  {{=value.split('\\n').join('\\n  ')}}{{~}}"
 		}
 	},
-	"incompleteFallbackMessage": {
-		"undefined": {
-			"failureMessage": "axe kon de reden niet vertellen. Tijd om de element inspecteur uit te breken!"
-		}
-	}
+	"incompleteFallbackMessage": "axe kon de reden niet vertellen. Tijd om de element inspecteur uit te breken!"
 }

locales/pt_BR.json

@@ -769,9 +769,5 @@
 			"failureMessage": "Corrija todos os itens a seguir:{{~it:value}}\n  {{=value.split('\\n').join('\\n  ')}}{{~}}"
 		}
 	},
-	"incompleteFallbackMessage": {
-		"undefined": {
-			"failureMessage": "Corrija todos os itens a seguir:{{~it:value}}\n  {{=value.split('\\n').join('\\n  ')}}{{~}}"
-		}
-	}
+	"incompleteFallbackMessage": "Corrija todos os itens a seguir:{{~it:value}}\n  {{=value.split('\\n').join('\\n  ')}}{{~}}"
 }

test/core/public/configure.js

@@ -393,11 +393,7 @@ describe('axe.configure', function() {
 							failureMessage: 'bar'
 						}
 					},
-					incompleteFallbackMessage: {
-						undefined: {
-							failureMessage: 'baz'
-						}
-					}
+					incompleteFallbackMessage: 'baz'
 				}
 			});