@@ -23,9 +23,9 @@
Edit Job Custom Parameters
diff --git a/src/app/system/manage-jobs/scheduler-jobs/custom-parameters-popover/custom-parameters-table/custom-parameters-table.component.html b/src/app/system/manage-jobs/scheduler-jobs/custom-parameters-popover/custom-parameters-table/custom-parameters-table.component.html
index 3f2799f8dd..68388eefb7 100644
--- a/src/app/system/manage-jobs/scheduler-jobs/custom-parameters-popover/custom-parameters-table/custom-parameters-table.component.html
+++ b/src/app/system/manage-jobs/scheduler-jobs/custom-parameters-popover/custom-parameters-table/custom-parameters-table.component.html
@@ -2,19 +2,19 @@
{{'labels.inputs.Job' | translate}}: {{ displayName }}
- {{'labels.inputs.Parameter Name' | translate}} |
+ {{'labels.inputs.Parameter' | translate}} {{'labels.inputs.Name' | translate}} |
-
+
|
- {{'labels.inputs.Parameter Value' | translate}} |
+ {{'labels.inputs.Parameter' | translate}} {{'labels.inputs.Value' | translate}} |
-
+
|
@@ -23,7 +23,7 @@ {{'labels.inputs.Job' | translate}}: {{ displayName }}
|
@@ -36,6 +36,6 @@ {{'labels.inputs.Job' | translate}}: {{ displayName }}
diff --git a/src/app/system/manage-jobs/scheduler-jobs/edit-scheduler-job/edit-scheduler-job.component.html b/src/app/system/manage-jobs/scheduler-jobs/edit-scheduler-job/edit-scheduler-job.component.html
index 4acb00fa5e..10481c44d7 100644
--- a/src/app/system/manage-jobs/scheduler-jobs/edit-scheduler-job/edit-scheduler-job.component.html
+++ b/src/app/system/manage-jobs/scheduler-jobs/edit-scheduler-job/edit-scheduler-job.component.html
@@ -9,32 +9,32 @@
- Job Name
+ {{'labels.inputs.Job Name' | translate}}
- Job Name is required
+ {{'labels.inputs.Job Name' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}}
- Cron Expression
+ {{'labels.inputs.Cron Expression' | translate}}
- Cron Expression is required
+ {{'labels.inputs.Cron Expression' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}}
- Is job active?
+ {{'labels.inputs.Is job active' | translate}}?
-
+
-
-
+
+
-
+
diff --git a/src/app/system/manage-jobs/scheduler-jobs/error-log-popover/error-log-popover.component.ts b/src/app/system/manage-jobs/scheduler-jobs/error-log-popover/error-log-popover.component.ts
index bee565206b..4354d5ef20 100644
--- a/src/app/system/manage-jobs/scheduler-jobs/error-log-popover/error-log-popover.component.ts
+++ b/src/app/system/manage-jobs/scheduler-jobs/error-log-popover/error-log-popover.component.ts
@@ -1,7 +1,7 @@
import { Component, Inject, OnInit } from '@angular/core';
-import { SchedulerJob } from '../models/scheduler-job.model';
import { MAT_DIALOG_DATA } from '@angular/material/dialog';
import { TranslateService } from '@ngx-translate/core';
+import { SchedulerJob } from '../models/scheduler-job.model';
interface ErrorJobDataType {
@@ -27,7 +27,7 @@ export class ErrorLogPopoverComponent implements OnInit {
}
buttonLabel(): string {
- const label: string = this.show ? 'Show less' : 'Show more';
+ const label: string = this.show ? this.translateService.instant('labels.buttons.Show less'): this.translateService.instant('labels.buttons.Show more');
return this.translateService.instant('labels.buttons.' + label);
}
diff --git a/src/app/system/manage-jobs/scheduler-jobs/manage-scheduler-jobs.component.html b/src/app/system/manage-jobs/scheduler-jobs/manage-scheduler-jobs.component.html
index d2912dee9e..1634d7e74a 100644
--- a/src/app/system/manage-jobs/scheduler-jobs/manage-scheduler-jobs.component.html
+++ b/src/app/system/manage-jobs/scheduler-jobs/manage-scheduler-jobs.component.html
@@ -1,6 +1,6 @@
- {{'labels.heading.Scheduler Status' | translate}}:{{ schedulerActive ? 'Active' : 'Inactive' }}
+ {{'labels.heading.Scheduler Status' | translate}}:{{ schedulerActive ? ( 'labels.inputs.Active' | translate ) : ('labels.catalogs.Inactive' | translate) }}
|