Skip to content

Commit

Permalink
Merge branch 'master' into feature/service-1668-popup-survey-model
Browse files Browse the repository at this point in the history
  • Loading branch information
dmitry-kurmanov committed Jan 11, 2024
2 parents 8b8c30d + 5498beb commit 553b21e
Show file tree
Hide file tree
Showing 57 changed files with 919 additions and 202 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ Survey.ComponentCollection.Instance.add({
// A unique name; must use lowercase
name: "fullname",
// A display name used in the Toolbox
title: "Full Name",
title: "Full Name",
// A default title for questions created with this question type
defaultQuestionTitle: "Enter your full name:",
// An array of JSON schemas that configure the nested questions
elementsJSON: [
{ type: "text", name: "firstName", title: "First Name", isRequired: true },
Expand Down Expand Up @@ -64,6 +66,7 @@ For example, the Full Name composite question from the previous topic may includ
Survey.ComponentCollection.Instance.add({
name: "fullname",
title: "Full Name",
defaultQuestionTitle: "Enter your full name:",
elementsJSON: [
{ type: "text", name: "firstName", title: "First Name", isRequired: true },
// Optional question, hidden by default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ Survey.ComponentCollection.Instance.add({
name: "country",
// A display name used in the Toolbox
title: "Country",
// A default title for questions created with this question type
defaultQuestionTitle: "Country",
// A JSON schema for the base question type (Dropdown in this case)
questionJSON: {
"type": "dropdown",
Expand Down
11 changes: 11 additions & 0 deletions src/error.ts
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,17 @@ export class RequiredInAllRowsError extends SurveyError {
return this.getLocalizationString("requiredInAllRowsError");
}
}
export class EachRowUniqueError extends SurveyError {
constructor(public text: string, errorOwner: ISurveyErrorOwner = null) {
super(text, errorOwner);
}
public getErrorType(): string {
return "eachrowuniqueeerror";
}
protected getDefaultText(): string {
return this.getLocalizationString("eachRowUniqueError");
}
}
export class MinRowCountError extends SurveyError {
constructor(
public minRowCount: number,
Expand Down
15 changes: 13 additions & 2 deletions src/localization/arabic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export var arabicSurveyStrings = {
requiredError: ".يرجى الإجابة على السؤال",
requiredErrorInPanel: "الرجاء الإجابة على سؤال واحد على الأقل.",
requiredInAllRowsError: "يرجى الإجابة على الأسئلة في جميع الصفوف",
eachRowUniqueError: "يجب أن يكون لكل صف قيمة فريدة.",
numericError: "يجب أن تكون القيمة رقمية.",
minError: "يجب ألا تقل القيمة عن {0}",
maxError: "يجب ألا تزيد القيمة عن {0}",
Expand All @@ -42,6 +43,7 @@ export var arabicSurveyStrings = {
urlRequestError: "طلب إرجاع خطأ '{0}'. {1}ا",
urlGetChoicesError: "عاد طلب البيانات فارغ أو 'المسار' غير صحيح ",
exceedMaxSize: "ينبغي ألا يتجاوز حجم الملف {0}ا",
noUploadFilesHandler: "لا يمكن تحميل الملفات. يرجى إضافة معالج لحدث \"onUploadFiles\".",
otherRequiredError: "الرجاء إدخال قيمة أخرى",
uploadingFile: "تحميل الملف الخاص بك. يرجى الانتظار عدة ثوان والمحاولة لاحقًا",
loadingFile: "جار التحميل...",
Expand All @@ -56,6 +58,8 @@ export var arabicSurveyStrings = {
emptyRowsText: "لا توجد صفوف.",
addPanel: "اضف جديد",
removePanel: "إزالة",
showDetails: "اظهر التفاصيل",
hideDetails: "إخفاء التفاصيل",
choices_Item: "بند",
matrix_column: "عمود",
matrix_row: "صف",
Expand Down Expand Up @@ -94,7 +98,9 @@ export var arabicSurveyStrings = {
more: "أكثر",
tagboxDoneButtonCaption: "موافق",
selectToRankEmptyRankedAreaText: "يتم ترتيب جميع الخيارات",
selectToRankEmptyUnrankedAreaText: "قم بسحب وإسقاط الخيارات هنا لترتيبها"
selectToRankEmptyUnrankedAreaText: "قم بسحب وإسقاط الخيارات هنا لترتيبها",
ok: "موافق",
cancel: "إلغاء الأمر"
};

surveyLocalization.locales["ar"] = arabicSurveyStrings;
Expand Down Expand Up @@ -123,4 +129,9 @@ surveyLocalization.localeNames["ar"] = "العربية";
// selectToRankEmptyUnrankedAreaText: "Drag and drop choices here to rank them" => "قم بسحب وإسقاط الخيارات هنا لترتيبها"// takePhotoCaption: "Take Photo" => "التقاط صورة"
// photoPlaceholder: "Click the button below to take a photo using the camera." => "انقر فوق الزر أدناه لالتقاط صورة باستخدام الكاميرا."
// fileOrPhotoPlaceholder: "Drag and drop or select a file to upload or take a photo using the camera." => "قم بسحب ملف وإفلاته أو تحديده لتحميله أو التقاط صورة باستخدام الكاميرا."
// replaceFileCaption: "Replace file" => "استبدال الملف"
// replaceFileCaption: "Replace file" => "استبدال الملف"// eachRowUniqueError: "Each row must have a unique value." => "يجب أن يكون لكل صف قيمة فريدة."
// noUploadFilesHandler: "Files cannot be uploaded. Please add a handler for the 'onUploadFiles' event." => "لا يمكن تحميل الملفات. يرجى إضافة معالج لحدث \"onUploadFiles\"."
// showDetails: "Show Details" => "اظهر التفاصيل"
// hideDetails: "Hide Details" => "إخفاء التفاصيل"
// ok: "OK" => "موافق"
// cancel: "Cancel" => "إلغاء الأمر"
15 changes: 13 additions & 2 deletions src/localization/basque.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export var basqueSurveyStrings = {
requiredError: "Mesedez, galdera erantzun.",
requiredErrorInPanel: "Mesedez, gutxienez galdera bat erantzun.",
requiredInAllRowsError: "Mesedez, errenkadako galdera guztiak erantzun.",
eachRowUniqueError: "Ilara bakoitzak balio bakarra izan behar du.",
numericError: "Estimazioa zenbakizkoa izan behar du.",
minError: "Balioa ez da {0} baino txikiagoa izan behar",
maxError: "Balioa ez da {0} baino handiagoa izan behar",
Expand All @@ -42,6 +43,7 @@ export var basqueSurveyStrings = {
urlRequestError: "Eskaerak '{0}' errorea itzuli du. {1}",
urlGetChoicesError: "La solicitud regresó vacío de data o la propiedad 'trayectoria' no es correcta",
exceedMaxSize: "Fitxategiaren tamaina ez da {0} baino handiagoa izan behar.",
noUploadFilesHandler: "Artxiboak ezin dira kargatu. Gaineratu kontrolatzaile bat 'onUploadFiles' ekitaldirako.",
otherRequiredError: "Mesedez, beste estimazioa gehitu.",
uploadingFile: "Zure fitxategia igotzen ari da. Mesedez, segundo batzuk itxaron eta saiatu berriro.",
loadingFile: "Kargatzen...",
Expand All @@ -56,6 +58,8 @@ export var basqueSurveyStrings = {
emptyRowsText: "Ez dago errenkadarik.",
addPanel: "Berria gehitu",
removePanel: "Kendu",
showDetails: "Xehetasunak erakutsi",
hideDetails: "Xehetasunak ezkutatu",
choices_Item: "artikulua",
matrix_column: "Zutabea",
matrix_row: "Errenkada",
Expand Down Expand Up @@ -94,7 +98,9 @@ export var basqueSurveyStrings = {
more: "Gehiago",
tagboxDoneButtonCaption: "Ados",
selectToRankEmptyRankedAreaText: "Aukera guztiak sailkatuta daude",
selectToRankEmptyUnrankedAreaText: "Arrastaka eta askatzen ditu hemen sailkatzeko"
selectToRankEmptyUnrankedAreaText: "Arrastaka eta askatzen ditu hemen sailkatzeko",
ok: "Ados",
cancel: "Ezeztatu"
};

surveyLocalization.locales["eu"] = basqueSurveyStrings;
Expand All @@ -116,4 +122,9 @@ surveyLocalization.localeNames["eu"] = "Euskara";
// selectToRankEmptyUnrankedAreaText: "Drag and drop choices here to rank them" => "Arrastaka eta askatzen ditu hemen sailkatzeko"// takePhotoCaption: "Take Photo" => "Argazkia hartu"
// photoPlaceholder: "Click the button below to take a photo using the camera." => "Egin klik beheko botoian, kamerarekin argazki bat hartzeko."
// fileOrPhotoPlaceholder: "Drag and drop or select a file to upload or take a photo using the camera." => "Arrastatu eta askatu artxibo bat kamerarekin argazki bat kargatzeko edo hartzeko."
// replaceFileCaption: "Replace file" => "Artxiboa ordeztu"
// replaceFileCaption: "Replace file" => "Artxiboa ordeztu"// eachRowUniqueError: "Each row must have a unique value." => "Ilara bakoitzak balio bakarra izan behar du."
// noUploadFilesHandler: "Files cannot be uploaded. Please add a handler for the 'onUploadFiles' event." => "Artxiboak ezin dira kargatu. Gaineratu kontrolatzaile bat 'onUploadFiles' ekitaldirako."
// showDetails: "Show Details" => "Xehetasunak erakutsi"
// hideDetails: "Hide Details" => "Xehetasunak ezkutatu"
// ok: "OK" => "Ados"
// cancel: "Cancel" => "Ezeztatu"
15 changes: 13 additions & 2 deletions src/localization/bulgarian.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export var bulgarianStrings = {
requiredError: "Моля, отговорете на следния въпрос.",
requiredErrorInPanel: "Моля, отговорете поне на един от въпросите.",
requiredInAllRowsError: "Моля, отговорете на въпросите на всички редове.",
eachRowUniqueError: "Всеки ред трябва да има уникална стойност.",
numericError: "Стойността следва да бъде число.",
minError: "Стойността не трябва да бъде по-малка от {0}",
maxError: "Стойността не трябва да бъде по-голяма от {0}",
Expand All @@ -42,6 +43,7 @@ export var bulgarianStrings = {
urlRequestError: "Заявката води до грешка '{0}'. {1}",
urlGetChoicesError: "Заявката не връща данни или частта 'path' (път до търсения ресурс на сървъра) е неправилно зададена",
exceedMaxSize: "Размерът на файла следва да не превишава {0}.",
noUploadFilesHandler: "Файловете не могат да бъдат качени. Моля, добавете манипулатор за събитието \"onUploadFiles\".",
otherRequiredError: "Моля, въведете другата стойност.",
uploadingFile: "Вашит файл се зарежда на сървъра. Моля, изчакайте няколко секунди и тогава опитвайте отново.",
loadingFile: "Зареждане...",
Expand All @@ -56,6 +58,8 @@ export var bulgarianStrings = {
emptyRowsText: "Няма редове.",
addPanel: "Добавяне на панел",
removePanel: "Премахване на панел",
showDetails: "Показване на подробни данни",
hideDetails: "Скрий подробните данни",
choices_Item: "елемент",
matrix_column: "Колона",
matrix_row: "Ред",
Expand Down Expand Up @@ -94,7 +98,9 @@ export var bulgarianStrings = {
more: "Още",
tagboxDoneButtonCaption: "Добре",
selectToRankEmptyRankedAreaText: "Всички възможности за избор са класирани",
selectToRankEmptyUnrankedAreaText: "Плъзнете и пуснете опции тук, за да ги класирате"
selectToRankEmptyUnrankedAreaText: "Плъзнете и пуснете опции тук, за да ги класирате",
ok: "Добре",
cancel: "Отмени"
};

surveyLocalization.locales["bg"] = bulgarianStrings;
Expand Down Expand Up @@ -123,4 +129,9 @@ surveyLocalization.localeNames["bg"] = "български";
// selectToRankEmptyUnrankedAreaText: "Drag and drop choices here to rank them" => "Плъзнете и пуснете опции тук, за да ги класирате"// takePhotoCaption: "Take Photo" => "Направете снимка"
// photoPlaceholder: "Click the button below to take a photo using the camera." => "Кликнете върху бутона по-долу, за да направите снимка с помощта на камерата."
// fileOrPhotoPlaceholder: "Drag and drop or select a file to upload or take a photo using the camera." => "Плъзнете и пуснете или изберете файл за качване или правене на снимка с помощта на камерата."
// replaceFileCaption: "Replace file" => "Заместване на файл"
// replaceFileCaption: "Replace file" => "Заместване на файл"// eachRowUniqueError: "Each row must have a unique value." => "Всеки ред трябва да има уникална стойност."
// noUploadFilesHandler: "Files cannot be uploaded. Please add a handler for the 'onUploadFiles' event." => "Файловете не могат да бъдат качени. Моля, добавете манипулатор за събитието \"onUploadFiles\"."
// showDetails: "Show Details" => "Показване на подробни данни"
// hideDetails: "Hide Details" => "Скрий подробните данни"
// ok: "OK" => "Добре"
// cancel: "Cancel" => "Отмени"
15 changes: 13 additions & 2 deletions src/localization/catalan.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export var catalanSurveyStrings = {
requiredError: "Si us plau contesti la pregunta.",
requiredErrorInPanel: "Resposta necessària: respondre almenys una pregunta.",
requiredInAllRowsError: "Si us plau contesti les preguntes de cada filera.",
eachRowUniqueError: "Cada fila ha de tenir un valor únic.",
numericError: "L'estimació ha de ser numèrica.",
minError: "El valor no ha de ser inferior a {0}",
maxError: "El valor no ha de ser superior a {0}",
Expand All @@ -42,6 +43,7 @@ export var catalanSurveyStrings = {
urlRequestError: "La sol·licitud va tornar error '{0}'. {1}",
urlGetChoicesError: "La sol·licitud va tornar buida de dates o la propietat 'trajectòria' no és correcta",
exceedMaxSize: "La mida de l'arxiu no pot excedir {0}.",
noUploadFilesHandler: "No es poden carregar fitxers. Afegiu un controlador per a l'esdeveniment 'onUploadFiles'.",
otherRequiredError: "Si us plau afegiu l'altra estimació.",
uploadingFile: "El seu arxiu s'està pujant. Si us plau esperi uns segons i intenteu-ho de nou.",
loadingFile: "Càrrega...",
Expand All @@ -56,6 +58,8 @@ export var catalanSurveyStrings = {
emptyRowsText: "No hi ha files.",
addPanel: "Afegeix un nou",
removePanel: "Treure",
showDetails: "Mostra els detalls",
hideDetails: "Amaga els detalls",
choices_Item: "ítem",
matrix_column: "Columna",
matrix_row: "Filera",
Expand Down Expand Up @@ -94,7 +98,9 @@ export var catalanSurveyStrings = {
more: "Més",
tagboxDoneButtonCaption: "D'ACORD",
selectToRankEmptyRankedAreaText: "Totes les opcions estan classificades",
selectToRankEmptyUnrankedAreaText: "Arrossegueu i deixeu anar les opcions aquí per classificar-les"
selectToRankEmptyUnrankedAreaText: "Arrossegueu i deixeu anar les opcions aquí per classificar-les",
ok: "D'ACORD",
cancel: "Cancel·lar"
};

surveyLocalization.locales["ca"] = catalanSurveyStrings;
Expand Down Expand Up @@ -163,4 +169,9 @@ surveyLocalization.localeNames["ca"] = "català";
// selectToRankEmptyUnrankedAreaText: "Drag and drop choices here to rank them" => "Arrossegueu i deixeu anar les opcions aquí per classificar-les"// takePhotoCaption: "Take Photo" => "Fer foto"
// photoPlaceholder: "Click the button below to take a photo using the camera." => "Feu clic al botó següent per fer una foto amb la càmera."
// fileOrPhotoPlaceholder: "Drag and drop or select a file to upload or take a photo using the camera." => "Arrossegueu i deixeu anar o seleccioneu un fitxer per penjar-lo o fer-ne una foto amb la càmera."
// replaceFileCaption: "Replace file" => "Substitueix el fitxer"
// replaceFileCaption: "Replace file" => "Substitueix el fitxer"// eachRowUniqueError: "Each row must have a unique value." => "Cada fila ha de tenir un valor únic."
// noUploadFilesHandler: "Files cannot be uploaded. Please add a handler for the 'onUploadFiles' event." => "No es poden carregar fitxers. Afegiu un controlador per a l'esdeveniment 'onUploadFiles'."
// showDetails: "Show Details" => "Mostra els detalls"
// hideDetails: "Hide Details" => "Amaga els detalls"
// ok: "OK" => "D'ACORD"
// cancel: "Cancel" => "Cancel·lar"
15 changes: 13 additions & 2 deletions src/localization/croatian.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export var croatianStrings = {
requiredError: "Molim vas odgovorite na pitanje.",
requiredErrorInPanel: "Molim vas odgovorite na barem jedno pitanje.",
requiredInAllRowsError: "Odgovorite na pitanja u svim redovima.",
eachRowUniqueError: "Svaki redak mora imati jedinstvenu vrijednost.",
numericError: "Vrijednost bi trebala biti brojčana.",
minError: "Vrijednost ne smije biti manja od {0}",
maxError: "Vrijednost ne smije biti veća od {0}",
Expand All @@ -42,6 +43,7 @@ export var croatianStrings = {
urlRequestError: "Zahtjev vratio pogrešku '{0}'. {1}",
urlGetChoicesError: "Zahtjev je vratio prazne podatke ili je 'path' svojstvo netočna.",
exceedMaxSize: "Veličina datoteke ne smije prelaziti {0}.",
noUploadFilesHandler: "Datoteke se ne mogu prenijeti. Dodajte rukovatelja za događaj 'onUploadFiles'.",
otherRequiredError: "Unesite drugu vrijednost.",
uploadingFile: "Vaša datoteka se prenosi. Pričekajte nekoliko sekundi i pokušajte ponovno.",
loadingFile: "Učitavanje...",
Expand All @@ -56,6 +58,8 @@ export var croatianStrings = {
emptyRowsText: "Nema redova.",
addPanel: "Dodavanje novih",
removePanel: "Ukloniti",
showDetails: "Pokaži detalje",
hideDetails: "Sakrij detalje",
choices_Item: "stavku",
matrix_column: "Stupca",
matrix_row: "Redak",
Expand Down Expand Up @@ -94,7 +98,9 @@ export var croatianStrings = {
more: "Više",
tagboxDoneButtonCaption: "OK",
selectToRankEmptyRankedAreaText: "Svi izbori su rangirani",
selectToRankEmptyUnrankedAreaText: "Ovdje povucite i ispustite odabire da biste ih rangirali"
selectToRankEmptyUnrankedAreaText: "Ovdje povucite i ispustite odabire da biste ih rangirali",
ok: "OK",
cancel: "Otkazati"
};

surveyLocalization.locales["hr"] = croatianStrings;
Expand All @@ -121,4 +127,9 @@ surveyLocalization.localeNames["hr"] = "hrvatski";
// selectToRankEmptyUnrankedAreaText: "Drag and drop choices here to rank them" => "Ovdje povucite i ispustite odabire da biste ih rangirali"// takePhotoCaption: "Take Photo" => "Snimi fotografiju"
// photoPlaceholder: "Click the button below to take a photo using the camera." => "Kliknite donji gumb da biste snimili fotografiju pomoću kamere."
// fileOrPhotoPlaceholder: "Drag and drop or select a file to upload or take a photo using the camera." => "Povucite i ispustite ili odaberite datoteku za prijenos ili snimanje fotografije pomoću kamere."
// replaceFileCaption: "Replace file" => "Zamijeni datoteku"
// replaceFileCaption: "Replace file" => "Zamijeni datoteku"// eachRowUniqueError: "Each row must have a unique value." => "Svaki redak mora imati jedinstvenu vrijednost."
// noUploadFilesHandler: "Files cannot be uploaded. Please add a handler for the 'onUploadFiles' event." => "Datoteke se ne mogu prenijeti. Dodajte rukovatelja za događaj 'onUploadFiles'."
// showDetails: "Show Details" => "Pokaži detalje"
// hideDetails: "Hide Details" => "Sakrij detalje"
// ok: "OK" => "OK"
// cancel: "Cancel" => "Otkazati"
Loading

0 comments on commit 553b21e

Please sign in to comment.