Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: properly handle blank localizations

This commit is contained in:
Sam 2016-10-05 18:08:54 +11:00
parent 601a96333a
commit 843c7a21c9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/locales/i18n.js
View File

@ -106,7 +106,7 @@ function checkExtras(origScope, sep, extras) {
currentScope = scope.shift();
messages = messages[currentScope];
}
if (messages) {
if (messages !== undefined) {
return messages;
}
}
@ -139,23 +139,23 @@ I18n.lookup = function(scope, options) {
messages = messages[currentScope];
}
if (!messages) {
if (messages === undefined) {
messages = checkExtras(origScope, this.defaultSeparator, this.extras);
}
if (!messages) {
if (messages === undefined) {
if (I18n.fallbacks) {
var fallbacks = this.getFallbacks(locale);
for (var fallback = 0; fallback < fallbacks.length; fallbacks++) {
messages = I18n.lookup(lookupInitialScope, this.prepareOptions({locale: fallbacks[fallback]}, options));
if (messages) {
if (messages !== undefined) {
break;
}
}
}
if (!messages && this.isValidNode(options, "defaultValue")) {
if (messages === undefined && this.isValidNode(options, "defaultValue")) {
messages = options.defaultValue;
}
}