diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
index 08b70a0b26..77ee2b7961 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
+++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
@@ -44,8 +44,8 @@
-
-
+
+
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.html b/ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.html
index ba570ed98f..b304ea3918 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.html
+++ b/ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.html
@@ -34,5 +34,5 @@
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.ts
index fa8e3bccd0..7ec4cc3310 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.ts
@@ -34,7 +34,7 @@ export class AppsListComponent implements OnInit {
public static LAYOUT_LIST: string = 'LIST';
public static LAYOUT_GRID: string = 'GRID';
public static DEFAULT_TASKS_APP: string = 'tasks';
- public static DEFAULT_TASKS_APP_NAME: string = 'APPS.TASK_APP_NAME';
+ public static DEFAULT_TASKS_APP_NAME: string = 'ADF_TASK_LIST.APPS.TASK_APP_NAME';
public static DEFAULT_TASKS_APP_THEME: string = 'theme-2';
public static DEFAULT_TASKS_APP_ICON: string = 'glyphicon-asterisk';
public static DEFAULT_TASKS_APP_MATERIAL_ICON: string = 'favorite_border';
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.html b/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.html
index a9c84fa258..73f36f67bb 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.html
+++ b/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.html
@@ -1,6 +1,6 @@
- {{ 'TASK_DETAILS.LABELS.CHECKLIST' | translate }}
+ {{ 'ADF_TASK_LIST.DETAILS.LABELS.CHECKLIST' | translate }}
{{checklist?.length}}
@@ -22,7 +22,7 @@
- {{ 'TASK_DETAILS.CHECKLIST.NONE' | translate }}
+ {{ 'ADF_TASK_LIST.DETAILS.CHECKLIST.NONE' | translate }}
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.spec.ts
index 503493bb4e..5042361882 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.spec.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.spec.ts
@@ -69,7 +69,7 @@ describe('ChecklistComponent', () => {
it('should show no checklist message', () => {
expect(element.querySelector('#checklist-none-message')).not.toBeNull();
- expect(element.querySelector('#checklist-none-message').textContent).toContain('TASK_DETAILS.CHECKLIST.NONE');
+ expect(element.querySelector('#checklist-none-message').textContent).toContain('ADF_TASK_LIST.DETAILS.CHECKLIST.NONE');
});
describe('when is readonly mode', () => {
@@ -247,7 +247,7 @@ describe('ChecklistComponent', () => {
fixture.whenStable().then(() => {
fixture.detectChanges();
expect(element.querySelector('#checklist-none-message')).not.toBeNull();
- expect(element.querySelector('#checklist-none-message').textContent).toContain('TASK_DETAILS.CHECKLIST.NONE');
+ expect(element.querySelector('#checklist-none-message').textContent).toContain('ADF_TASK_LIST.DETAILS.CHECKLIST.NONE');
});
}));
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.html b/ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.html
index c2adbbea58..042c7b9480 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.html
+++ b/ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.html
@@ -3,7 +3,7 @@
(rowClick)="selectComment($event)" *ngIf="hasComments()">
-
+
-
+