[DSC-1529] resolve conflicts with maintenance branch

Author: FrancescoMolinaro

src/assets/i18n/en.json5

@@ -7376,4 +7376,7 @@
   "form.other-information.selection.data-crispj_coinvestigator_affiliation": "Affiliation",
 
   "form.other-information.selection.alternative-names": "Select alternative name",
+
+  "meta.tag.missing.description": "No description available",
+
 }

src/config/app-config.interface.ts

@@ -33,6 +33,7 @@ import { AttachmentRenderingConfig } from './attachment-rendering.config';
 import { SearchResultConfig } from './search-result-config.interface';
 import { MiradorConfig } from './mirador-config.interfaces';
 import { LoaderConfig } from './loader-config.interfaces';
+import { MetaTagFallbacksConfig } from './metatag-fallbacks.config';
 
 interface AppConfig extends Config {
   ui: UIServerConfig;
@@ -72,6 +73,7 @@ interface AppConfig extends Config {
   searchResult: SearchResultConfig;
   mirador: MiradorConfig;
   loader: LoaderConfig;
+  metaTagFallbacksConfig: MetaTagFallbacksConfig
 }
 
 /**

src/config/default-app-config.ts

@@ -768,4 +768,9 @@ export class DefaultAppConfig implements AppConfig {
     warningMessageDelay: 5000, // 5 seconds
     errorMessageDelay: 15000, // 15 seconds
   };
+
+  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

@@ -583,4 +583,9 @@ export const environment: BuildConfig = {
     warningMessageDelay: 1000,
     errorMessageDelay: 2000,
   },
+
+  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.'
+  }
 };