Skip to content

Commit

Permalink
Fix #458 Translate operator name in "Operator not multiple" message
Browse files Browse the repository at this point in the history
  • Loading branch information
mistic100 committed Mar 31, 2017
1 parent a300f98 commit 15204c0
Show file tree
Hide file tree
Showing 16 changed files with 34 additions and 17 deletions.
19 changes: 18 additions & 1 deletion src/data.js
Expand Up @@ -49,7 +49,7 @@ QueryBuilder.prototype._validateValue = function(rule, value) {

for (var i = 0; i < operator.nb_inputs; i++) {
if (!operator.multiple && $.isArray(value[i]) && value[i].length > 1) {
result = ['operator_not_multiple', operator.type];
result = ['operator_not_multiple', operator.type, this.translate('operators', operator.type)];
break;
}

Expand Down Expand Up @@ -591,6 +591,23 @@ QueryBuilder.prototype.getGroupFlags = function(flags, all) {
}
};

/**
* Retrieve a translation in the `lang` object
* @param {string} [category]
* @param {string} key
* @returns {string}
*/
QueryBuilder.prototype.translate = function(category, key) {
if (!key) {
key = category;
category = undefined;
}

var translation = (category ? this.lang[category] : this.lang)[key];

return this.change('translate', translation, category, key);
};

/**
* Translates a label
* @param {string|object} label
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/az.json
Expand Up @@ -52,6 +52,6 @@
"datetime_exceed_min": "{0} sonra olmalıdır",
"datetime_exceed_max": "{0} əvvəl olmalıdır",
"boolean_not_valid": "Loqik olmayan",
"operator_not_multiple": "{0} operatoru çoxlu məna daşımır"
"operator_not_multiple": "\"{1}\" operatoru çoxlu məna daşımır"
}
}
2 changes: 1 addition & 1 deletion src/i18n/bg.json
Expand Up @@ -56,6 +56,6 @@
"datetime_exceed_min": "Трябва да е след {0}",
"datetime_exceed_max": "Трябва да е преди {0}",
"boolean_not_valid": "Не е булева",
"operator_not_multiple": "Оператора {0} не може да приеме множество стойности"
"operator_not_multiple": "Оператора \"{1}\" не може да приеме множество стойности"
}
}
2 changes: 1 addition & 1 deletion src/i18n/cs.json
Expand Up @@ -52,6 +52,6 @@
"datetime_exceed_min": "Musí být po {0}",
"datetime_exceed_max": "Musí být do {0}",
"boolean_not_valid": "Nelogické",
"operator_not_multiple": "Operátor {0} nepodporuje mnoho hodnot"
"operator_not_multiple": "Operátor \"{1}\" nepodporuje mnoho hodnot"
}
}
2 changes: 1 addition & 1 deletion src/i18n/el.json
Expand Up @@ -52,6 +52,6 @@
"datetime_exceed_min": "Νεότερο από {0}",
"datetime_exceed_max": "Παλαιότερο από {0}",
"boolean_not_valid": "Δεν είναι BOOLEAN",
"operator_not_multiple": "Η συνθήκη {0} δεν μπορεί να δεχθεί πολλαπλές τιμές"
"operator_not_multiple": "Η συνθήκη \"{1}\" δεν μπορεί να δεχθεί πολλαπλές τιμές"
}
}
2 changes: 1 addition & 1 deletion src/i18n/en.json
Expand Up @@ -56,6 +56,6 @@
"datetime_exceed_min": "Must be after {0}",
"datetime_exceed_max": "Must be before {0}",
"boolean_not_valid": "Not a boolean",
"operator_not_multiple": "Operator {0} cannot accept multiple values"
"operator_not_multiple": "Operator \"{1}\" cannot accept multiple values"
}
}
4 changes: 2 additions & 2 deletions src/i18n/fa-IR.json
Expand Up @@ -21,7 +21,7 @@
"less_or_equal": "کمتر یا مساوی با",
"greater": "بزرگتر از",
"greater_or_equal": "بزرگتر یا مساوی با",
"between": "مابین",
"between": "مابین",
"begins_with": "شروع شود با",
"not_begins_with": "شروع نشود با",
"contains": "شامل شود",
Expand Down Expand Up @@ -55,6 +55,6 @@
"datetime_exceed_min": "باید بعد از {0} باشد",
"datetime_exceed_max": "باید قبل از {0} باشد",
"boolean_not_valid": "مقدار دودویی وارد کنید",
"operator_not_multiple": "اپراتور {0} نمی تواند چند مقدار قبول کند"
"operator_not_multiple": "اپراتور \"{1}\" نمی تواند چند مقدار قبول کند"
}
}
2 changes: 1 addition & 1 deletion src/i18n/fr.json
Expand Up @@ -56,6 +56,6 @@
"datetime_exceed_min": "Doit être après {0}",
"datetime_exceed_max": "Doit être avant {0}",
"boolean_not_valid": "N'est pas un booléen",
"operator_not_multiple": "L'opérateur {0} ne peut utiliser plusieurs valeurs"
"operator_not_multiple": "L'opérateur \"{1}\" ne peut utiliser plusieurs valeurs"
}
}
2 changes: 1 addition & 1 deletion src/i18n/he.json
Expand Up @@ -56,6 +56,6 @@
"datetime_exceed_min": "התאריך חייב להיות אחרי {0}",
"datetime_exceed_max": "התאריך חייב להיות לפני {0}",
"boolean_not_valid": "זהו לא בוליאני",
"operator_not_multiple": "האופרטור {0} לא יכול לקבל ערכים מרובים"
"operator_not_multiple": "האופרטור \"{1}\" לא יכול לקבל ערכים מרובים"
}
}
2 changes: 1 addition & 1 deletion src/i18n/pl.json
Expand Up @@ -56,6 +56,6 @@
"datetime_exceed_min": "Musi być po {0}",
"datetime_exceed_max": "Musi być przed {0}",
"boolean_not_valid": "Niepoprawna wartość logiczna",
"operator_not_multiple": "Operator {0} nie przyjmuje wielu wartości"
"operator_not_multiple": "Operator \"{1}\" nie przyjmuje wielu wartości"
}
}
2 changes: 1 addition & 1 deletion src/i18n/pt-BR.json
Expand Up @@ -56,6 +56,6 @@
"datetime_exceed_max": "É necessário ser inferior a {0}",
"datetime_empty": "Nenhuma data selecionada",
"boolean_not_valid": "Não é um valor booleano",
"operator_not_multiple": "O operador {0} não aceita valores múltiplos"
"operator_not_multiple": "O operador \"{1}\" não aceita valores múltiplos"
}
}
2 changes: 1 addition & 1 deletion src/i18n/ru.json
Expand Up @@ -54,6 +54,6 @@
"datetime_exceed_min": "Должно быть, после {0}",
"datetime_exceed_max": "Должно быть, до {0}",
"boolean_not_valid": "Не логическое",
"operator_not_multiple": "Оператор {0} не поддерживает много значений"
"operator_not_multiple": "Оператор \"{1}\" не поддерживает много значений"
}
}
2 changes: 1 addition & 1 deletion src/i18n/sq.json
Expand Up @@ -55,6 +55,6 @@
"datetime_exceed_min": "Duhet të jetë pas {0}",
"datetime_exceed_max": "Duhet të jetë para {0}",
"boolean_not_valid": "Nuk është boolean",
"operator_not_multiple": "Operatori {0} nuk mund të pranojë vlera të shumëfishta"
"operator_not_multiple": "Operatori \"{1}\" nuk mund të pranojë vlera të shumëfishta"
}
}
2 changes: 1 addition & 1 deletion src/i18n/tr.json
Expand Up @@ -56,6 +56,6 @@
"datetime_exceed_min": "{0} Tarihinden daha sonrası olmalı.",
"datetime_exceed_max": "{0} Tarihinden daha öncesi olmalı.",
"boolean_not_valid": "Değer Doğru/Yanlış(bool) olmalı",
"operator_not_multiple": "Operatör {0} birden fazla değer kabul etmiyor"
"operator_not_multiple": "Operatör \"{1}\" birden fazla değer kabul etmiyor"
}
}
2 changes: 1 addition & 1 deletion src/i18n/ua.json
Expand Up @@ -52,6 +52,6 @@
"datetime_exceed_min": "Повинне бути, після {0}",
"datetime_exceed_max": "Повинне бути, до {0}",
"boolean_not_valid": "Не логічне",
"operator_not_multiple": "Оператор {0} не підтримує багато значень"
"operator_not_multiple": "Оператор \"{1}\" не підтримує багато значень"
}
}
2 changes: 1 addition & 1 deletion src/i18n/zh-CN.json
Expand Up @@ -56,6 +56,6 @@
"datetime_exceed_min": "必须在{0}之后",
"datetime_exceed_max": "必须在{0}之前",
"boolean_not_valid": "不是布尔值",
"operator_not_multiple": "选项{0}无法接受多个值"
"operator_not_multiple": "选项\"{1}\"无法接受多个值"
}
}

0 comments on commit 15204c0

Please sign in to comment.