Browse Source

Fix translations.

pull/758/head
Sebastian 4 years ago
parent
commit
5395aa8993
  1. 2
      backend/i18n/frontend_en.json
  2. 2
      backend/i18n/frontend_it.json
  3. 2
      backend/i18n/frontend_nl.json
  4. 2
      backend/i18n/frontend_zh.json
  5. 2
      backend/i18n/source/frontend_en.json
  6. 4
      backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/JobResult.cs
  7. 2
      backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleService.cs
  8. 2
      backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/SkipReason.cs
  9. 2
      backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleServiceTests.cs
  10. 4
      frontend/app/features/administration/pages/users/user-page.component.html
  11. 4
      frontend/app/features/content/pages/content/content-page.component.html
  12. 2
      frontend/app/features/content/pages/content/editor/content-editor.component.html
  13. 2
      frontend/app/shared/components/assets/asset-folder-dropdown.component.html

2
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",

2
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",

2
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",

2
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",

2
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",

4
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

2
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;
}

2
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,

2
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<Envelope<AppEvent>>._, A<RuleContext>._))
.MustNotHaveHappened();

4
frontend/app/features/administration/pages/users/user-page.component.html

@ -19,13 +19,13 @@
<ng-container menu>
<ng-container *ngIf="usersState.selectedUser | async; let user; else noUserMenu">
<button type="submit" class="btn btn-primary" title="i18n:common.saveShortcut" shortcut="CTRL + SHIFT + S" *ngIf="isEditable">
<button type="submit" class="btn btn-primary" shortcut="CTRL + SHIFT + S" *ngIf="isEditable">
{{ 'common.save' | sqxTranslate }}
</button>
</ng-container>
<ng-template #noUserMenu>
<button type="submit" class="btn btn-primary" title="i18n:common.saveShortcut" shortcut="CTRL + SHIFT + S">
<button type="submit" class="btn btn-primary" shortcut="CTRL + SHIFT + S">
{{ 'common.save' | sqxTranslate }}
</button>
</ng-template>

4
frontend/app/features/content/pages/content/content-page.component.html

@ -99,7 +99,7 @@
</ng-container>
<ng-container *ngIf="content?.canUpdate">
<button type="submit" class="btn btn-primary ms-2" title="i18n:common.saveShortcut" shortcut="CTRL + SHIFT + S">
<button type="submit" class="btn btn-primary ms-2" shortcut="CTRL + SHIFT + S">
{{ 'common.save' | sqxTranslate }}
</button>
</ng-container>
@ -112,7 +112,7 @@
{{ 'common.save' | sqxTranslate }}
</button>
<button type="submit" class="btn btn-success ms-2" title="i18n:common.saveShortcut" shortcut="CTRL + SHIFT + S" *ngIf="contentsState.canCreateAndPublish | async">
<button type="submit" class="btn btn-success ms-2" shortcut="CTRL + SHIFT + S" *ngIf="contentsState.canCreateAndPublish | async">
{{ 'contents.saveAndPublish' | sqxTranslate }}
</button>
</ng-template>

2
frontend/app/features/content/pages/content/editor/content-editor.component.html

@ -9,7 +9,7 @@
</div>
<div *ngIf="isNew">
<input class="form-control" placeholder="{{ 'i18n:contents.idPlaceholder' | sqxTranslate }}"
<input class="form-control" placeholder="{{ 'contents.idPlaceholder' | sqxTranslate }}"
[ngModel]="contentId"
(ngModelChange)="contentIdChange.emit($event)" />
</div>

2
frontend/app/shared/components/assets/asset-folder-dropdown.component.html

@ -3,7 +3,7 @@
<div class="truncate">{{selection.item.folderName | sqxTranslate}}
<span *ngIf="selectionPath">
{{ 'i18n:common.in' | sqxTranslate}}&nbsp;./{{selectionPath}}
{{ 'common.in' | sqxTranslate }}&nbsp;./{{selectionPath}}
</span>
</div>
</div>

Loading…
Cancel
Save