diff --git a/backend/i18n/backend_en.json b/backend/i18n/backend_en.json index 790dd845c..876dd05c4 100644 --- a/backend/i18n/backend_en.json +++ b/backend/i18n/backend_en.json @@ -2,6 +2,9 @@ "annotations_AbsoluteUrl": "The field {name|lower} must be an absolute URL.", "annotations_Compare": "The field {name|lower} must be the same as {other|lower}.", "annotations_Required": "The field {name|lower} is required.", + "aspnet_annotations_AbsoluteUrl": "The field {0} must be an absolute URL.", + "aspnet_annotations_Compare": "The field {0} must be the same as {other|lower}.", + "aspnet_annotations_Required": "The field {0} is required.", "apps.alreadyArchieved": "App has already been archived.", "apps.clients.idAlreadyExists": "A client with the same id already exists.", "apps.contributors.cannotChangeYourself": "You cannot change your own role.", @@ -315,7 +318,8 @@ "validation.slug": "{property|upper} is not a valid slug.", "validation.valid": "{property|upper} is not a valid value.", "validation.notAnImage": "Picture is not a valid image.", - "workflows.initialNotPublished": "Initial step cannot be published step.", + "workflows.publishedIsInitial": "Initial step cannot be published step.", + "workflows.publishedNotDefined": "Workflow must have a published step.", "workflows.overlap": "Multiple workflows cover all schemas.", "workflows.schemaOverlap": "The schema '{schema}' is covered by multiple workflows." } \ No newline at end of file diff --git a/backend/src/Squidex.Domain.Apps.Entities/Apps/Guards/GuardAppWorkflows.cs b/backend/src/Squidex.Domain.Apps.Entities/Apps/Guards/GuardAppWorkflows.cs index c44870a2e..a2e735471 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Apps/Guards/GuardAppWorkflows.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Apps/Guards/GuardAppWorkflows.cs @@ -52,14 +52,14 @@ namespace Squidex.Domain.Apps.Entities.Apps.Guards if (workflow.Initial == Status.Published) { - e(T.Get("workflows.initialNotPublished"), $"{nameof(command.Workflow)}.{nameof(workflow.Initial)}"); + e(T.Get("workflows.publishedIsInitial"), $"{nameof(command.Workflow)}.{nameof(workflow.Initial)}"); } var stepsPrefix = $"{nameof(command.Workflow)}.{nameof(workflow.Steps)}"; if (!workflow.Steps.ContainsKey(Status.Published)) { - e(T.Get("workflows.initialNotPublished"), stepsPrefix); + e(T.Get("workflows.publishedNotDefined"), stepsPrefix); } foreach (var step in workflow.Steps) diff --git a/backend/src/Squidex.Shared/Texts.resx b/backend/src/Squidex.Shared/Texts.resx index b891291b1..76d59b8bc 100644 --- a/backend/src/Squidex.Shared/Texts.resx +++ b/backend/src/Squidex.Shared/Texts.resx @@ -130,6 +130,15 @@ Cannot remove a role when a contributor is assigned. + + The field {0} must be an absolute URL. + + + The field {0} must be the same as {other|lower}. + + + The field {0} is required. + Asset has already been deleted @@ -1003,12 +1012,15 @@ {property|upper} is not a valid value. - - Initial step cannot be published step. - Multiple workflows cover all schemas. + + Initial step cannot be published step. + + + Workflow must have a published step. + Transition has an invalid target.