Skip to content

Commit b97a34f

Browse files
rismehtarismehta
committed
Merge branch 'master' into master_650-2407
2 parents 4c98761 + a0573da commit b97a34f

File tree

15 files changed

+139
-93
lines changed

15 files changed

+139
-93
lines changed

‎ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/de.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"FileNameInvalid": "Hängen Sie keine Dateien an, deren Dateiname mit (.) beginnt, \\ / : * ? \" < > | ; % oder $ enthält oder ein reserviertes Schlüsselwort wie nul, prn, con, lpt oder com ist.",
55
"FileMimeTypeInvalid": "Datei(en) ${0} ist/sind nicht unterstützte(r) Dateityp(en)",
66
"InternalFormSubmissionError": "Beim Übermitteln des Formulars ist ein interner Fehler aufgetreten.",
7-
"FileSizeZero": "Die hochgeladenen Dateien ${0} sind leer. Stellen Sie sicher, dass Sie Dateien mit Inhalt hochladen.",
7+
"FileSizeZero": "Die hochgeladenen Dateien „${0}“ sind leer. Stellen Sie sicher, dass Sie Dateien mit Inhalt hochladen.",
88
"type": "Bitte geben Sie einen gültigen Wert ein.",
99
"required": "Bitte füllen Sie dieses Feld aus.",
1010
"minimum": "Der Wert muss größer als oder gleich ${0} sein.",
@@ -86,12 +86,12 @@
8686
"more": "mehr",
8787
"less": "weniger"
8888
},
89-
"saveDraftSuccessMessage" : "Der Entwurf wurde erfolgreich gespeichert.",
90-
"saveDraftErrorMessage" : "Es ist ein Fehler aufgetreten, der uns daran gehindert hat, Ihren Entwurf zu speichern. Bitte versuchen Sie es erneut.",
91-
"signature": "Unterschrift",
92-
"SignatureCanvas": "Signatur-Leinwand",
93-
"clearSign": "Klare Signatur",
94-
"brushSize": "Pinselgröße:",
95-
"geoLocationError": "Fehler beim Abrufen der Geolokalisierung",
96-
"geoLocationFetch": "Geostandort wird abgerufen ..."
97-
}
89+
"saveDraftSuccessMessage": "Der Entwurf wurde erfolgreich gespeichert.",
90+
"saveDraftErrorMessage": "Aufgrund eines Fehlers konnte der Entwurf nicht gespeichert werden. Bitte versuchen Sie es erneut.",
91+
"signature": "Signatur",
92+
"SignatureCanvas": "Signaturarbeitsfläche",
93+
"clearSign": "Unterschrift löschen",
94+
"brushSize": "Pinselgröße: ",
95+
"geoLocationError": "Fehler beim Aufrufen des geografischen Standorts",
96+
"geoLocationFetch": "Geografischer Standort wird abgerufen …"
97+
}

‎ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/es.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"FileNameInvalid": "No adjunte archivos cuyo nombre comience con (.), contenga \\ / : * ? \" < > | ; % $, o sea una palabra clave reservada como nul, prn, con, lpt o com.",
55
"FileMimeTypeInvalid": "Los tipos de archivo ${0} no son compatibles",
66
"InternalFormSubmissionError": "Error interno al enviar el formulario.",
7-
"FileSizeZero": "Los archivos subidos ${0} están vacíos. Asegúrate de que estén subiendo archivos con contenido",
7+
"FileSizeZero": "Los archivos cargados ${0} están vacíos. Asegúrese de cargar archivos con contenido.",
88
"type": "Introduzca un valor válido.",
99
"required": "Rellene este campo.",
1010
"minimum": "El valor debe ser mayor que o igual a ${0}.",
@@ -86,12 +86,12 @@
8686
"more": "más",
8787
"less": "menos"
8888
},
89-
"saveDraftSuccessMessage" : "El borrador se guarda correctamente.",
90-
"saveDraftErrorMessage" : "Hubo un error que nos impidió guardar su borrador. Por favor inténtalo de nuevo.",
89+
"saveDraftSuccessMessage": "El borrador se ha guardado correctamente.",
90+
"saveDraftErrorMessage": "Se ha producido un error que impide guardar el borrador. Inténtelo de nuevo.",
9191
"signature": "Firma",
9292
"SignatureCanvas": "Lienzo de firma",
9393
"clearSign": "Borrar firma",
94-
"brushSize": "Tamaño del pincel:",
95-
"geoLocationError": "Error al obtener la geolocalización",
96-
"geoLocationFetch": "Obteniendo ubicación geográfica..."
94+
"brushSize": "Tamaño de pincel: ",
95+
"geoLocationError": "Error al obtener la localización geográfica",
96+
"geoLocationFetch": "Obteniendo localización geográfica…"
9797
}

‎ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/fr.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"FileCloseAccessText": "Appuyer sur Entrée pour supprimer le fichier ",
3-
"FileSizeGreater": "${0} fichier(s) dépasse(nt) la taille attendue : ${1} Mo.",
3+
"FileSizeGreater": "${0} fichier(s) dépasse(nt) la taille attendue : ${1} Mo.",
44
"FileNameInvalid": "Ne joignez pas de fichiers dont le nom commence par (.), contient \\ / : * ? \" < > | ; % $, ou est un mot-clé réservé comme nul, prn, con, lpt ou com.",
55
"FileMimeTypeInvalid": "Le ou les fichiers ${0} sont des types de fichiers non pris en charge",
66
"InternalFormSubmissionError": "Une erreur interne s'est produite lors de l'envoi du formulaire.",
7-
"FileSizeZero": "Les fichiers téléchargés ${0} sont vides. Assurez-vous de télécharger des fichiers avec du contenu.",
7+
"FileSizeZero": "Le ou les fichiers chargés ${0} sont vides. Assurez-vous de charger un ou plusieurs fichiers avec du contenu.",
88
"type": "Saisissez une valeur valide.",
99
"required": "Remplissez ce champ.",
1010
"minimum": "La valeur doit être supérieure ou égale à ${0}.",
@@ -86,12 +86,12 @@
8686
"more": "plus",
8787
"less": "moins"
8888
},
89-
"saveDraftSuccessMessage" : "Le brouillon est enregistré avec succès.",
90-
"saveDraftErrorMessage" : "Une erreur s'est produite nous empêchant d'enregistrer votre brouillon. Veuillez réessayer.",
89+
"saveDraftSuccessMessage": "Le brouillon a été enregistré.",
90+
"saveDraftErrorMessage": "Une erreur nous a empêchés d’enregistrer votre brouillon. Réessayez.",
9191
"signature": "Signature",
92-
"SignatureCanvas": "Toile emblématique",
93-
"clearSign": "Signature claire",
94-
"brushSize": "Taille du pinceau :",
92+
"SignatureCanvas": "Zone de travail de signature",
93+
"clearSign": "Effacer la signature",
94+
"brushSize": "Épaisseur du pinceau : ",
9595
"geoLocationError": "Erreur lors de la récupération de la géolocalisation",
9696
"geoLocationFetch": "Récupération de la géolocalisation..."
9797
}

‎ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/it.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"FileNameInvalid": "Non allegare file il cui nome inizia con (.), contiene \\ / : * ? \" < > | ; % $ oppure è una parola chiave riservata come nul, prn, con, lpt o com.",
55
"FileMimeTypeInvalid": "I file ${0} non sono tipi di file supportati",
66
"InternalFormSubmissionError": "Errore interno durante l'invio del modulo.",
7-
"FileSizeZero": "Il/I file caricati ${0} sono vuoti. Assicurati di caricare file con contenuto.",
7+
"FileSizeZero": "I file caricati ${0} sono vuoti. Assicurati di caricare file con contenuti.",
88
"type": "Immetti un valore valido.",
99
"required": "Compila questo campo.",
1010
"minimum": "Il valore deve essere maggiore di o uguale a ${0}.",
@@ -86,12 +86,12 @@
8686
"more": "più",
8787
"less": "meno"
8888
},
89-
"saveDraftSuccessMessage" : "La bozza è stata salvata con successo.",
90-
"saveDraftErrorMessage" : "Si è verificato un errore che ci ha impedito di salvare la tua bozza. Per favore riprova.",
89+
"saveDraftSuccessMessage": "La bozza è stata salvata correttamente.",
90+
"saveDraftErrorMessage": "Si è verificato un errore che ha impedito di salvare la bozza. Riprova.",
9191
"signature": "Firma",
92-
"SignatureCanvas": "Tela firmata",
93-
"clearSign": "Firma chiara",
94-
"brushSize": "Dimensione del pennello:",
95-
"geoLocationError": "Errore durante il recupero della geolocalizzazione",
96-
"geoLocationFetch": "Recupero della posizione geografica in corso..."
92+
"SignatureCanvas": "Area di lavoro firma",
93+
"clearSign": "Cancella firma",
94+
"brushSize": "Dimensione pennello: ",
95+
"geoLocationError": "Errore nel recupero della geolocalizzazione",
96+
"geoLocationFetch": "Recupero geolocalizzazione in corso..."
9797
}

‎ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/ja.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"FileNameInvalid": "ファイル名が (.) で始まる、\\ / : * ? \" < > | ; % $ を含む、または nul、prn、con、lpt、com などの予約キーワードを含むファイルは添付しないでください。",
55
"FileMimeTypeInvalid": "${0} ファイルの形式はサポートされていません",
66
"InternalFormSubmissionError": "フォームを送信中に内部エラーが発生しました。",
7-
"FileSizeZero": "アップロードされたファイル ${0} は空です。コンテンツのあるファイルをアップロードしていることを確認してください。",
7+
"FileSizeZero": "アップロードされたファイル ${0} は空です。コンテンツを含むファイルをアップロードしていることを確認してください。",
88
"type": "有効な値を入力してください。",
99
"required": "このフィールドに入力してください。",
1010
"minimum": "値は ${0} 以上にする必要があります。",
@@ -86,12 +86,12 @@
8686
"more": "さらに表示",
8787
"less": "表示を減らす"
8888
},
89-
"saveDraftSuccessMessage" : "下書きは正常に保存されました。",
90-
"saveDraftErrorMessage" : "エラーが発生したため、下書きを保存できませんでした。もう一度試してください。",
91-
"signature": "サイン",
92-
"SignatureCanvas": "シグネチャーキャンバス",
93-
"clearSign": "明確な署名",
94-
"brushSize": "ブラシサイズ:",
89+
"saveDraftSuccessMessage": "下書きが正常に保存されました。",
90+
"saveDraftErrorMessage": "下書きを保存できないエラーが発生しました。もう一度試してください。",
91+
"signature": "署名",
92+
"SignatureCanvas": "署名キャンバス",
93+
"clearSign": "署名をクリア",
94+
"brushSize": "ブラシサイズ :",
9595
"geoLocationError": "位置情報の取得中にエラーが発生しました",
96-
"geoLocationFetch": "地理的位置を取得しています..."
96+
"geoLocationFetch": "位置情報を取得しています..."
9797
}

‎ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/ko-kr.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"FileNameInvalid": "파일 이름이 (.)으로 시작하거나, \\ / : * ? \" < > | ; % $를 포함하거나, nul, prn, con, lpt 또는 com과 같이 예약된 키워드인 파일은 첨부하지 마십시오.",
55
"FileMimeTypeInvalid": "파일 ${0}은(는) 지원되지 않는 파일 유형입니다.",
66
"InternalFormSubmissionError": "양식을 제출하는 중 내부 오류가 발생했습니다.",
7-
"FileSizeZero": "업로드한 파일 ${0}이(가) 비어 있습니다. 콘텐츠가 포함된 파일을 업로드하고 있는지 확인하세요.",
7+
"FileSizeZero": "업로드된 파일 ${0}이(가) 비어 있습니다. 콘텐츠가 포함된 파일을 업로드하여 주십시오.",
88
"type": "유효한 값을 입력해 주십시오.",
99
"required": "이 필드를 작성해 주십시오.",
1010
"minimum": "값은 ${0}보다 크거나 같아야 합니다.",
@@ -86,12 +86,12 @@
8686
"more": "기타",
8787
"less": "미만"
8888
},
89-
"saveDraftSuccessMessage" : "초안이 성공적으로 저장되었습니다.",
90-
"saveDraftErrorMessage" : "초안을 저장하지 못하는 동안 오류가 발생했습니다. 다시 시도해 주세요.",
89+
"saveDraftSuccessMessage": "초안이 정상적으로 저장되었습니다.",
90+
"saveDraftErrorMessage": "초안을 저장하는 도중 오류가 발생했습니다. 다시 시도해 주십시오.",
9191
"signature": "서명",
92-
"SignatureCanvas": "시그니처 캔버스",
92+
"SignatureCanvas": "서명 캔버스",
9393
"clearSign": "서명 지우기",
94-
"brushSize": "브러시 크기:",
95-
"geoLocationError": "지리적 위치를 가져오는 중 오류가 발생했습니다.",
96-
"geoLocationFetch": "지리적 위치를 가져오는 중..."
94+
"brushSize": "브러시 크기: ",
95+
"geoLocationError": "지리적 위치 가져오기 중 오류 발생",
96+
"geoLocationFetch": "지리적 위치 가져오는 중..."
9797
}

‎ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/pt-br.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"FileNameInvalid": "Não anexe arquivos cujos nomes comecem com (.), contenham \\ / : * ? \" < > | ; % $, ou sejam palavras-chave reservadas, como nul, prn, con, lpt ou com.",
55
"FileMimeTypeInvalid": "O(s) arquivo(s) ${0} não é(são) suportado(s)",
66
"InternalFormSubmissionError": "Encontrou um erro interno ao enviar o formulário.",
7-
"FileSizeZero": "Os arquivos enviados ${0} estão vazios. Certifique-se de que está enviando arquivos com conteúdo.\n\n",
7+
"FileSizeZero": "Os arquivos enviados ${0} estão vazios. Certifique-se de fazer upload de arquivos com conteúdo.",
88
"type": "Insira um valor válido.",
99
"required": "Preencha este campo.",
1010
"minimum": "O valor precisa ser superior ou igual a ${0}.",
@@ -86,12 +86,12 @@
8686
"more": "mais",
8787
"less": "menos"
8888
},
89-
"saveDraftSuccessMessage" : "O rascunho foi salvo com sucesso.",
90-
"saveDraftErrorMessage" : "Ocorreu um erro que nos impediu de salvar seu rascunho. Por favor, tente novamente.",
89+
"saveDraftSuccessMessage": "O rascunho foi salvo com sucesso.",
90+
"saveDraftErrorMessage": "Ocorreu um erro que nos impediu de salvar o seu rascunho. Tente novamente.",
9191
"signature": "Assinatura",
9292
"SignatureCanvas": "Tela de assinatura",
93-
"clearSign": "Assinatura clara",
94-
"brushSize": "Tamanho do pincel:",
95-
"geoLocationError": "Erro ao buscar geolocalização",
96-
"geoLocationFetch": "Buscando localização geográfica..."
93+
"clearSign": "Limpar assinatura",
94+
"brushSize": "Tamanho do pincel: ",
95+
"geoLocationError": "Erro ao obter geolocalização",
96+
"geoLocationFetch": "Obtendo geolocalização..."
9797
}

‎ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/zh-cn.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"FileNameInvalid": "请勿附加文件名以 (.) 开头、包含 \\ / : * ? \" < > | ; % $ 或为保留关键字（如 nul、prn、con、lpt 或 com）的文件。",
55
"FileMimeTypeInvalid": "文件 ${0} 的类型不受支持",
66
"InternalFormSubmissionError": "提交表单时遇到内部错误。",
7-
"FileSizeZero": "上传的文件 ${0} 为空。请确保您上传的是有内容的文件。",
7+
"FileSizeZero": "上传的文件 ${0} 为空。请确保您上传的文件有内容。",
88
"type": "请输入有效的值。",
99
"required": "请填写此字段。",
1010
"minimum": "值必须大于或等于 ${0}。",
@@ -86,12 +86,12 @@
8686
"more": "更多",
8787
"less": "更少"
8888
},
89-
"saveDraftSuccessMessage" : "草稿保存成功。",
90-
"saveDraftErrorMessage" : "出現錯誤，導致我們無法儲存您的草稿。請再試一次。",
89+
"saveDraftSuccessMessage": "草稿已成功保存。",
90+
"saveDraftErrorMessage": "出现错误，导致我们无法保存您的草稿。请重试。",
9191
"signature": "签名",
92-
"SignatureCanvas": "簽名畫布",
92+
"SignatureCanvas": "签名画布",
9393
"clearSign": "清晰的签名",
94-
"brushSize": "刷子尺寸：",
95-
"geoLocationError": "取得地理位置時出錯",
96-
"geoLocationFetch": "正在取得地理位置..."
94+
"brushSize": "画笔大小：",
95+
"geoLocationError": "获取地理位置时出错",
96+
"geoLocationFetch": "正在获取地理位置..."
9797
}

‎ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/zh-tw.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"FileNameInvalid": "不要附加以下檔案：檔案名稱以 (.) 開頭且包含 \\ / : * ? \" < > | ; % $，或檔案名稱為保留關鍵字，例如 nul、prn、con、lpt 或 com。",
55
"FileMimeTypeInvalid": "${0} 檔案的檔案類型不受支援",
66
"InternalFormSubmissionError": "提交表單時發生內部錯誤。",
7-
"FileSizeZero": "上傳的檔案 ${0} 為空。請確保您上傳的是有內容的檔案。",
7+
"FileSizeZero": "上傳的檔案 ${0} 是空的。請確定您上傳的檔案包含內容。",
88
"type": "請輸入有效值。",
99
"required": "請填寫此欄位。",
1010
"minimum": "值必須大於或等於 ${0}。",
@@ -86,12 +86,12 @@
8686
"more": "超過",
8787
"less": "少於"
8888
},
89-
"saveDraftSuccessMessage" : "草稿保存成功。",
90-
"saveDraftErrorMessage" : "出现错误，导致我们无法保存您的草稿。请再试一次。",
89+
"saveDraftSuccessMessage": "草稿已成功儲存。",
90+
"saveDraftErrorMessage": "發生錯誤，導致我們無法儲存您的草稿。請再試一次。",
9191
"signature": "簽名",
92-
"SignatureCanvas": "签名画布",
93-
"clearSign": "清晰的簽名",
94-
"brushSize": "刷子尺寸：",
95-
"geoLocationError": "获取地理位置时出错",
96-
"geoLocationFetch": "正在获取地理位置..."
92+
"SignatureCanvas": "簽名畫布",
93+
"clearSign": "清除簽名",
94+
"brushSize": "筆刷大小：",
95+
"geoLocationError": "擷取地理位置時出錯",
96+
"geoLocationFetch": "正在擷取地理位置…"
9797
}

‎ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/clientlibs/site/js/datepickerwidget.js‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,9 @@ if (typeof window.DatePickerWidget === 'undefined') {
306306
widget.onblur = deactivateField;
307307

308308
if (options.showCalendarIcon) {
309+
let existingCalendarIcons = widget.parentNode.querySelectorAll('.cmp-adaptiveform-datepicker__calendar-icon');
310+
existingCalendarIcons.forEach(icon => icon.remove());
311+
309312
let calendarIcon = document.createElement("div");
310313
calendarIcon.classList.add("cmp-adaptiveform-datepicker__calendar-icon");
311314

@@ -320,6 +323,9 @@ if (typeof window.DatePickerWidget === 'undefined') {
320323
});
321324
calendarIcon.addEventListener("keydown", function (event) {
322325
if (event.keyCode === 32 || event.keyCode === 13) {
326+
event.preventDefault();
327+
event.stopPropagation();
328+
self._iconClicked = true;
323329
widget.click();
324330
}
325331
});
@@ -418,9 +424,11 @@ if (typeof window.DatePickerWidget === 'undefined') {
418424
if (evnt.target.classList.contains("cmp-adaptiveform-datepicker__calendar-icon")) {
419425
if (!DatePickerWidget.#visible) {
420426
this.#show();
421-
return;
427+
handled = true;
428+
} else {
429+
this.$focusedDate.classList.add("dp-focus");
430+
handled = true;
422431
}
423-
this.$focusedDate.classList.add("dp-focus");
424432
}
425433
break;
426434
case 40: //down arrow key

0 commit comments

Comments
 (0)