Skip to content

Commit 21decbf

Browse files
committed
Fix #458 Translate operator name in "Operator not multiple" message
1 parent a300f98 commit 21decbf

File tree

16 files changed

+34
-17
lines changed

16 files changed

+34
-17
lines changed

src/data.js

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ QueryBuilder.prototype._validateValue = function(rule, value) {
4949

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

@@ -591,6 +591,23 @@ QueryBuilder.prototype.getGroupFlags = function(flags, all) {
591591
}
592592
};
593593

594+
/**
595+
* Retrieve a translation in the `lang` object
596+
* @param {string} [category]
597+
* @param {string} key
598+
* @returns {string}
599+
*/
600+
QueryBuilder.prototype.translate = function(category, key) {
601+
if (!key) {
602+
key = category;
603+
category = undefined;
604+
}
605+
606+
var translation = (category ? this.lang[category] : this.lang)[key] || key;
607+
608+
return this.change('translate', translation, category, key);
609+
};
610+
594611
/**
595612
* Translates a label
596613
* @param {string|object} label

src/i18n/az.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@
5252
"datetime_exceed_min": "{0} sonra olmalıdır",
5353
"datetime_exceed_max": "{0} əvvəl olmalıdır",
5454
"boolean_not_valid": "Loqik olmayan",
55-
"operator_not_multiple": "{0} operatoru çoxlu məna daşımır"
55+
"operator_not_multiple": "\"{1}\" operatoru çoxlu məna daşımır"
5656
}
5757
}

src/i18n/bg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@
5656
"datetime_exceed_min": "Трябва да е след {0}",
5757
"datetime_exceed_max": "Трябва да е преди {0}",
5858
"boolean_not_valid": "Не е булева",
59-
"operator_not_multiple": "Оператора {0} не може да приеме множество стойности"
59+
"operator_not_multiple": "Оператора \"{1}\" не може да приеме множество стойности"
6060
}
6161
}

src/i18n/cs.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@
5252
"datetime_exceed_min": "Musí být po {0}",
5353
"datetime_exceed_max": "Musí být do {0}",
5454
"boolean_not_valid": "Nelogické",
55-
"operator_not_multiple": "Operátor {0} nepodporuje mnoho hodnot"
55+
"operator_not_multiple": "Operátor \"{1}\" nepodporuje mnoho hodnot"
5656
}
5757
}

src/i18n/el.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@
5252
"datetime_exceed_min": "Νεότερο από {0}",
5353
"datetime_exceed_max": "Παλαιότερο από {0}",
5454
"boolean_not_valid": "Δεν είναι BOOLEAN",
55-
"operator_not_multiple": "Η συνθήκη {0} δεν μπορεί να δεχθεί πολλαπλές τιμές"
55+
"operator_not_multiple": "Η συνθήκη \"{1}\" δεν μπορεί να δεχθεί πολλαπλές τιμές"
5656
}
5757
}

src/i18n/en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@
5656
"datetime_exceed_min": "Must be after {0}",
5757
"datetime_exceed_max": "Must be before {0}",
5858
"boolean_not_valid": "Not a boolean",
59-
"operator_not_multiple": "Operator {0} cannot accept multiple values"
59+
"operator_not_multiple": "Operator \"{1}\" cannot accept multiple values"
6060
}
6161
}

src/i18n/fa-IR.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"less_or_equal": "کمتر یا مساوی با",
2222
"greater": "بزرگتر از",
2323
"greater_or_equal": "بزرگتر یا مساوی با",
24-
"between": "مابین",
24+
"between": "مابین",
2525
"begins_with": "شروع شود با",
2626
"not_begins_with": "شروع نشود با",
2727
"contains": "شامل شود",
@@ -55,6 +55,6 @@
5555
"datetime_exceed_min": "باید بعد از {0} باشد",
5656
"datetime_exceed_max": "باید قبل از {0} باشد",
5757
"boolean_not_valid": "مقدار دودویی وارد کنید",
58-
"operator_not_multiple": "اپراتور {0} نمی تواند چند مقدار قبول کند"
58+
"operator_not_multiple": "اپراتور \"{1}\" نمی تواند چند مقدار قبول کند"
5959
}
6060
}

src/i18n/fr.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@
5656
"datetime_exceed_min": "Doit être après {0}",
5757
"datetime_exceed_max": "Doit être avant {0}",
5858
"boolean_not_valid": "N'est pas un booléen",
59-
"operator_not_multiple": "L'opérateur {0} ne peut utiliser plusieurs valeurs"
59+
"operator_not_multiple": "L'opérateur \"{1}\" ne peut utiliser plusieurs valeurs"
6060
}
6161
}

src/i18n/he.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@
5656
"datetime_exceed_min": "התאריך חייב להיות אחרי {0}",
5757
"datetime_exceed_max": "התאריך חייב להיות לפני {0}",
5858
"boolean_not_valid": "זהו לא בוליאני",
59-
"operator_not_multiple": "האופרטור {0} לא יכול לקבל ערכים מרובים"
59+
"operator_not_multiple": "האופרטור \"{1}\" לא יכול לקבל ערכים מרובים"
6060
}
6161
}

src/i18n/pl.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@
5656
"datetime_exceed_min": "Musi być po {0}",
5757
"datetime_exceed_max": "Musi być przed {0}",
5858
"boolean_not_valid": "Niepoprawna wartość logiczna",
59-
"operator_not_multiple": "Operator {0} nie przyjmuje wielu wartości"
59+
"operator_not_multiple": "Operator \"{1}\" nie przyjmuje wielu wartości"
6060
}
6161
}

0 commit comments

Comments
 (0)