From 9cffd8d145366482328b5561c2cd4a55000a56f1 Mon Sep 17 00:00:00 2001 From: Q Date: Tue, 30 Jan 2024 17:39:29 -0600 Subject: [PATCH 1/9] WIP-porting over messages from 6 to en.json5 --- src/assets/i18n/en.json5 | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index da049d98bb1..5fa498d307a 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1470,7 +1470,7 @@ "dso-selector.set-scope.community.head": "Select a search scope", - "dso-selector.set-scope.community.button": "Search all of OAKTrust", + "dso-selector.set-scope.community.button": "Search All of OAKTrust", "dso-selector.set-scope.community.or-divider": "or", @@ -1613,8 +1613,14 @@ "error.validation.metadata.qualifier.invalid-pattern": "This field cannot contain dots, commas or spaces", "error.validation.metadata.qualifier.max-length": "This field may not contain more than 64 characters", + + // "feed.description": "Syndication feed", - "feed.description": "Syndication feed", + // TAMU Customization + + "feed.description": "RSS feed", + +// END TAMU Customization "file-section.error.header": "Error obtaining files for this item", @@ -3038,7 +3044,11 @@ "mydspace.view-btn": "View", - "nav.browse.header": "All of DSpace", + // "nav.browse.header": "All of DSpace", + + // TAMU Customization + "nav.browse.header": "All of OAKTrust", + // END TAMU Customization "nav.community-browse.header": "By Community", From 54a1e94379801053b5b56c2f7663f1879bdc0015 Mon Sep 17 00:00:00 2001 From: Q Date: Wed, 31 Jan 2024 16:32:18 -0600 Subject: [PATCH 2/9] WIP-port 6 messages to dspace angular --- src/assets/i18n/en.json5 | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 5fa498d307a..8f25d90fad8 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -778,7 +778,11 @@ "browse.comcol.by.subject": "By Subject", - "browse.comcol.by.srsc": "By Subject Category", + // "browse.comcol.by.srsc": "By Subject Category", + +// TAMU Customization + "browse.comcol.by.srsc": "By Department", +// END TAMU Customization "browse.comcol.by.nsi": "By Norwegian Science Index", @@ -802,7 +806,11 @@ "browse.metadata.subject.breadcrumbs": "Browse by Subject", - "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category", + // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category", + + //TAMU Customization + "browse.metadata.srsc.breadcrumbs": "Browse by Department", + //END TAMU Customization "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index", @@ -2832,7 +2840,12 @@ "menu.section.browse_global_by_subject": "By Subject", - "menu.section.browse_global_by_srsc": "By Subject Category", + // "menu.section.browse_global_by_srsc": "By Subject Category", + +//TAMU Customization + "menu.section.browse_global_by_srsc": "By Department", + +//TAMU Customization "menu.section.browse_global_by_nsi": "By Norwegian Science Index", From 581a0f78a9f6056874e331f112c570ba9f805fc8 Mon Sep 17 00:00:00 2001 From: Q Date: Thu, 1 Feb 2024 16:28:06 -0600 Subject: [PATCH 3/9] WIP-porting 6 messages into 7 --- src/assets/i18n/en.json5 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 8f25d90fad8..9edd6d631d6 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -788,7 +788,7 @@ "browse.comcol.by.title": "By Title", - "browse.comcol.head": "Browse", + "browse.comcol.head": "Browse by", "browse.empty": "No items to show.", @@ -2800,7 +2800,7 @@ "login.breadcrumbs": "Login", - "logout.form.header": "Log out from DSpace", + "logout.form.header": "Log out from OAKTrust", "logout.form.submit": "Log out", @@ -2973,7 +2973,7 @@ "metadata-export-search.submit.error": "Starting the export has failed", - "mydspace.breadcrumbs": "MyDSpace", + "mydspace.breadcrumbs": "My OAKTrust", "mydspace.description": "", From d88f34411516cbad20b4ac795251d3319cfda33f Mon Sep 17 00:00:00 2001 From: Q Date: Fri, 2 Feb 2024 10:45:17 -0600 Subject: [PATCH 4/9] Ported over dspace 6 tamu messages to dspace-angular --- src/assets/i18n/en.json5 | 57 ++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 9edd6d631d6..a53c8d16428 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -32,7 +32,9 @@ "error-page.description.404": "page not found", - "error-page.orcid.generic-error": "An error occurred during login via ORCID. Make sure you have shared your ORCID account email address with DSpace. If the error persists, contact the administrator", + // TAMU Customization + "error-page.orcid.generic-error": "An error occurred during login via ORCID. Make sure you have shared your ORCID account email address with OAKTrust. If the error persists, contact the administrator", + // END TAMU Customization "access-status.embargo.listelement.badge": "Embargo", @@ -144,7 +146,9 @@ "admin.registries.metadata.breadcrumbs": "Metadata registry", - "admin.registries.metadata.description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, DSpace requires the qualified Dublin Core schema.", + // TAMU Customization + "admin.registries.metadata.description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, OAKTrust requires the qualified Dublin Core schema.", + // END TAMU Customization "admin.registries.metadata.form.create": "Create metadata schema", @@ -778,11 +782,9 @@ "browse.comcol.by.subject": "By Subject", - // "browse.comcol.by.srsc": "By Subject Category", - -// TAMU Customization + // TAMU Customization "browse.comcol.by.srsc": "By Department", -// END TAMU Customization + // END TAMU Customization "browse.comcol.by.nsi": "By Norwegian Science Index", @@ -806,9 +808,7 @@ "browse.metadata.subject.breadcrumbs": "Browse by Subject", - // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category", - - //TAMU Customization + //TAMU Customization "browse.metadata.srsc.breadcrumbs": "Browse by Department", //END TAMU Customization @@ -1621,14 +1621,10 @@ "error.validation.metadata.qualifier.invalid-pattern": "This field cannot contain dots, commas or spaces", "error.validation.metadata.qualifier.max-length": "This field may not contain more than 64 characters", - - // "feed.description": "Syndication feed", // TAMU Customization - "feed.description": "RSS feed", - -// END TAMU Customization + // END TAMU Customization "file-section.error.header": "Error obtaining files for this item", @@ -2840,12 +2836,9 @@ "menu.section.browse_global_by_subject": "By Subject", - // "menu.section.browse_global_by_srsc": "By Subject Category", - -//TAMU Customization + //TAMU Customization "menu.section.browse_global_by_srsc": "By Department", - -//TAMU Customization + //TAMU Customization "menu.section.browse_global_by_nsi": "By Norwegian Science Index", @@ -3027,7 +3020,7 @@ "mydspace.results.no-uri": "No Uri", - "mydspace.search-form.placeholder": "Search in mydspace...", + "mydspace.search-form.placeholder": "Search in my OAKTrust...", "mydspace.show.workflow": "Workflow tasks", @@ -3044,8 +3037,10 @@ "mydspace.status.mydspaceWorkflow": "Workflow", "mydspace.status.mydspaceWorkspace": "Workspace", - - "mydspace.title": "MyDSpace", + + // TAMU Customization + "mydspace.title": "My OAKTrust", + // END TAMU Customization "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.", @@ -3057,8 +3052,6 @@ "mydspace.view-btn": "View", - // "nav.browse.header": "All of DSpace", - // TAMU Customization "nav.browse.header": "All of OAKTrust", // END TAMU Customization @@ -3077,7 +3070,9 @@ "nav.main.description": "Main navigation bar", - "nav.mydspace": "MyDSpace", + // TAMU Customization + "nav.mydspace": "My OAKTrust", + // END TAMU Customization "nav.profile": "Profile", @@ -3437,7 +3432,9 @@ "register-page.registration.header": "New user registration", - "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.", + // TAMU Customization + "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to OAKTrust.", + // END TAMU Customization "register-page.registration.email": "Email Address *", @@ -3999,9 +3996,13 @@ "submission.import-external.title.none": "Import metadata from an external source", - "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to DSpace.", + // TAMU Customization + "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to OAKTrust.", + // END TAMU Customization - "submission.import-external.back-to-my-dspace": "Back to MyDSpace", + // TAMU Customization + "submission.import-external.back-to-my-dspace": "Back to My OAKTrust", + // END TAMU Customization "submission.import-external.search.placeholder": "Search the external source", From 4ecfbc45268c57db0d8ef34137d626150cb8974b Mon Sep 17 00:00:00 2001 From: Q Date: Tue, 6 Feb 2024 08:24:54 -0600 Subject: [PATCH 5/9] fixed trailing spaces and indentions --- src/assets/i18n/en.json5 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index a53c8d16428..df321845ddb 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -3038,9 +3038,9 @@ "mydspace.status.mydspaceWorkspace": "Workspace", - // TAMU Customization + // TAMU Customization "mydspace.title": "My OAKTrust", - // END TAMU Customization + // END TAMU Customization "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.", @@ -3748,6 +3748,10 @@ "search.filters.filter.itemtype.head": "Type", + //TAMU Customization + "search.filters.filter.type.head": "Type", + // END TAMU Customization + "search.filters.filter.itemtype.placeholder": "Type", "search.filters.filter.itemtype.label": "Search type", From f8f2eeef5ae156a3e8fb29e3d8928e682202076b Mon Sep 17 00:00:00 2001 From: Q Date: Tue, 6 Feb 2024 08:40:16 -0600 Subject: [PATCH 6/9] fixed trailing spaces and indentions --- src/assets/i18n/en.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index df321845ddb..3ec7b25f1c9 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -3037,7 +3037,7 @@ "mydspace.status.mydspaceWorkflow": "Workflow", "mydspace.status.mydspaceWorkspace": "Workspace", - + // TAMU Customization "mydspace.title": "My OAKTrust", // END TAMU Customization From 9fb189e16d2f9b4cda232f98fd66075c5f9bee1a Mon Sep 17 00:00:00 2001 From: Q Date: Tue, 6 Feb 2024 09:46:17 -0600 Subject: [PATCH 7/9] Moved tamu customization labels to tamu assets and restored src assests i18n --- src/assets/i18n/en.json5 | 64 ++++++++-------------------- src/themes/tamu/assets/i18n/en.json5 | 26 +++++++++++ 2 files changed, 44 insertions(+), 46 deletions(-) diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 3ec7b25f1c9..dc28d387e20 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -32,9 +32,7 @@ "error-page.description.404": "page not found", - // TAMU Customization - "error-page.orcid.generic-error": "An error occurred during login via ORCID. Make sure you have shared your ORCID account email address with OAKTrust. If the error persists, contact the administrator", - // END TAMU Customization + "error-page.orcid.generic-error": "An error occurred during login via ORCID. Make sure you have shared your ORCID account email address with DSpace. If the error persists, contact the administrator", "access-status.embargo.listelement.badge": "Embargo", @@ -146,9 +144,7 @@ "admin.registries.metadata.breadcrumbs": "Metadata registry", - // TAMU Customization - "admin.registries.metadata.description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, OAKTrust requires the qualified Dublin Core schema.", - // END TAMU Customization + "admin.registries.metadata.description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, DSpace requires the qualified Dublin Core schema.", "admin.registries.metadata.form.create": "Create metadata schema", @@ -782,15 +778,13 @@ "browse.comcol.by.subject": "By Subject", - // TAMU Customization - "browse.comcol.by.srsc": "By Department", - // END TAMU Customization + "browse.comcol.by.srsc": "By Subject Category", "browse.comcol.by.nsi": "By Norwegian Science Index", "browse.comcol.by.title": "By Title", - "browse.comcol.head": "Browse by", + "browse.comcol.head": "Browse", "browse.empty": "No items to show.", @@ -808,9 +802,7 @@ "browse.metadata.subject.breadcrumbs": "Browse by Subject", - //TAMU Customization - "browse.metadata.srsc.breadcrumbs": "Browse by Department", - //END TAMU Customization + "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category", "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index", @@ -1478,7 +1470,7 @@ "dso-selector.set-scope.community.head": "Select a search scope", - "dso-selector.set-scope.community.button": "Search All of OAKTrust", + "dso-selector.set-scope.community.button": "Search all of OAKTrust", "dso-selector.set-scope.community.or-divider": "or", @@ -1622,9 +1614,7 @@ "error.validation.metadata.qualifier.max-length": "This field may not contain more than 64 characters", - // TAMU Customization - "feed.description": "RSS feed", - // END TAMU Customization + "feed.description": "Syndication feed", "file-section.error.header": "Error obtaining files for this item", @@ -2796,7 +2786,7 @@ "login.breadcrumbs": "Login", - "logout.form.header": "Log out from OAKTrust", + "logout.form.header": "Log out from DSpace", "logout.form.submit": "Log out", @@ -2836,9 +2826,7 @@ "menu.section.browse_global_by_subject": "By Subject", - //TAMU Customization - "menu.section.browse_global_by_srsc": "By Department", - //TAMU Customization + "menu.section.browse_global_by_srsc": "By Subject Category", "menu.section.browse_global_by_nsi": "By Norwegian Science Index", @@ -2966,7 +2954,7 @@ "metadata-export-search.submit.error": "Starting the export has failed", - "mydspace.breadcrumbs": "My OAKTrust", + "mydspace.breadcrumbs": "MyDSpace", "mydspace.description": "", @@ -3020,7 +3008,7 @@ "mydspace.results.no-uri": "No Uri", - "mydspace.search-form.placeholder": "Search in my OAKTrust...", + "mydspace.search-form.placeholder": "Search in mydspace...", "mydspace.show.workflow": "Workflow tasks", @@ -3038,9 +3026,7 @@ "mydspace.status.mydspaceWorkspace": "Workspace", - // TAMU Customization - "mydspace.title": "My OAKTrust", - // END TAMU Customization + "mydspace.title": "MyDSpace", "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.", @@ -3052,9 +3038,7 @@ "mydspace.view-btn": "View", - // TAMU Customization - "nav.browse.header": "All of OAKTrust", - // END TAMU Customization + "nav.browse.header": "All of DSpace", "nav.community-browse.header": "By Community", @@ -3070,9 +3054,7 @@ "nav.main.description": "Main navigation bar", - // TAMU Customization - "nav.mydspace": "My OAKTrust", - // END TAMU Customization + "nav.mydspace": "MyDSpace", "nav.profile": "Profile", @@ -3432,9 +3414,7 @@ "register-page.registration.header": "New user registration", - // TAMU Customization - "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to OAKTrust.", - // END TAMU Customization + "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.", "register-page.registration.email": "Email Address *", @@ -3748,10 +3728,6 @@ "search.filters.filter.itemtype.head": "Type", - //TAMU Customization - "search.filters.filter.type.head": "Type", - // END TAMU Customization - "search.filters.filter.itemtype.placeholder": "Type", "search.filters.filter.itemtype.label": "Search type", @@ -4000,13 +3976,9 @@ "submission.import-external.title.none": "Import metadata from an external source", - // TAMU Customization - "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to OAKTrust.", - // END TAMU Customization + "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to DSpace.", - // TAMU Customization - "submission.import-external.back-to-my-dspace": "Back to My OAKTrust", - // END TAMU Customization + "submission.import-external.back-to-my-dspace": "Back to MyDSpace", "submission.import-external.search.placeholder": "Search the external source", @@ -5313,4 +5285,4 @@ "submission.sections.proxy-license.upload-failed": "Proxy license upload failed", "submission.sections.proxy-license.remove-successful": "Proxy license remove successful", -} +} \ No newline at end of file diff --git a/src/themes/tamu/assets/i18n/en.json5 b/src/themes/tamu/assets/i18n/en.json5 index 49c4f7fcbf6..0ceef7ec5b4 100644 --- a/src/themes/tamu/assets/i18n/en.json5 +++ b/src/themes/tamu/assets/i18n/en.json5 @@ -43,4 +43,30 @@ "submission.sections.proxy-license.remove-successful": "Proxy license remove successful", + "error-page.orcid.generic-error": "An error occurred during login via ORCID. Make sure you have shared your ORCID account email address with OAKTrust. If the error persists, contact the administrator", + + "admin.registries.metadata.description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, OAKTrust requires the qualified Dublin Core schema.", + + "browse.comcol.by.srsc": "By Department", + + "browse.metadata.srsc.breadcrumbs": "Browse by Department", + + "feed.description": "RSS feed", + + "menu.section.browse_global_by_srsc": "By Department", + + "mydspace.title": "My OAKTrust", + + "nav.browse.header": "All of OAKTrust", + + "nav.mydspace": "My OAKTrust", + + "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to OAKTrust.", + + "search.filters.filter.type.head": "Type", + + "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to OAKTrust.", + + "submission.import-external.back-to-my-dspace": "Back to My OAKTrust", + } From c36724a3f4efd8e1aa6f7a6d260d9641bc916b37 Mon Sep 17 00:00:00 2001 From: Q'Sean <134101252+qtamu@users.noreply.github.com> Date: Tue, 6 Feb 2024 10:45:06 -0600 Subject: [PATCH 8/9] Update src/assets/i18n/en.json5 Co-authored-by: Kevin Day <35114839+kaladay@users.noreply.github.com> --- src/assets/i18n/en.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index dc28d387e20..da049d98bb1 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -5285,4 +5285,4 @@ "submission.sections.proxy-license.upload-failed": "Proxy license upload failed", "submission.sections.proxy-license.remove-successful": "Proxy license remove successful", -} \ No newline at end of file +} From 6669de244691536e19f787e7a02f924f5103ace2 Mon Sep 17 00:00:00 2001 From: Q'Sean <134101252+qtamu@users.noreply.github.com> Date: Tue, 6 Feb 2024 11:10:36 -0600 Subject: [PATCH 9/9] Update en.json5 EOL added