Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(locales): fix incompleteFallbackMessage to be a string rather than an object #1853

Merged
merged 6 commits into from
Oct 18, 2019
7 changes: 4 additions & 3 deletions build/tasks/add-locale.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
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.undefined.failureMessage
locale.incompleteFallbackMessage
);
}

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

Expand Down