Skip to content

Commit

Permalink
Revert "fix(locales): fix incompeteMessageFallback to be a string rat…
Browse files Browse the repository at this point in the history
…her than an object (#1853)"

This reverts commit 88677a9.
  • Loading branch information
straker committed Oct 18, 2019
1 parent 88677a9 commit 486cfc8
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 12 deletions.
7 changes: 3 additions & 4 deletions build/tasks/add-locale.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/core/base/audit.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
);
}

Expand Down
6 changes: 5 additions & 1 deletion locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -619,5 +619,9 @@
"failureMessage": "Korrigiere alle der folgenden Punkte:{{~it:value}}\n {{=value.split('\\n').join('\\n ')}}{{~}}"
}
},
"incompleteFallbackMessage": ""
"incompleteFallbackMessage": {
"undefined": {
"failureMessage": ""
}
}
}
6 changes: 5 additions & 1 deletion locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ')}}{{~}}"
}
}
}
6 changes: 5 additions & 1 deletion locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ')}}{{~}}"
}
}
}
6 changes: 5 additions & 1 deletion locales/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ')}}{{~}}"
}
}
}
6 changes: 5 additions & 1 deletion locales/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -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!"
}
}
}
6 changes: 5 additions & 1 deletion locales/pt_BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ')}}{{~}}"
}
}
}
6 changes: 5 additions & 1 deletion test/core/public/configure.js
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,11 @@ describe('axe.configure', function() {
failureMessage: 'bar'
}
},
incompleteFallbackMessage: 'baz'
incompleteFallbackMessage: {
undefined: {
failureMessage: 'baz'
}
}
}
});

Expand Down

0 comments on commit 486cfc8

Please sign in to comment.