diff --git a/dmp-frontend/src/app/library/rich-text-editor/rich-text-editor.component.ts b/dmp-frontend/src/app/library/rich-text-editor/rich-text-editor.component.ts index a623ff7e4..7f63b15f3 100644 --- a/dmp-frontend/src/app/library/rich-text-editor/rich-text-editor.component.ts +++ b/dmp-frontend/src/app/library/rich-text-editor/rich-text-editor.component.ts @@ -7,15 +7,15 @@ import { Subscription } from "rxjs"; selector: 'rich-text-editor-component', template: `
- - + close +
`, styleUrls: ['./rich-text-editor.component.scss'], diff --git a/dmp-frontend/src/app/ui/auth/logout/logout.component.html b/dmp-frontend/src/app/ui/auth/logout/logout.component.html index 77fc59213..37445bf05 100644 --- a/dmp-frontend/src/app/ui/auth/logout/logout.component.html +++ b/dmp-frontend/src/app/ui/auth/logout/logout.component.html @@ -1 +1 @@ -

{{'IDP-SERVICE.AUTHENTICATION.MESSAGES.SIGN-OUT-IN-PROGRESS' | translate}}

+

{{'GENERAL.SNACK-BAR.SIGN-OUT-IN-PROGRESS' | translate}}

diff --git a/dmp-frontend/src/app/ui/description/editor/description-form/components/form-section/form-section.component.html b/dmp-frontend/src/app/ui/description/editor/description-form/components/form-section/form-section.component.html index b1bed6675..97ac3dbac 100644 --- a/dmp-frontend/src/app/ui/description/editor/description-form/components/form-section/form-section.component.html +++ b/dmp-frontend/src/app/ui/description/editor/description-form/components/form-section/form-section.component.html @@ -3,7 +3,7 @@ -
{{path}}.section {{section.title}}
+
{{path}}.section {{section.title}}
{{path}} {{section.title}}
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index 1e8afabf7..c122ef9fd 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -16,6 +16,7 @@ "SUCCESSFUL-EMAIL-SEND": "Email sent successfully", "SUCCESSFUL-COPY-TO-CLIPBOARD": "Copied to Clipboard", "UNSUCCESSFUL-LOGIN": "Unsuccessful Login", + "SIGN-OUT-IN-PROGRESS": "Sign out in progress...", "SUCCESSFUL-DELETE": "Successful Delete", "UNSUCCESSFUL-DELETE": "Unsuccessful Delete", "UNSUCCESSFUL-EMAIL-SEND": "Failed sending email", @@ -258,7 +259,6 @@ "SUCCESS": "Comment successfully saved", "THREADS": { "NEW-THREAD": "New comment", - "FROM-USER": "From", "SEND": "Send", "CANCEL": "Cancel", "REPLY": "Reply", @@ -1144,6 +1144,13 @@ "DESCRIPTION-TEMPLATE-INVITATION-TYPE": "Description Template invitation", "CONTACT-SUPPORT-TYPE": "Contact Support", "PUBLIC-CONTACT-SUPPORT-TYPE": "Public Contact Support" + }, + "NOTIFICATION-NOTIFY-STATE": { + "PENDING": "Pending", + "PROCESSING": "Processing", + "SUCCESSFUL": "Successful", + "ERROR": "Error", + "OMITTED": "Omitted" } }, "USER-PROFILE": { @@ -1198,25 +1205,19 @@ }, "EXTERNAL-FETCHER-SOURCE-EDITOR": { "FIELDS": { - "SOURCE-CONFIGURATION": "Source Configuration", "RESULTS": "Results", - "SOURCES": "Sources", "FIELD-MAPPINGS": "Field Mappings", "AUTHENTICATION": "Authentication", "QUERIES": "Queries", "QUERY": "Query", - "OPTIONS": "Options", - "OPTION": "Option", "STATIC-ITEMS": "Static Items", "STATIC-ITEM": "Item", "NAME": "Name", "CODE": "Code", "VALUE": "Value", "RESPONSE-PATH": "Response Path", - "DATA-TYPE": "Data Type", "KEY": "Key", "LABEL": "Label", - "DESCRIPTION": "Description", "ORDINAL": "Ordinal", "URL": "Url", "SOURCE-TYPE": "Source Type", @@ -1244,8 +1245,7 @@ "REMOVE-CASE": "Remove Case", "ADD-STATIC-ITEM": "Add Item", "REMOVE-STATIC-ITEM": "Remove Item" - }, - "STATIC-REQUIRED": "Required" + } }, "TENANT-EDITOR": { "NEW": "New Tenant", @@ -1559,7 +1559,7 @@ }, "REFERENCE-FIELD-COMPONENT": { "EXTERNAL-SOURCE": "Source", - "INTERNAL-SOURCE": "Not bind with source" + "INTERNAL-SOURCE": "Internal" }, "TENANT-CHOOSE-DIALOG": { "TITLE": "Please select your Tenant", @@ -1760,13 +1760,6 @@ "EMAIL": "Email", "INAPP": "In App" }, - "NOTIFICATION-NOTIFY-STATE": { - "PENDING": "Pending", - "PROCESSING": "Processing", - "SUCCESSFUL": "Successful", - "ERROR": "Error", - "OMITTED": "Omitted" - }, "NOTIFICATION-TRACKING-STATE": { "UNDEFINED": "Undefined", "NA": "NA", @@ -2009,8 +2002,7 @@ "CONFIRMATION": "Are you sure that you want to merge this account?" }, "ACTIONS": { - "CONFIRM": "Confirm", - "CANCEL": "Cancel" + "CONFIRM": "Confirm" } } -} +} \ No newline at end of file