From 486cfc8238495549eba1076e1aaae47962e61143 Mon Sep 17 00:00:00 2001
From: Steven Lambert <steven.lambert@deque.com>
Date: Fri, 18 Oct 2019 10:28:54 -0600
Subject: [PATCH] Revert "fix(locales): fix incompeteMessageFallback to be a
 string rather than an object (#1853)"

This reverts commit 88677a93d0ffe32d7305984314a37e623fb51153.
---
 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, 39 insertions(+), 12 deletions(-)

diff --git a/build/tasks/add-locale.js b/build/tasks/add-locale.js
index afe85ec4e8..e3d662841d 100644
--- a/build/tasks/add-locale.js
+++ b/build/tasks/add-locale.js
@@ -62,10 +62,9 @@ module.exports = function(grunt) {
 							return out;
 						}, {}),
 						incompleteFallbackMessage: result.misc.reduce(function(out, misc) {
-							return misc.incompleteFallbackMessage
-								? misc.incompleteFallbackMessage
-								: out;
-						}, '')
+							out[misc.incompleteFallbackMessage] = misc.metadata;
+							return out;
+						}, {})
 					};
 
 					// update locale file if exists
diff --git a/lib/core/base/audit.js b/lib/core/base/audit.js
index 9a27056c20..9567f9fc34 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
+			locale.incompleteFallbackMessage.undefined.failureMessage
 		);
 	}
 
diff --git a/locales/de.json b/locales/de.json
index b96c8e8d64..f840403166 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -619,5 +619,9 @@
 			"failureMessage": "Korrigiere alle der folgenden Punkte:{{~it:value}}\n  {{=value.split('\\n').join('\\n  ')}}{{~}}"
 		}
 	},
-	"incompleteFallbackMessage": ""
+	"incompleteFallbackMessage": {
+		"undefined": {
+			"failureMessage": ""
+		}
+	}
 }
diff --git a/locales/es.json b/locales/es.json
index 69e6fbd55a..00162e69fb 100644
--- a/locales/es.json
+++ b/locales/es.json
@@ -769,5 +769,9 @@
 			"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  ')}}{{~}}"
+	"incompleteFallbackMessage": {
+		"undefined": {
+			"failureMessage": "Corregir (todas) las siguientes incidencias:{{~it:value}}\n  {{=value.split('\\n').join('\\n  ')}}{{~}}"
+		}
+	}
 }
diff --git a/locales/fr.json b/locales/fr.json
index cf01a3e029..ca786fcd4b 100644
--- a/locales/fr.json
+++ b/locales/fr.json
@@ -659,5 +659,9 @@
 			"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  ')}}{{~}}"
+	"incompleteFallbackMessage": {
+		"undefined": {
+			"failureMessage": "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 5cee6cfee2..7f08234cb0 100644
--- a/locales/ja.json
+++ b/locales/ja.json
@@ -778,5 +778,9 @@
 			"failureMessage": "次のすべてを修正します:{{~it:value}}\n  {{=value.split('\\n').join('\\n  ')}}{{~}}"
 		}
 	},
-	"incompleteFallbackMessage": "次のすべてを修正します:{{~it:value}}\n  {{=value.split('\\n').join('\\n  ')}}{{~}}"
+	"incompleteFallbackMessage": {
+		"undefined": {
+			"failureMessage": "次のすべてを修正します:{{~it:value}}\n  {{=value.split('\\n').join('\\n  ')}}{{~}}"
+		}
+	}
 }
diff --git a/locales/nl.json b/locales/nl.json
index 9008261be3..60e3681236 100644
--- a/locales/nl.json
+++ b/locales/nl.json
@@ -32,5 +32,9 @@
 			"failureMessage": "Gebruik een van de volgende oplossingen:{{~it:value}}\n  {{=value.split('\\n').join('\\n  ')}}{{~}}"
 		}
 	},
-	"incompleteFallbackMessage": "axe kon de reden niet vertellen. Tijd om de element inspecteur uit te breken!"
+	"incompleteFallbackMessage": {
+		"undefined": {
+			"failureMessage": "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 8f5e3e15c5..0e771e5c0c 100644
--- a/locales/pt_BR.json
+++ b/locales/pt_BR.json
@@ -769,5 +769,9 @@
 			"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  ')}}{{~}}"
+	"incompleteFallbackMessage": {
+		"undefined": {
+			"failureMessage": "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 98985c5255..83a3865735 100644
--- a/test/core/public/configure.js
+++ b/test/core/public/configure.js
@@ -393,7 +393,11 @@ describe('axe.configure', function() {
 							failureMessage: 'bar'
 						}
 					},
-					incompleteFallbackMessage: 'baz'
+					incompleteFallbackMessage: {
+						undefined: {
+							failureMessage: 'baz'
+						}
+					}
 				}
 			});