From 88677a93d0ffe32d7305984314a37e623fb51153 Mon Sep 17 00:00:00 2001
From: Michael <45568605+michael-siek@users.noreply.github.com>
Date: Fri, 18 Oct 2019 12:13:59 -0400
Subject: [PATCH] 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     | 7 ++++---
 lib/core/base/audit.js        | 2 +-
 locales/de.json               | 6 +-----
 locales/es.json               | 6 +-----
 locales/fr.json               | 6 +-----
 locales/ja.json               | 6 +-----
 locales/nl.json               | 6 +-----
 locales/pt_BR.json            | 6 +-----
 test/core/public/configure.js | 6 +-----
 9 files changed, 12 insertions(+), 39 deletions(-)

diff --git a/build/tasks/add-locale.js b/build/tasks/add-locale.js
index e3d662841d..afe85ec4e8 100644
--- a/build/tasks/add-locale.js
+++ b/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
diff --git a/lib/core/base/audit.js b/lib/core/base/audit.js
index 9567f9fc34..9a27056c20 100644
--- a/lib/core/base/audit.js
+++ b/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
 		);
 	}
 
diff --git a/locales/de.json b/locales/de.json
index f840403166..b96c8e8d64 100644
--- a/locales/de.json
+++ b/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": ""
 }
diff --git a/locales/es.json b/locales/es.json
index 00162e69fb..69e6fbd55a 100644
--- a/locales/es.json
+++ b/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  ')}}{{~}}"
 }
diff --git a/locales/fr.json b/locales/fr.json
index ca786fcd4b..cf01a3e029 100644
--- a/locales/fr.json
+++ b/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  ')}}{{~}}"
 }
diff --git a/locales/ja.json b/locales/ja.json
index 7f08234cb0..5cee6cfee2 100644
--- a/locales/ja.json
+++ b/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  ')}}{{~}}"
 }
diff --git a/locales/nl.json b/locales/nl.json
index 60e3681236..9008261be3 100644
--- a/locales/nl.json
+++ b/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!"
 }
diff --git a/locales/pt_BR.json b/locales/pt_BR.json
index 0e771e5c0c..8f5e3e15c5 100644
--- a/locales/pt_BR.json
+++ b/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  ')}}{{~}}"
 }
diff --git a/test/core/public/configure.js b/test/core/public/configure.js
index 83a3865735..98985c5255 100644
--- a/test/core/public/configure.js
+++ b/test/core/public/configure.js
@@ -393,11 +393,7 @@ describe('axe.configure', function() {
 							failureMessage: 'bar'
 						}
 					},
-					incompleteFallbackMessage: {
-						undefined: {
-							failureMessage: 'baz'
-						}
-					}
+					incompleteFallbackMessage: 'baz'
 				}
 			});