diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index b37e5a398..7871687a9 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -93,7 +93,7 @@ export const appModuleFactory = (config: AppConfig) => { preventDuplicates: true, resetTimeoutOnDuplicate: true, }), - IqserTranslateModule.forRoot({ pathPrefix: config.BASE_TRANSLATIONS_DIRECTORY }), + IqserTranslateModule.forRoot({ pathPrefix: config.BASE_TRANSLATIONS_DIRECTORY || '/assets/i18n/redact/' }), IqserLoadingModule.forRoot(), IqserPermissionsModule.forRoot(), ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production }), diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json index 9b420ce2f..e13482dec 100644 --- a/apps/red-ui/src/assets/i18n/redact/de.json +++ b/apps/red-ui/src/assets/i18n/redact/de.json @@ -1221,7 +1221,6 @@ "delimiter": "Trennzeichen", "delimiter-placeholder": ",", "encoding": "Wird verschlüsselt", - "encoding-placeholder": "UTF-8", "file": "Datei:", "key-column": "Schlüsselspalte", "key-column-placeholder": "Spalte auswählen ...", @@ -1646,7 +1645,8 @@ "reason-placeholder": "Wählen Sie eine Begründung aus ...", "rectangle": "Benutzerdefinierter Bereich", "section": "Absatz / Ort", - "text": "Ausgewählter Text:" + "text": "Ausgewählter Text:", + "type": "" }, "error": "", "header": { diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json index 29ff85d02..177a07c80 100644 --- a/apps/red-ui/src/assets/i18n/redact/en.json +++ b/apps/red-ui/src/assets/i18n/redact/en.json @@ -1221,7 +1221,6 @@ "delimiter": "Delimiter", "delimiter-placeholder": ",", "encoding": "Encoding", - "encoding-placeholder": "UTF-8", "file": "File:", "key-column": "Key Column", "key-column-placeholder": "Select column...", @@ -1640,14 +1639,14 @@ "classification": "Value / Classification", "comment": "Comment", "dictionary": "Dictionary", - "type": "Entity", "edit-selected-text": "Edit selected text", "legalBasis": "Legal Basis", "reason": "Reason", "reason-placeholder": "Select a reason ...", "rectangle": "Custom Rectangle", "section": "Paragraph / Location", - "text": "Selected text:" + "text": "Selected text:", + "type": "Entity" }, "error": "Error! Invalid page selection", "header": { diff --git a/apps/red-ui/src/assets/i18n/scm/de.json b/apps/red-ui/src/assets/i18n/scm/de.json index 9b420ce2f..e13482dec 100644 --- a/apps/red-ui/src/assets/i18n/scm/de.json +++ b/apps/red-ui/src/assets/i18n/scm/de.json @@ -1221,7 +1221,6 @@ "delimiter": "Trennzeichen", "delimiter-placeholder": ",", "encoding": "Wird verschlüsselt", - "encoding-placeholder": "UTF-8", "file": "Datei:", "key-column": "Schlüsselspalte", "key-column-placeholder": "Spalte auswählen ...", @@ -1646,7 +1645,8 @@ "reason-placeholder": "Wählen Sie eine Begründung aus ...", "rectangle": "Benutzerdefinierter Bereich", "section": "Absatz / Ort", - "text": "Ausgewählter Text:" + "text": "Ausgewählter Text:", + "type": "" }, "error": "", "header": { diff --git a/apps/red-ui/src/assets/i18n/scm/en.json b/apps/red-ui/src/assets/i18n/scm/en.json index 29ff85d02..177a07c80 100644 --- a/apps/red-ui/src/assets/i18n/scm/en.json +++ b/apps/red-ui/src/assets/i18n/scm/en.json @@ -1221,7 +1221,6 @@ "delimiter": "Delimiter", "delimiter-placeholder": ",", "encoding": "Encoding", - "encoding-placeholder": "UTF-8", "file": "File:", "key-column": "Key Column", "key-column-placeholder": "Select column...", @@ -1640,14 +1639,14 @@ "classification": "Value / Classification", "comment": "Comment", "dictionary": "Dictionary", - "type": "Entity", "edit-selected-text": "Edit selected text", "legalBasis": "Legal Basis", "reason": "Reason", "reason-placeholder": "Select a reason ...", "rectangle": "Custom Rectangle", "section": "Paragraph / Location", - "text": "Selected text:" + "text": "Selected text:", + "type": "Entity" }, "error": "Error! Invalid page selection", "header": { diff --git a/libs/common-ui b/libs/common-ui index c925503fc..2f1081946 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit c925503fc6dba39824a1a2fac0e106c0a806d157 +Subproject commit 2f10819460065591e726c839175002b73ca75a3d diff --git a/package.json b/package.json index 9f1ea5624..fdce860c1 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "build": "nx build", "build-lint-all": "ng build --project=red-ui --configuration production --base-href /ui/", "build-paligo-styles": "mkdir -p dist/paligo-styles && sass --load-path=. paligo-styles/style.scss > dist/paligo-styles/redacto-theme.css", - "i18n:extract": "ngx-translate-extract --input ./apps/red-ui/src ./libs/common-ui/src --output apps/red-ui/src/assets/i18n/{en,de}.json --clean --sort --format namespaced-json && prettier apps/red-ui/src/assets/i18n/*.json --write", + "i18n:extract": "ngx-translate-extract --input ./apps/red-ui/src ./libs/common-ui/src --output apps/red-ui/src/assets/i18n/{redact,scm}/{en,de}.json --clean --sort --format namespaced-json && prettier apps/red-ui/src/assets/i18n/*/*.json --write", "postinstall": "ngcc --properties es2020 browser module main", "nx": "nx", "start": "nx serve",