From 0ba1b2631894a066bcf7e14019a7fa274b2aa916 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Sun, 14 Apr 2024 21:28:26 +0200 Subject: [PATCH 1/2] Fixed sync-i18n script not working anymore This is caused by the typescript 4.4 update that changed the catch type from any to unknown --- scripts/sync-i18n-files.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/sync-i18n-files.ts b/scripts/sync-i18n-files.ts index 96ba0d4010..170266b6a2 100644 --- a/scripts/sync-i18n-files.ts +++ b/scripts/sync-i18n-files.ts @@ -275,7 +275,9 @@ function readFileIfExists(pathToFile) { try { return fs.readFileSync(pathToFile, 'utf8'); } catch (e) { - console.error('Error:', e.stack); + if (e instanceof Error) { + console.error('Error:', e.stack); + } } } return null; From 59f913b98b6a7fc4760e4ebeb57055b9171118c3 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Sun, 14 Apr 2024 21:59:37 +0200 Subject: [PATCH 2/2] Made dso-selector placeholder types translatable --- .../item-move/item-move.component.html | 2 +- .../dso-selector/dso-selector.component.ts | 2 +- src/assets/i18n/en.json5 | 6 ++++++ src/assets/i18n/fr.json5 | 21 ++++++++++++------- src/assets/i18n/nl.json5 | 13 ++++++++---- 5 files changed, 30 insertions(+), 14 deletions(-) diff --git a/src/app/item-page/edit-item-page/item-move/item-move.component.html b/src/app/item-page/edit-item-page/item-move/item-move.component.html index d136f003f4..8c47d4f781 100644 --- a/src/app/item-page/edit-item-page/item-move/item-move.component.html +++ b/src/app/item-page/edit-item-page/item-move/item-move.component.html @@ -6,7 +6,7 @@
-
{{'dso-selector.placeholder' | translate: { type: 'collection' } }}
+
{{'dso-selector.placeholder' | translate: { type: 'dso-selector.placeholder.type.collection' | translate } }}
type.toString().toLowerCase()).join(', '); + this.typesString = this.types.map((type: string) => this.translate.instant(`dso-selector.placeholder.type.${type.toString().toLowerCase()}`)).join(', '); // Create an observable searching for the current DSO (return empty list if there's no current DSO) let currentDSOResult$: Observable>>; diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index d4731f9bb9..7ba289d4f0 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1718,6 +1718,12 @@ "dso-selector.placeholder": "Search for a {{ type }}", + "dso-selector.placeholder.type.community": "community", + + "dso-selector.placeholder.type.collection": "collection", + + "dso-selector.placeholder.type.item": "item", + "dso-selector.select.collection.head": "Select a collection", "dso-selector.set-scope.community.head": "Select a search scope", diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5 index ba427292bc..bd356cbd5e 100644 --- a/src/assets/i18n/fr.json5 +++ b/src/assets/i18n/fr.json5 @@ -176,7 +176,8 @@ // "admin.registries.bitstream-formats.table.name": "Name", "admin.registries.bitstream-formats.table.name": "Nom", - // TODO New key - Add a translation + + // "admin.registries.bitstream-formats.table.id": "ID", "admin.registries.bitstream-formats.table.id": "ID", // "admin.registries.bitstream-formats.table.return": "Back", @@ -253,7 +254,8 @@ // "admin.registries.schema.fields.table.field": "Field", "admin.registries.schema.fields.table.field": "Champ", - // TODO New key - Add a translation + + // "admin.registries.schema.fields.table.id": "ID", "admin.registries.schema.fields.table.id": "ID", // "admin.registries.schema.fields.table.scopenote": "Scope Note", @@ -749,9 +751,6 @@ "admin.reports.collections.match_all_selected_filters": "Correspondant à tous les filtres sélectionnés", - //"admin.reports.items.title": "Metadata Query Report", - "admin.reports.items.title": "Rapport de requête de métadonnées", - //"admin.reports.items.breadcrumbs": "Metadata Query Report", "admin.reports.items.breadcrumbs": "Requête de métadonnées", @@ -2187,6 +2186,15 @@ // "dso-selector.placeholder": "Search for a {{ type }}", "dso-selector.placeholder": "Rechercher un(e) {{ type }}", + // "dso-selector.placeholder.type.community": "community", + "dso-selector.placeholder.type.community": "communauté", + + // "dso-selector.placeholder.type.collection": "collection", + "dso-selector.placeholder.type.collection": "collection", + + // "dso-selector.placeholder.type.item": "item", + "dso-selector.placeholder.type.item": "item", + // "dso-selector.select.collection.head": "Select a collection", "dso-selector.select.collection.head": "Sélectionner une collection", @@ -6402,9 +6410,6 @@ //"workspace.search.results.head": "Your submissions", "workspace.search.results.head": "Vos dépôts", - // "workspace.search.results.head": "Your submissions", - "workspace.search.results.head": "Vos dépôts", - // "workflowAdmin.search.results.head": "Administer Workflow", "workflowAdmin.search.results.head": "Workflow Administrateur", diff --git a/src/assets/i18n/nl.json5 b/src/assets/i18n/nl.json5 index 6c8403b972..196ff1632e 100644 --- a/src/assets/i18n/nl.json5 +++ b/src/assets/i18n/nl.json5 @@ -839,10 +839,6 @@ "admin.reports.collections.match_all_selected_filters": "Matching all selected filters", - //"admin.reports.items.title": "Metadata Query Report", - // TODO New key - Add a translation - "admin.reports.items.title": "Metadata Query Report", - //"admin.reports.items.breadcrumbs": "Metadata Query Report", // TODO New key - Add a translation "admin.reports.items.breadcrumbs": "Metadata Query Report", @@ -2377,6 +2373,15 @@ // "dso-selector.placeholder": "Search for a {{ type }}", "dso-selector.placeholder": "Zoek een {{ type }}", + // "dso-selector.placeholder.type.community": "community", + "dso-selector.placeholder.type.community": "community", + + // "dso-selector.placeholder.type.collection": "collection", + "dso-selector.placeholder.type.collection": "collectie", + + // "dso-selector.placeholder.type.item": "item", + "dso-selector.placeholder.type.item": "item", + // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",