UI__ONLYADMINSCANCREATEAPPS=false as environment variable.",
"setup.ruleAppCreation.warningAll": "With your setup, every user can create new apps. If you want to change this set UI__ONLYADMINSCANCREATEAPPS=true as environment variable.",
- "setup.ruleFolder.warning": "You are using the folder asset store where all assets are stored in the file system. Please remember to include the asset folder into your backup strategy and map it to a volume, if you are using Docker.",
+ "setup.ruleFolder.warning": "You are using the folder asset store where all assets are stored in the file system. Please remember to include the asset folder into your backup strategy and map it to a volume, if you are using docker.",
"setup.ruleFtp.warning": "You are using the FTP asset store. It is not recommended to use this storage type because of bad performance.",
"setup.ruleHttps.failure": " You are not accessing the site over https. If this warning is not correct then Squidex cannot detect https mode, because your instance is behind a reverse proxy such as nginx. Ensure that http headers are forwarded properly, via the X-Forwarded-* headers.",
"setup.ruleHttps.success": "Congratulations, you are accessing your Squidex installation over a secure connection (https).",
"setup.rules.headline": "System Checklist",
- "setup.ruleUrl.failure": "You should access Squidex only over one canonical URL and configure this URL with the URLS__BASEURL environment variable. The current base URL {actual} does not match to the base url {configured}.",
- "setup.ruleUrl.success": "Congratulations, the URLS__BASEURL environment variable is configured properly.",
+ "setup.ruleUrl.failure": "You should access Squidex only over one canonical URL and configure this URL with the URLS__BASEURL environment variable. The current base URL {actual} does not match to the base url {configured}. This variable must point to the public URL under which your Squidex instance is available.",
+ "setup.ruleUrl.success": "Congratulations, the URLS__BASEURL environment variable is configured properly. This variable must point to the public URL under which your Squidex instance is available.",
"setup.title": "Installation",
"setup.webpack.headline": "webpack error",
"setup.webpack.text": "You have to run webpack dev server to run the frontend in Development mode. More information in the documenation: ",
diff --git a/backend/i18n/source/frontend__ignore.json b/backend/i18n/source/frontend__ignore.json
index f8729b10d..7586a35b2 100644
--- a/backend/i18n/source/frontend__ignore.json
+++ b/backend/i18n/source/frontend__ignore.json
@@ -5,6 +5,10 @@
"/app.module.ts": [
"Application element not found"
],
+ "/features/apps/pages/app.component.html": [
+ "·",
+ "|"
+ ],
"/features/apps/pages/apps-page.component.html": [
"·",
"|"
@@ -22,25 +26,21 @@
"{{field.displayName}} {{displaySuffix}}",
"*"
],
+ "/features/content/shared/references/reference-item.component.html": [
+ "INVALID",
+ "VALID"
+ ],
"/features/content/shared/references/references-editor.component.html": [
"·"
],
- "/features/rules/pages/rules/actions/generic-action.component.html": [
- "*"
- ],
- "/features/rules/pages/rules/triggers/asset-changed-trigger.component.html": [
- "*"
- ],
- "/features/rules/pages/rules/triggers/comment-trigger.component.html": [
- "*"
- ],
- "/features/rules/pages/rules/triggers/content-changed-trigger.component.html": [
- "*"
+ "/features/rules/pages/rule/rule-page.component.html": [
+ "...",
+ "#"
],
- "/features/rules/pages/rules/triggers/schema-changed-trigger.component.html": [
+ "/features/rules/pages/rules/actions/generic-action.component.html": [
"*"
],
- "/features/rules/pages/rules/triggers/usage-trigger.component.html": [
+ "/features/rules/shared/actions/generic-action.component.html": [
"*"
],
"/features/schemas/pages/schema/fields/types/array-validation.component.html": [
@@ -50,12 +50,18 @@
"-",
"3",
"4",
- "px"
+ "Audio",
+ "px",
+ "Unknown",
+ "Video"
],
"/features/schemas/pages/schema/fields/types/boolean-ui.component.html": [
"Checkbox",
"Toggle"
],
+ "/features/schemas/pages/schema/fields/types/components-validation.component.html": [
+ "-"
+ ],
"/features/schemas/pages/schema/fields/types/date-time-ui.component.html": [
"DateTime"
],
@@ -118,10 +124,14 @@
"/features/settings/pages/contributors/import-contributors-dialog.component.html": [
"user1@squidex.io;user2@squidex.io"
],
+ "/features/settings/pages/languages/language-add-form.component.html": [
+ "{{language.iso2Code}} ({{language.englishName}}"
+ ],
"/framework/angular/forms/validators.ts": [
"matchValidator(): other control is not found in parent group"
],
"/framework/angular/modals/dialog-renderer.component.html": [
+ "({{tooltip.shortcut}}",
"×"
],
"/framework/angular/pager.component.html": [
@@ -146,6 +156,9 @@
"/shared/components/app-form.component.html": [
"appName"
],
+ "/shared/components/assets/assets-selector.component.html": [
+ "[query]=\"assetsState.query | async\""
+ ],
"/shared/components/forms/geolocation-editor.component.ts": [
"© OpenStreetMap contributors"
],
@@ -173,6 +186,9 @@
"/shared/components/search/search-form.component.ts": [
"form-inline search-form"
],
+ "/shared/components/watching-users.component.html": [
+ "+{{currentUsers.length - 5}}"
+ ],
"/shared/services/auth.service.ts": [
"*"
],
diff --git a/backend/i18n/source/frontend_en.json b/backend/i18n/source/frontend_en.json
index 2f2ef3935..155cd8fcc 100644
--- a/backend/i18n/source/frontend_en.json
+++ b/backend/i18n/source/frontend_en.json
@@ -235,6 +235,8 @@
"common.clusterPageTitle": "Cluster",
"common.comments": "Comments",
"common.components": "Components",
+ "common.condition": "Condition",
+ "common.conditions": "Conditions",
"common.confirm": "Confirm",
"common.consumers": "Consumers",
"common.content": "Content",
@@ -661,7 +663,22 @@
"roles.updateFailed": "Failed to update role. Please reload.",
"rules.actionData": "Action Data",
"rules.actionHint": "The selection of the action type cannot be changed later.",
+ "rules.addSchema": "Add Schema",
"rules.cancelFailed": "Failed to cancel rule. Please reload.",
+ "rules.conditionHint": "Optional condition as javascript expression",
+ "rules.conditionHint2": "Conditions are javascript expressions that define when to trigger, for example",
+ "rules.conditions.commentKeyword": "Only for text keywords",
+ "rules.conditions.commentUser": "Specific users",
+ "rules.conditions.contentValue": "Content has value",
+ "rules.conditions.event": "Specific events",
+ "rules.conditions.images": "Images only",
+ "rules.conditions.largeAssets": "Large assets",
+ "rules.conditions.schema": "Specific schema only",
+ "rules.conditions.updatedBy": "Updated by user",
+ "rules.conditions.usageDays": "Days",
+ "rules.conditions.usageDaysHint": "The number of days to check or empty to check the current month.",
+ "rules.conditions.usageLimit": "Limit",
+ "rules.conditions.usageLimitHint": "The monthly api calls to trigger.",
"rules.create": "New Rule",
"rules.createFailed": "Failed to create rule. Please reload.",
"rules.createTooltip": "New Rule",
@@ -723,6 +740,7 @@
"rules.simulation.eventTriggerChecked": "Event is tested to see if it matchs to the trigger and the basic conditions.",
"rules.simulator": "Simulator",
"rules.stop": "Rule will stop soon.",
+ "rules.triggerAll": "Trigger on all content events",
"rules.triggerConfirmText": "Do you really want to trigger the rule?",
"rules.triggerConfirmTitle": "Trigger rule",
"rules.triggerFailed": "Failed to trigger rule. Please reload.",
diff --git a/backend/i18n/translator/Squidex.Translator/Processes/Frontend.cs b/backend/i18n/translator/Squidex.Translator/Processes/Frontend.cs
index 978aa8faf..5fa31512d 100644
--- a/backend/i18n/translator/Squidex.Translator/Processes/Frontend.cs
+++ b/backend/i18n/translator/Squidex.Translator/Processes/Frontend.cs
@@ -11,7 +11,7 @@ namespace Squidex.Translator.Processes
{
public static DirectoryInfo GetFolder(DirectoryInfo folder)
{
- return new DirectoryInfo(Path.Combine(folder.FullName, "frontend", "app"));
+ return new DirectoryInfo(Path.Combine(folder.FullName, "frontend", "src", "app"));
}
public static IEnumerable<(FileInfo, string)> GetTypescriptFiles(DirectoryInfo folder)
diff --git a/backend/src/Squidex.Shared/Texts.nl.resx b/backend/src/Squidex.Shared/Texts.nl.resx
index c43c14e66..759057303 100644
--- a/backend/src/Squidex.Shared/Texts.nl.resx
+++ b/backend/src/Squidex.Shared/Texts.nl.resx
@@ -944,7 +944,7 @@
Conditions are javascript expressions that define when to trigger, for example:
+{{ 'rules.conditionHint2' | sqxTranslate }}:
Conditions are javascript expressions that define when to trigger, for example:
+{{ 'rules.conditionHint2' | sqxTranslate }}:
| - + | - + | - + |