[DSC-1529] fix merge conflicts, change logo for cris

Author: FrancescoMolinaro

src/assets/i18n/en.json5

@@ -7334,4 +7334,6 @@
   "third-party-metrics-cookies.consent-settings": "consent settings",
 
   "third-party-metrics-blocked": "Some of the metrics are blocked by your",
+
+  "meta.tag.missing.description": "No description available",
 }

src/assets/i18n/es.json5

@@ -11728,9 +11728,4 @@
   // "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
   "access-control-option-end-date-note": "Escoja la fecha hasta la cuál se aplicarán las condiciones de acceso especificadas",
 
-  // "meta.tag.missing.description": "No description available"
-  // TODO New key - Add a translation
-  "meta.tag.missing.description": "No description available"
-
-
 }

src/config/app-config.interface.ts

@@ -32,6 +32,7 @@ import { AdvancedAttachmentRenderingConfig } from './advanced-attachment-renderi
 import { AttachmentRenderingConfig } from './attachment-rendering.config';
 import { SearchResultConfig } from './search-result-config.interface';
 import { MiradorConfig } from './mirador-config.interfaces';
+import { MetaTagFallbacksConfig } from './metatag-fallbacks.config';
 
 interface AppConfig extends Config {
   ui: UIServerConfig;
@@ -70,6 +71,7 @@ interface AppConfig extends Config {
   advancedAttachmentRendering: AdvancedAttachmentRenderingConfig;
   searchResult: SearchResultConfig;
   mirador: MiradorConfig;
+  metaTagFallbacksConfig: MetaTagFallbacksConfig
 }
 
 /**

src/config/default-app-config.ts

@@ -760,4 +760,10 @@ export class DefaultAppConfig implements AppConfig {
   mirador: MiradorConfig = {
     enableDownloadPlugin: true,
   };
+
+
+  metaTagFallbacksConfig = {
+    logo: '/assets/images/dspace-cris-logo.png',
+    description: 'DSpace is the most widely used repository software with more than 3000 installations around the world. It is free, open source and completely customisable to fit the needs of any organisation.'
+  };
 }

src/environments/environment.test.ts

@@ -577,4 +577,9 @@ export const environment: BuildConfig = {
   mirador: {
     enableDownloadPlugin: true,
   },
+
+  metaTagFallbacksConfig: {
+    logo: '/assets/images/dspace-cris-logo.png',
+    description: 'DSpace is the most widely used repository software with more than 3000 installations around the world. It is free, open source and completely customisable to fit the needs of any organisation.'
+  }
 };