From 5395aa8993a2be039337d107109c6afd216a4332 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 6 Sep 2021 18:12:27 +0200 Subject: [PATCH] Fix translations. --- backend/i18n/frontend_en.json | 2 +- backend/i18n/frontend_it.json | 2 +- backend/i18n/frontend_nl.json | 2 +- backend/i18n/frontend_zh.json | 2 +- backend/i18n/source/frontend_en.json | 2 +- .../HandleRules/JobResult.cs | 4 ++-- .../HandleRules/RuleService.cs | 2 +- .../HandleRules/SkipReason.cs | 4 ++-- .../Operations/HandleRules/RuleServiceTests.cs | 2 +- .../administration/pages/users/user-page.component.html | 4 ++-- .../content/pages/content/content-page.component.html | 4 ++-- .../pages/content/editor/content-editor.component.html | 2 +- .../components/assets/asset-folder-dropdown.component.html | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/backend/i18n/frontend_en.json b/backend/i18n/frontend_en.json index c3662c281..c258e2372 100644 --- a/backend/i18n/frontend_en.json +++ b/backend/i18n/frontend_en.json @@ -700,12 +700,12 @@ "rules.simulation.conditionEvaluated": "Event is evaluated, whether it matches the conditions in the tigger. ", "rules.simulation.errorConditionDoesNotMatch": "Condition does not match to the trigger.", "rules.simulation.errorDisabled": "Rule is dissabled.", - "rules.simulation.errorEventMismatch": "Event does not match to the trigger.", "rules.simulation.errorFailed": "Internal Error.", "rules.simulation.errorFromRule": "Event has been created from another rule and will be skipped to prevent endless loops.", "rules.simulation.errorNoAction": "Action type is obsolete and has been removed.", "rules.simulation.errorNoTrigger": "Trigger type is obsolete and has been removed.", "rules.simulation.errorTooOld": "Event is too old.", + "rules.simulation.errorWrongEvent": "Event does not match to the trigger.", "rules.simulation.errorWrongEventForTrigger": "Event does not match to the trigger.", "rules.simulation.eventEnriched": "Event is enriched with additional data", "rules.simulation.eventQueried": "Event is queried from the database", diff --git a/backend/i18n/frontend_it.json b/backend/i18n/frontend_it.json index 1d90c6456..6e90dbbce 100644 --- a/backend/i18n/frontend_it.json +++ b/backend/i18n/frontend_it.json @@ -700,12 +700,12 @@ "rules.simulation.conditionEvaluated": "Event is evaluated, whether it matches the conditions in the tigger. ", "rules.simulation.errorConditionDoesNotMatch": "Condition does not match to the trigger.", "rules.simulation.errorDisabled": "Rule is dissabled.", - "rules.simulation.errorEventMismatch": "Event does not match to the trigger.", "rules.simulation.errorFailed": "Internal Error.", "rules.simulation.errorFromRule": "Event has been created from another rule and will be skipped to prevent endless loops.", "rules.simulation.errorNoAction": "Action type is obsolete and has been removed.", "rules.simulation.errorNoTrigger": "Trigger type is obsolete and has been removed.", "rules.simulation.errorTooOld": "Event is too old.", + "rules.simulation.errorWrongEvent": "Event does not match to the trigger.", "rules.simulation.errorWrongEventForTrigger": "Event does not match to the trigger.", "rules.simulation.eventEnriched": "Event is enriched with additional data", "rules.simulation.eventQueried": "Event is queried from the database", diff --git a/backend/i18n/frontend_nl.json b/backend/i18n/frontend_nl.json index 478d255a3..ddc0e5fd4 100644 --- a/backend/i18n/frontend_nl.json +++ b/backend/i18n/frontend_nl.json @@ -700,12 +700,12 @@ "rules.simulation.conditionEvaluated": "Event is evaluated, whether it matches the conditions in the tigger. ", "rules.simulation.errorConditionDoesNotMatch": "Condition does not match to the trigger.", "rules.simulation.errorDisabled": "Rule is dissabled.", - "rules.simulation.errorEventMismatch": "Event does not match to the trigger.", "rules.simulation.errorFailed": "Internal Error.", "rules.simulation.errorFromRule": "Event has been created from another rule and will be skipped to prevent endless loops.", "rules.simulation.errorNoAction": "Action type is obsolete and has been removed.", "rules.simulation.errorNoTrigger": "Trigger type is obsolete and has been removed.", "rules.simulation.errorTooOld": "Event is too old.", + "rules.simulation.errorWrongEvent": "Event does not match to the trigger.", "rules.simulation.errorWrongEventForTrigger": "Event does not match to the trigger.", "rules.simulation.eventEnriched": "Event is enriched with additional data", "rules.simulation.eventQueried": "Event is queried from the database", diff --git a/backend/i18n/frontend_zh.json b/backend/i18n/frontend_zh.json index 67cf0c89d..faa05c533 100644 --- a/backend/i18n/frontend_zh.json +++ b/backend/i18n/frontend_zh.json @@ -700,12 +700,12 @@ "rules.simulation.conditionEvaluated": "Event is evaluated, whether it matches the conditions in the tigger. ", "rules.simulation.errorConditionDoesNotMatch": "Condition does not match to the trigger.", "rules.simulation.errorDisabled": "Rule is dissabled.", - "rules.simulation.errorEventMismatch": "Event does not match to the trigger.", "rules.simulation.errorFailed": "Internal Error.", "rules.simulation.errorFromRule": "Event has been created from another rule and will be skipped to prevent endless loops.", "rules.simulation.errorNoAction": "Action type is obsolete and has been removed.", "rules.simulation.errorNoTrigger": "Trigger type is obsolete and has been removed.", "rules.simulation.errorTooOld": "Event is too old.", + "rules.simulation.errorWrongEvent": "Event does not match to the trigger.", "rules.simulation.errorWrongEventForTrigger": "Event does not match to the trigger.", "rules.simulation.eventEnriched": "Event is enriched with additional data", "rules.simulation.eventQueried": "Event is queried from the database", diff --git a/backend/i18n/source/frontend_en.json b/backend/i18n/source/frontend_en.json index c3662c281..c258e2372 100644 --- a/backend/i18n/source/frontend_en.json +++ b/backend/i18n/source/frontend_en.json @@ -700,12 +700,12 @@ "rules.simulation.conditionEvaluated": "Event is evaluated, whether it matches the conditions in the tigger. ", "rules.simulation.errorConditionDoesNotMatch": "Condition does not match to the trigger.", "rules.simulation.errorDisabled": "Rule is dissabled.", - "rules.simulation.errorEventMismatch": "Event does not match to the trigger.", "rules.simulation.errorFailed": "Internal Error.", "rules.simulation.errorFromRule": "Event has been created from another rule and will be skipped to prevent endless loops.", "rules.simulation.errorNoAction": "Action type is obsolete and has been removed.", "rules.simulation.errorNoTrigger": "Trigger type is obsolete and has been removed.", "rules.simulation.errorTooOld": "Event is too old.", + "rules.simulation.errorWrongEvent": "Event does not match to the trigger.", "rules.simulation.errorWrongEventForTrigger": "Event does not match to the trigger.", "rules.simulation.eventEnriched": "Event is enriched with additional data", "rules.simulation.eventQueried": "Event is queried from the database", diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/JobResult.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/JobResult.cs index 588073f06..0fa37bff5 100644 --- a/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/JobResult.cs +++ b/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/JobResult.cs @@ -23,9 +23,9 @@ namespace Squidex.Domain.Apps.Core.HandleRules SkipReason = SkipReason.Disabled }; - public static readonly JobResult EventMismatch = new JobResult + public static readonly JobResult WrongEvent = new JobResult { - SkipReason = SkipReason.EventMismatch + SkipReason = SkipReason.WrongEvent }; public static readonly JobResult FromRule = new JobResult diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleService.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleService.cs index 29aa64710..7aa37f6b7 100644 --- a/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleService.cs +++ b/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleService.cs @@ -159,7 +159,7 @@ namespace Squidex.Domain.Apps.Core.HandleRules if (@event.Payload is not AppEvent) { - jobs.Add(JobResult.EventMismatch); + jobs.Add(JobResult.WrongEvent); return; } diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/SkipReason.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/SkipReason.cs index 43940bef1..d58055981 100644 --- a/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/SkipReason.cs +++ b/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/SkipReason.cs @@ -12,7 +12,7 @@ namespace Squidex.Domain.Apps.Core.HandleRules None, ConditionDoesNotMatch, Disabled, - EventMismatch, + WrongEvent, Failed, FromRule, NoAction, @@ -20,4 +20,4 @@ namespace Squidex.Domain.Apps.Core.HandleRules TooOld, WrongEventForTrigger } -} \ No newline at end of file +} diff --git a/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleServiceTests.cs b/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleServiceTests.cs index c7953421b..2fe8af2e6 100644 --- a/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleServiceTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleServiceTests.cs @@ -296,7 +296,7 @@ namespace Squidex.Domain.Apps.Core.Operations.HandleRules var result = await sut.CreateJobsAsync(@event, Rule()).SingleAsync(); - Assert.Equal(SkipReason.EventMismatch, result.SkipReason); + Assert.Equal(SkipReason.WrongEvent, result.SkipReason); A.CallTo(() => ruleTriggerHandler.Trigger(A>._, A._)) .MustNotHaveHappened(); diff --git a/frontend/app/features/administration/pages/users/user-page.component.html b/frontend/app/features/administration/pages/users/user-page.component.html index d26a446a6..a8c9b271a 100644 --- a/frontend/app/features/administration/pages/users/user-page.component.html +++ b/frontend/app/features/administration/pages/users/user-page.component.html @@ -19,13 +19,13 @@ - - diff --git a/frontend/app/features/content/pages/content/content-page.component.html b/frontend/app/features/content/pages/content/content-page.component.html index 501858bdc..c55611dbb 100644 --- a/frontend/app/features/content/pages/content/content-page.component.html +++ b/frontend/app/features/content/pages/content/content-page.component.html @@ -99,7 +99,7 @@ - @@ -112,7 +112,7 @@ {{ 'common.save' | sqxTranslate }} - diff --git a/frontend/app/features/content/pages/content/editor/content-editor.component.html b/frontend/app/features/content/pages/content/editor/content-editor.component.html index c363b3598..e373a119e 100644 --- a/frontend/app/features/content/pages/content/editor/content-editor.component.html +++ b/frontend/app/features/content/pages/content/editor/content-editor.component.html @@ -9,7 +9,7 @@
-
diff --git a/frontend/app/shared/components/assets/asset-folder-dropdown.component.html b/frontend/app/shared/components/assets/asset-folder-dropdown.component.html index 8e7e844b6..438e09e08 100644 --- a/frontend/app/shared/components/assets/asset-folder-dropdown.component.html +++ b/frontend/app/shared/components/assets/asset-folder-dropdown.component.html @@ -3,7 +3,7 @@
{{selection.item.folderName | sqxTranslate}} - {{ 'i18n:common.in' | sqxTranslate}} ./{{selectionPath}} + {{ 'common.in' | sqxTranslate }} ./{{selectionPath}}