diff --git a/Mohem/src/app/hmg-common/ui/card-calendar/card-calendar.component.ts b/Mohem/src/app/hmg-common/ui/card-calendar/card-calendar.component.ts index a0590c6d..280bcf6a 100644 --- a/Mohem/src/app/hmg-common/ui/card-calendar/card-calendar.component.ts +++ b/Mohem/src/app/hmg-common/ui/card-calendar/card-calendar.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit, Input } from '@angular/core'; +import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; @Component({ selector: 'app-card-calendar', @@ -11,7 +12,9 @@ export class CardCalendarComponent implements OnInit { @Input() active: boolean; @Input() color: string; - constructor() { } + constructor( + public ts: TranslatorService, + ) { } ngOnInit() {} diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.html b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.html index 5aa66656..86d19141 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.html +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.html @@ -10,12 +10,12 @@
-
Absence +
{{ts.trPK('home','absence-name')}}
+
{{ts.trPK('home','holiday-name')}}
-
Holiday +
{{ts.trPK('home','businesstrip-name')}}
-
Business Trip
diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html index 8e3ae4ac..ac469fe9 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html @@ -38,18 +38,18 @@ -

{{TODAYDATE.ABSENCE_ATTENDANCE_TYPE_NAME}}

+

{{TODAYDATE.HOLIDAY_TYPE}}

{{ts.trPK('attendance-tracking','shift-time')}}

- + diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index dfe04aa4..01c595e7 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -298,8 +298,8 @@ "ar": "نهاية" }, "pending-transaction": { - "en": "Pending Transactions", - "ar": "المعاملات المعلقة" + "en": "Notices", + "ar": "إشعارات" }, "huawei-plugin-issue": { "en": "Error while initializing Huawei Location Plugin", @@ -1268,8 +1268,20 @@ "ar": "هل ترغب في تسجيل الدخول باسم المستخدم الحالي؟" }, "monthly-attendance": { - "ar":"اجازاتي", - "en": "Leaves Calendar" + "ar":"التقويم", + "en": "Calendar" + }, + "absence-name": { + "ar":"إجازة", + "en": "Absence" + }, + "holiday-name": { + "ar":"انتداب", + "en": "Business Trip" + }, + "businesstrip-name": { + "ar":"إجازة رسمية", + "en": "Holiday" }, "monthly-time-sheet-view": { "en": "View your Leaves Information", @@ -1771,7 +1783,7 @@ }, "start-date": { "en": "Start Date", - "ar": "تاريخ البدء" + "ar": "تاريخ البداية" }, "end-date": { "en": "End Date", @@ -3648,8 +3660,8 @@ "ar": "وقت العمل لم ينتهي بعد" }, "shift-time": { - "en": "Leave Type", - "ar": "نوع الإجازة" + "en": "Leave Details", + "ar": "تفاصيل الإجازة" }, "shift-type": { "en": "Attendance Type",