diff --git a/lib/core/form/components/form.component.spec.ts b/lib/core/form/components/form.component.spec.ts index b29925e386..89a50de146 100644 --- a/lib/core/form/components/form.component.spec.ts +++ b/lib/core/form/components/form.component.spec.ts @@ -79,7 +79,7 @@ describe('FormComponent', () => { }); it('should return primary color for complete button', () => { - expect(formComponent.getColorForOutcome('Complete')).toBe('primary'); + expect(formComponent.getColorForOutcome('COMPLETE')).toBe('primary'); }); it('should not enable outcome button when model missing', () => { diff --git a/lib/core/form/components/form.component.ts b/lib/core/form/components/form.component.ts index f455f5dcc9..a25d113987 100644 --- a/lib/core/form/components/form.component.ts +++ b/lib/core/form/components/form.component.ts @@ -48,7 +48,7 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { static START_PROCESS_OUTCOME_ID: string = '$startProcess'; static CUSTOM_OUTCOME_ID: string = '$custom'; static COMPLETE_BUTTON_COLOR: string = 'primary'; - static COMPLETE_OUTCOME_NAME: string = 'Complete' + static COMPLETE_OUTCOME_NAME: string = 'COMPLETE'; /** Underlying form model instance. */ @Input() diff --git a/lib/core/form/components/widgets/core/form-outcome.model.ts b/lib/core/form/components/widgets/core/form-outcome.model.ts index 08e9117d78..1afbec09af 100644 --- a/lib/core/form/components/widgets/core/form-outcome.model.ts +++ b/lib/core/form/components/widgets/core/form-outcome.model.ts @@ -22,9 +22,9 @@ import { FormModel } from './form.model'; export class FormOutcomeModel extends FormWidgetModel { - static SAVE_ACTION: string = 'Save'; // Activiti 'Save' action name - static COMPLETE_ACTION: string = 'Complete'; // Activiti 'Complete' action name - static START_PROCESS_ACTION: string = 'Start Process'; // Activiti 'Start Process' action name + static SAVE_ACTION: string = 'SAVE'; // Activiti 'Save' action name + static COMPLETE_ACTION: string = 'COMPLETE'; // Activiti 'Complete' action name + static START_PROCESS_ACTION: string = 'START PROCESS'; // Activiti 'Start Process' action name isSystem: boolean = false; isSelected: boolean = false; diff --git a/lib/core/form/components/widgets/core/form.model.ts b/lib/core/form/components/widgets/core/form.model.ts index 551e7e8312..e0d866271b 100644 --- a/lib/core/form/components/widgets/core/form.model.ts +++ b/lib/core/form/components/widgets/core/form.model.ts @@ -124,17 +124,17 @@ export class FormModel { if (json.fields) { let saveOutcome = new FormOutcomeModel(this, { id: FormModel.SAVE_OUTCOME, - name: 'Save', + name: 'SAVE', isSystem: true }); let completeOutcome = new FormOutcomeModel(this, { id: FormModel.COMPLETE_OUTCOME, - name: 'Complete', + name: 'COMPLETE', isSystem: true }); let startProcessOutcome = new FormOutcomeModel(this, { id: FormModel.START_PROCESS_OUTCOME, - name: 'Start Process', + name: 'START PROCESS', isSystem: true }); diff --git a/lib/core/i18n/de.json b/lib/core/i18n/de.json index e725b9d961..f95e1ad82b 100644 --- a/lib/core/i18n/de.json +++ b/lib/core/i18n/de.json @@ -1,6 +1,6 @@ { "SAVE": "Speichern", - "START": "Abschließen", + "COMPLETE": "Abschließen", "START PROCESS": "Prozess starten", "FORM": { "START_FORM": { diff --git a/lib/core/i18n/en.json b/lib/core/i18n/en.json index ffbeb153c5..6f7b1d9a43 100644 --- a/lib/core/i18n/en.json +++ b/lib/core/i18n/en.json @@ -1,6 +1,6 @@ { "SAVE": "SAVE", - "START": "COMPLETE", + "COMPLETE": "COMPLETE", "START PROCESS": "START PROCESS", "FORM": { "START_FORM": { diff --git a/lib/core/i18n/es.json b/lib/core/i18n/es.json index e36a78f577..8b2203c606 100644 --- a/lib/core/i18n/es.json +++ b/lib/core/i18n/es.json @@ -1,6 +1,6 @@ { "SAVE": "Guardar", - "START": "Completar", + "COMPLETE": "Completar", "START PROCESS": "Iniciar proceso", "FORM": { "START_FORM": { diff --git a/lib/core/i18n/fr.json b/lib/core/i18n/fr.json index f295ea86d2..099d71c83e 100644 --- a/lib/core/i18n/fr.json +++ b/lib/core/i18n/fr.json @@ -1,6 +1,6 @@ { "SAVE": "Enregistrer", - "START": "Terminer", + "COMPLETE": "Terminer", "START PROCESS": "Démarrer le processus", "FORM": { "START_FORM": { diff --git a/lib/core/i18n/it.json b/lib/core/i18n/it.json index 0756e24b1a..974b1c59ce 100644 --- a/lib/core/i18n/it.json +++ b/lib/core/i18n/it.json @@ -1,6 +1,6 @@ { "SAVE": "Salva", - "START": "Completa", + "COMPLETE": "Completa", "START PROCESS": "Avvia processo", "FORM": { "START_FORM": { diff --git a/lib/core/i18n/ja.json b/lib/core/i18n/ja.json index 2eb3bf96a8..19131da2c3 100644 --- a/lib/core/i18n/ja.json +++ b/lib/core/i18n/ja.json @@ -1,6 +1,6 @@ { "SAVE": "保存", - "START": "完了", + "COMPLETE": "完了", "START PROCESS": "プロセスの開始", "FORM": { "START_FORM": { diff --git a/lib/core/i18n/nb.json b/lib/core/i18n/nb.json index 0989338ede..14e726335c 100644 --- a/lib/core/i18n/nb.json +++ b/lib/core/i18n/nb.json @@ -1,6 +1,6 @@ { "SAVE": "Lagre", - "START": "Fullfør", + "COMPLETE": "Fullfør", "START PROCESS": "Start prosess", "FORM": { "START_FORM": { diff --git a/lib/core/i18n/nl.json b/lib/core/i18n/nl.json index 5f87f8ca16..eece7b6baf 100644 --- a/lib/core/i18n/nl.json +++ b/lib/core/i18n/nl.json @@ -1,6 +1,6 @@ { "SAVE": "Opslaan", - "START": "Voltooid", + "COMPLETE": "Voltooid", "START PROCESS": "Proces starten", "FORM": { "START_FORM": { diff --git a/lib/core/i18n/pt-BR.json b/lib/core/i18n/pt-BR.json index 3e9ae58717..de2613da41 100644 --- a/lib/core/i18n/pt-BR.json +++ b/lib/core/i18n/pt-BR.json @@ -1,6 +1,6 @@ { "SAVE": "Salvar", - "START": "Completar", + "COMPLETE": "Completar", "START PROCESS": "Iniciar processo", "FORM": { "START_FORM": { diff --git a/lib/core/i18n/ru.json b/lib/core/i18n/ru.json index 8d9137efbd..c22e070f44 100644 --- a/lib/core/i18n/ru.json +++ b/lib/core/i18n/ru.json @@ -1,6 +1,6 @@ { "SAVE": "Сохранить", - "START": "Завершить", + "COMPLETE": "Завершить", "START PROCESS": "Запустить процесс", "FORM": { "START_FORM": { diff --git a/lib/core/i18n/zh-CN.json b/lib/core/i18n/zh-CN.json index 894dea33b9..9ad4f30696 100644 --- a/lib/core/i18n/zh-CN.json +++ b/lib/core/i18n/zh-CN.json @@ -1,6 +1,6 @@ { "SAVE": "保存", - "START": "完成", + "COMPLETE": "完成", "START PROCESS": "启动流程", "FORM": { "START_FORM": {