FIX: properly handle blank localizations
This commit is contained in:
parent
601a96333a
commit
843c7a21c9
|
@ -106,7 +106,7 @@ function checkExtras(origScope, sep, extras) {
|
||||||
currentScope = scope.shift();
|
currentScope = scope.shift();
|
||||||
messages = messages[currentScope];
|
messages = messages[currentScope];
|
||||||
}
|
}
|
||||||
if (messages) {
|
if (messages !== undefined) {
|
||||||
return messages;
|
return messages;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -139,23 +139,23 @@ I18n.lookup = function(scope, options) {
|
||||||
messages = messages[currentScope];
|
messages = messages[currentScope];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!messages) {
|
if (messages === undefined) {
|
||||||
messages = checkExtras(origScope, this.defaultSeparator, this.extras);
|
messages = checkExtras(origScope, this.defaultSeparator, this.extras);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (!messages) {
|
if (messages === undefined) {
|
||||||
if (I18n.fallbacks) {
|
if (I18n.fallbacks) {
|
||||||
var fallbacks = this.getFallbacks(locale);
|
var fallbacks = this.getFallbacks(locale);
|
||||||
for (var fallback = 0; fallback < fallbacks.length; fallbacks++) {
|
for (var fallback = 0; fallback < fallbacks.length; fallbacks++) {
|
||||||
messages = I18n.lookup(lookupInitialScope, this.prepareOptions({locale: fallbacks[fallback]}, options));
|
messages = I18n.lookup(lookupInitialScope, this.prepareOptions({locale: fallbacks[fallback]}, options));
|
||||||
if (messages) {
|
if (messages !== undefined) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!messages && this.isValidNode(options, "defaultValue")) {
|
if (messages === undefined && this.isValidNode(options, "defaultValue")) {
|
||||||
messages = options.defaultValue;
|
messages = options.defaultValue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue