Skip to content

Commit 11f662b

Browse files
devgurjardgurjar
authored and
ci-build
committed
fixed issue for Persian language (#1162)
Co-authored-by: dgurjar <[email protected]>
1 parent 51f4ea2 commit 11f662b

File tree

6 files changed

+135
-2
lines changed

6 files changed

+135
-2
lines changed

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
{
2+
"FileCloseAccessText" : "اضغط على Enter لحذف الملف",
3+
"FileSizeGreater" : "حجم الملفات (${0}) أكبر من الحجم المتوقع: ${1} ميجابايت.",
4+
"FileNameInvalid" : "لا تقم بإرفاق ملفات يبدأ اسم الملف بـ (.)، أو يحتوي على \\ / : * ? \" < > | ; % $، أو هو كلمة محجوزة مثل nul، prn، con، lpt، أو com.",
5+
"FileMimeTypeInvalid" : "أنواع الملفات (${0}) غير مدعومة",
6+
"InternalFormSubmissionError" : "حدث خطأ داخلي أثناء تقديم النموذج.",
7+
"electronicSignature" : "التوقيع الإلكتروني",
8+
"readOnlyMessage" : "قراءة فقط",
9+
"thankYouMessage" : "شكرًا لتقديم النموذج",
10+
"type" : "الرجاء إدخال قيمة صالحة.",
11+
"required" : "الرجاء ملء هذا الحقل.",
12+
"minimum" : "يجب أن تكون القيمة أكبر من أو تساوي ${0}.",
13+
"maximum" : "يجب أن تكون القيمة أقل من أو تساوي ${0}.",
14+
"minLength" : "الرجاء تمديد هذا النص إلى ${0} أحرف أو أكثر.",
15+
"maxLength" : "الرجاء تقصير هذا النص إلى ${0} حرفًا أو أقل.",
16+
"step" : "الرجاء إدخال قيمة صالحة.",
17+
"format" : "حدد القيمة بالتنسيق المسموح به: ${0}.",
18+
"pattern" : "الرجاء مطابقة الشكل المطلوب.",
19+
"minItems" : "حدد عدد العناصر مساويًا أو أكبر من ${0}.",
20+
"maxItems" : "حدد عدد العناصر مساويًا أو أقل من ${0}.",
21+
"uniqueItems" : "يجب أن تكون جميع العناصر فريدة.",
22+
"validationExpression" : "الرجاء إدخال قيمة صالحة.",
23+
"maxFileSize" : "حجم الملف كبير جدًا. يرجى تقليل الحجم والمحاولة مرة أخرى.",
24+
"accept" : "النوع المحدد للملف غير مدعوم.",
25+
"defaultError" : "هناك خطأ في الحقل",
26+
"clearText" : "مسح",
27+
"calendarSymbols" : {
28+
"monthNames" : ["يناير", "فبراير", "مارس", "أبريل", "مايو", "يونيو", "يوليو", "أغسطس", "سبتمبر", "أكتوبر", "نوفمبر", "ديسمبر"],
29+
"abbrmonthNames" : ["يناير", "فبراير", "مارس", "أبريل", "مايو", "يونيو", "يوليو", "أغسطس", "سبتمبر", "أكتوبر", "نوفمبر", "ديسمبر"],
30+
"dayNames" : ["الأحد", "الاثنين", "الثلاثاء", "الأربعاء", "الخميس", "الجمعة", "السبت"],
31+
"abbrdayNames" : ["الأحد", "الاثنين", "الثلاثاء", "الأربعاء", "الخميس", "الجمعة", "السبت"],
32+
"meridiemNames" : ["ص", "م"],
33+
"eraNames" : ["ق.م", "م"],
34+
"day": "يوم",
35+
"days": "أيام",
36+
"month": "شهر",
37+
"months": "أشهر",
38+
"year": "سنة",
39+
"years": "سنوات",
40+
"more": "أكثر",
41+
"less": "أقل"
42+
}
43+
}

‎it/config/src/main/content/jcr_root/apps/system/config/Guide Localization Service.cfg.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"es",
1313
"ru-ru",
1414
"hi",
15-
"th"
15+
"th",
16+
"fa"
1617
]
1718
}

‎it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/.content.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<ru-ru/>
2222
<hi/>
2323
<th/>
24+
<fa/>
2425
</dictionary>
2526
<metadata
2627
fd:version="2.1"

‎it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/datepicker/basic/.content.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,27 @@
145145
validationStatus="valid"/>
146146
<fd:events jcr:primaryType="nt:unstructured"/>
147147
</datepicker_1911670949>
148+
<datepicker_269513547
149+
jcr:created="{Date}2024-04-04T09:54:04.561+05:30"
150+
jcr:createdBy="admin"
151+
jcr:lastModified="{Date}2024-04-04T10:01:04.574+05:30"
152+
jcr:lastModifiedBy="admin"
153+
jcr:primaryType="nt:unstructured"
154+
jcr:title="Date Input with fixed date"
155+
sling:resourceType="forms-components-examples/components/form/datepicker"
156+
default="2024-03-01"
157+
displayFormat="MMMM d, y"
158+
displayPatternType="MMMM d, y"
159+
editFormat="MMMM d, y"
160+
editPatternType="MMMM d, y"
161+
enabled="{Boolean}true"
162+
fieldType="date-input"
163+
hideTitle="false"
164+
name="datepicker_2695135471712204644671"
165+
readOnly="{Boolean}false"
166+
textIsRich="[true,true,true]"
167+
unboundFormElement="{Boolean}false"
168+
visible="{Boolean}true"/>
148169
</guideContainer>
149170
</jcr:content>
150171
</jcr:root>

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -728,13 +728,24 @@ if (typeof window.DatePickerWidget === 'undefined') {
728728
}
729729

730730
#getLocalizedYear(date) {
731+
/*
732+
// Only Thai language return year according to Buddhist calendar, rest all languages follows gregorian calendar in practice.
733+
// The Buddhist Year in 2024 = 543 + 2024 = B.E. 2567 (reference https://wesak.org.my/calculating-b-e/)
734+
// Intl.DateTimeFormat#formatToParts returns number (2024) for all languages except for Thai (2567) & for Persian ('۱۴۰۳')
735+
// For Persian ('۱۴۰۳'), returned year is not in numbers that is breaking next flow.
736+
*/
737+
if(this.#lang === 'th') {
731738
const dateFormat = new Intl.DateTimeFormat(this.#lang, {
732-
year: 'numeric'
739+
year: 'numeric'
733740
});
734741
const dateParts = dateFormat.formatToParts(date);
735742
const yearObject = dateParts.find(yearObject => yearObject.type === "year");
736743
const localizedYear = yearObject.value;
737744
return Number(localizedYear);
745+
}
746+
else {
747+
return Number(date.getFullYear());
748+
}
738749
}
739750

740751
/*

‎ui.tests/test-module/specs/datepicker/datepicker.runtime.persian.locale.spec.js‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
/*******************************************************************************
2+
* Copyright 2024 Adobe
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
******************************************************************************/
16+
describe("Form Runtime with Date Picker", () => {
17+
18+
const pagePath = "content/forms/af/core-components-it/samples/datepicker/basic.html"
19+
const bemBlock = 'cmp-adaptiveform-datepicker'
20+
21+
let formContainer = null
22+
const fmPropertiesUI = "/libs/fd/fm/gui/content/forms/formmetadataeditor.html/content/dam/formsanddocuments/core-components-it/samples/datepicker/basic"
23+
const themeRef = 'input[name="./jcr:content/metadata/themeRef"]'
24+
const propertiesSaveBtn = '#shell-propertiespage-doneactivator'
25+
// enabling theme for this test case as without theme there is a bug in custom widget css
26+
before(() => {
27+
cy.openPage(fmPropertiesUI).then(() => {
28+
cy.get(themeRef).should('be.visible').clear().type('/libs/fd/af/themes/canvas').then(() => {
29+
cy.get(propertiesSaveBtn).click();
30+
})
31+
})
32+
})
33+
34+
beforeEach(() => {
35+
cy.previewForm(pagePath, {"params" : ["afAcceptLang=fa"]}).then(p => {
36+
formContainer = p;
37+
})
38+
});
39+
40+
// Year should be in Buddhist calendar year for Thai language
41+
it("Test localisation for date picker for Persian", () => {
42+
const [datePicker8, datePicker7FieldView] = Object.entries(formContainer._fields)[8];
43+
cy.get(`#${datePicker8}`).find(".cmp-adaptiveform-datepicker__calendar-icon").should("be.visible").click().then(() => {
44+
let todayDate = new Date();
45+
cy.get(".dp-caption").invoke("text").should("eq", "مارس, 2024");
46+
cy.get(".dp-caption").click();
47+
cy.get(".dp-caption").invoke("text").should("eq", '2024');
48+
cy.get(".dp-rightnav").click();
49+
});
50+
});
51+
52+
53+
54+
55+
56+
})

0 commit comments

Comments
 (0)