language translations

3 years ago · dd3b404a26
15 changed files with 54 additions and 26 deletions
--- a/src/app/attendance/attendance.component.html
+++ b/src/app/attendance/attendance.component.html
@ -1,8 +1,8 @@
-<div class="page-container" id="flexi-leave">
+<div class="page-container" id="attendance">
    <div class="align-middle">
-            <p class="txt-content font-body-xsmall-bold">April</p>
+            <p class="txt-content font-body-xsmall-bold">{{languageConstants.april}}</p>
            <p class="txt-content font-body-xsmall-bold">2021</p>
-            <p class="txt-content font-body-xsmall-bold number-txt">Attendance</p>
+            <p class="txt-content font-body-xsmall-bold number-txt">"{{languageConstants.attendance}}</p>
    </div>
    <div class="flex-column leave-status">
        <div class="width-90 margin-5">
--- a/src/app/attendance/attendance.component.scss
+++ b/src/app/attendance/attendance.component.scss
@ -1,5 +1,5 @@
@import '../../styles.scss';
-#flexi-leave{
+#attendance{
    .align-middle{
        @include flex-box(column, top);
        text-align: center;
--- a/src/app/attendance/attendance.component.ts
+++ b/src/app/attendance/attendance.component.ts
@ -9,9 +9,14 @@ import { TranslationContentService } from 'src/constants/language/TranslationCon
 export class AttendanceComponent implements OnInit {
  public showAttendanceStatus:string = 'showAttendanceStatus';
  public active:string = 'active';
+  public languageConstants: any;
+
  constructor(private translationContentService:TranslationContentService) { }

  ngOnInit(): void {
+    this.translationContentService.getContent().subscribe((content: any) => {
+      this.languageConstants = Object.assign({}, content);
+    });
  }

 }
--- a/src/app/current-screen/current-screen.component.html
+++ b/src/app/current-screen/current-screen.component.html
@ -37,16 +37,16 @@
                </div>
            </div>
            <div class="flex-column leave-status">
-                <div class="width-90 margin-5">
+                <div class="width-90">
                    <app-leave-status [leaveStatus]=success [showScreen]=showLeaveStatus></app-leave-status>
                </div>
-                <div class="width-90 margin-5">
+                <div class="width-90">
                    <app-leave-status [leaveStatus]=success [showScreen]=showLeaveStatus></app-leave-status>
                </div>
-                <div class="width-90 margin-5">
+                <div class="width-90">
                    <app-leave-status [leaveStatus]=pending [showScreen]=showLeaveStatus></app-leave-status>
                </div>
-                <div class="width-90 margin-5">
+                <div class="width-90">
                    <app-leave-status [leaveStatus]=success [showScreen]=showLeaveStatus></app-leave-status>
                </div>
            </div>
--- a/src/app/current-screen/current-screen.component.scss
+++ b/src/app/current-screen/current-screen.component.scss
@ -5,7 +5,7 @@
  margin-bottom: 20%;
  height: 100%;
  .content {
-    background: $clr-grey;
+    background: $clr-mania;
    width: 100%;
    @include flex-box(column, center, center);
    .clear-content{
@ -115,6 +115,7 @@
     background-color: $clr-mania;
      .width-90{
        width: 90%;
+        min-width: 90%;
        margin: 5% auto;
      }
   }
--- a/src/app/flexi-leave/flexi-leave.component.html
+++ b/src/app/flexi-leave/flexi-leave.component.html
@ -1,8 +1,8 @@
 <div class="page-container" id="flexi-leave">
    <div class="align-middle">
-            <p class="txt-content font-body-xsmall-bold">April</p>
+            <p class="txt-content font-body-xsmall-bold">{{languageConstants.april}}</p>
            <p class="txt-content font-body-xsmall-bold">2021</p>
-            <p class="txt-content font-body-xsmall-bold number-txt">Flexi</p>
+            <p class="txt-content font-body-xsmall-bold number-txt">{{languageConstants.flexi}}</p>
    </div>
    <div class="flex-column leave-status">
        <div class="width-90 margin-5">
--- a/src/app/flexi-leave/flexi-leave.component.scss
+++ b/src/app/flexi-leave/flexi-leave.component.scss
@ -6,6 +6,7 @@
        padding-bottom: 5px;
        width: 90%;
        margin: 0% auto;
+        padding: 5%;
    }
    .leave-status{
        background-color: $clr-mania;
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@ -24,7 +24,8 @@ export class HomeComponent implements OnInit {
    let page = item.split('_thumb.png')[0];
    
    if(page === 'leave'){
-      page = 'applyLeave'
+      //page = 'applyLeave'
+      page = 'screen';
    }
    this.router.navigate([page]);
    
--- a/src/app/leave-status/leave-status.component.html
+++ b/src/app/leave-status/leave-status.component.html
@ -6,8 +6,8 @@
            <div class="date-txt">26/2/2021 - 28/2/2021</div>
        </div>
        <div class="flex-3 align-left">
-            <div class="medium-txt black-txt">Approved & Completed</div>
-            <div class="medium-txt leave-status name-txt">Earned Leave</div>
+            <div class="medium-txt black-txt">{{languageConstants.approved}} & {{languageConstants.completed}}</div>
+            <div class="medium-txt leave-status name-txt">{{languageConstants.earnedLeave}}</div>
        </div>
        <div class="flex-3 title-txt">
            <div class="medium-txt name-txt">{{'mukund' | uppercase}}</div>
@ -60,8 +60,8 @@
            <div class="date-txt">26/2/2021 - 28/2/2021</div>
        </div>
        <div class="flex-3 align-left">
-            <div class="medium-txt black-txt">Approved</div>
-            <div class="medium-txt leave-status name-txt">Outdoor Duty</div>
+            <div class="medium-txt black-txt">{{languageConstants.approved}}</div>
+            <div class="medium-txt leave-status name-txt">{{languageConstants.outdoorDuty}}</div>
        </div>
        <div class="flex-3 title-txt">
            <div class="medium-txt name-txt">{{'mukund' | uppercase}}</div>
--- a/src/app/leave-status/leave-status.component.scss
+++ b/src/app/leave-status/leave-status.component.scss
@ -1,7 +1,9 @@
@import '../../styles.scss';
 #leaveStatusPage{
    background-color: #ffffff;  
-    border-radius: 0% 2%;  
+    border-radius: 0% 2%; 
+    border-top-right-radius: 20px;
+    border-bottom-right-radius: 20px;
    .status-clr{
        background-color: #354814A6;
    }
--- a/src/app/odpnr/odpnr.component.html
+++ b/src/app/odpnr/odpnr.component.html
@ -6,7 +6,7 @@
                    <div class="align-middle">
                        <p class="txt-content font-body-xsmall-bold">{{languageConstants.month}}</p>
                        <p class="txt-content font-body-xsmall-bold number-txt">2021</p>
-                        <p class="txt-content font-body-xsmall-bold">OD/FPNR</p>
+                        <p class="txt-content font-body-xsmall-bold">{{languageConstants.odpnr}}</p>
                    </div>
                </div>
                <div class="align-middle">
--- a/src/app/odpnr/odpnr.component.scss
+++ b/src/app/odpnr/odpnr.component.scss
@ -5,7 +5,7 @@
  margin-bottom: 20%;
  height: 100%;
  .content {
-    background: $clr-grey;
+    background: $clr-mania;
    width: 100%;
    @include flex-box(column, center, center);
    .clear-content{
--- a/src/constants/language/englishLanguageConstants.ts
+++ b/src/constants/language/englishLanguageConstants.ts
@ -105,5 +105,10 @@ export const englishLanguageConstants = {
  daysPaid: 'DAYS PAID',
  tue: 'TUE',
  week: 'WEEK',
-  min: 'MIN'
+  min: 'MIN',
+  attendance: 'Attendance',
+  odpnr: 'OD/FPNR',
+  approved: 'Approved',
+  outdoorDuty:'Outdoor Duty',
+  completed: 'Completed'
 };
--- a/src/constants/language/hindiLanguageConstants.ts
+++ b/src/constants/language/hindiLanguageConstants.ts
@ -3,7 +3,7 @@ export const hindiLanguageConstants = {
  month:'अप्रैल',
  leave: 'लीव',
  applyLeave: 'छुट्टी आवेदन',
-  exigencyLeave: 'Exigency Leave',
+  exigencyLeave: 'अत्यावश्यक अवकाश',
  attendance: 'उपस्थिति रिपोर्ट',
  employeeLetters: 'कर्मचारी पत्र',
  odfpnr: 'ओडी / ऍफ़ पि एन आर',
@ -236,6 +236,10 @@ export const hindiLanguageConstants = {
  daysPaid: 'भुगतान किए गए दिन',
  tue: 'मंगल',
  week: 'सप्ताह',
-  min: 'मिनट'
+  min: 'मिनट',
+  odpnr:'ओडी/एफपीएनआर',
+  approved: 'मंजूर',
+  outdoorDuty:'आउटडोर ड्यूटी',
+  completed: 'पूरा हुआ'
 };

--- a/src/constants/language/marathiLanguageConstants.ts
+++ b/src/constants/language/marathiLanguageConstants.ts
@ -5,9 +5,9 @@ export const marathiLanguageConstants = {
  casualLeave: 'शेवटची वेळ',
  month:'एप्रिल',
  leave: 'लीव',
-  applyLeave: 'Apply Leave',
-  exigencyLeave: 'Exigency Leave',
-  policyPath: 'policiesMarathi',
+  applyLeave: 'रजा लागू करा',
+  exigencyLeave: 'अत्यावश्यक रजा',
+  policyPath: 'धोरणे',
  coronaVirus: 'कोरोना व्हायरस किंवा COVID-19 म्हणजे काय?',
  precautionDropDown: 'काय करावे',
  annualHealthCheck: 'वार्षिक आरोग्य तपासणी',
@ -90,5 +90,14 @@ export const marathiLanguageConstants = {
  daysPaid: 'दिवस भरले',
  tue: 'मंगळ',
  week: 'आठवडा',
-  min: 'मि'
+  min: 'मि',
+  submit: 'प्रस्तुत करणे',
+  cancel: 'रद्द करा',
+  checkDetails:'सबमिट करण्यापूर्वी तपशील तपासा',
+  casualSickLeave: 'लागू: कॅज्युअल कम आजारी रजा',
+  attendance: 'उपस्थिती',
+  odpnr:'ओडी/एफपीएनआर',
+  approved: 'स्वीकृत',
+  outdoorDuty:'आउटडोअर ड्युटी',
+  completed: 'पूर्ण झाले'
 };