IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Handle missing plural keys on client

Browse Source
This commit is contained in:
Gerhard Schlager
2019-06-06 17:43:12 +02:00
parent f88dced0b7
commit d1228f47bb
2 changed files with 51 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,39 +131,47 @@ I18n.interpolate = function(message, options) {
I18n.translate = function(scope, options) {
options = this.prepareOptions(options);
options.needsPluralization = typeof options.count === "number";
options.ignoreMissing = !this.noFallbacks;
var translation = this.lookup(scope, options);
var translation = this.findTranslation(scope, options);
if (!this.noFallbacks) {
if (!translation && this.fallbackLocale) {
options.locale = this.fallbackLocale;
translation = this.lookup(scope, options);
translation = this.findTranslation(scope, options);
}
options.ignoreMissing = false;
if (!translation && this.currentLocale() !== this.defaultLocale) {
options.locale = this.defaultLocale;
translation = this.lookup(scope, options);
translation = this.findTranslation(scope, options);
}
if (!translation && this.currentLocale() !== 'en') {
options.locale = 'en';
translation = this.lookup(scope, options);
translation = this.findTranslation(scope, options);
}
}
try {
if (typeof translation === "object") {
if (typeof options.count === "number") {
return this.pluralize(translation, scope, options);
} else {
return translation;
}
} else {
return this.interpolate(translation, options);
}
return this.interpolate(translation, options);
} catch (error) {
return this.missingTranslation(scope);
}
};
I18n.findTranslation = function(scope, options) {
var translation = this.lookup(scope, options);
if (translation && options.needsPluralization) {
translation = this.pluralize(translation, scope, options);
}
return translation;
};
I18n.toNumber = function(number, options) {
options = this.prepareOptions(
options,
@@ -260,6 +268,8 @@ I18n.findAndTranslateValidNode = function(keys, translation) {
};
I18n.pluralize = function(translation, scope, options) {
if (typeof translation !== "object") return translation;
options = this.prepareOptions(options);
var count = options.count.toString();
@@ -268,9 +278,12 @@ I18n.pluralize = function(translation, scope, options) {
var keys = ((typeof key === "object") && (key instanceof Array)) ? key : [key];
var message = this.findAndTranslateValidNode(keys, translation);
if (message == null) message = this.missingTranslation(scope, keys[0]);
return this.interpolate(message, options);
if (message !== null || options.ignoreMissing) {
return message;
}
return this.missingTranslation(scope, keys[0]);
};
I18n.missingTranslation = function(scope, key) {