geonetwork-ui 2.7.0-dev.7a5d403cf → 2.7.0-dev.7cec835f7

package/src/libs/api/repository/src/lib/gn4/gn4-repository.ts

@@ -48,7 +48,7 @@ import {
 import { catchError, map, tap } from 'rxjs/operators'
 import { lt } from 'semver'
 import { ElasticsearchService } from './elasticsearch'
-import { getLang2FromLang3 } from '../../../../../../libs/util/i18n/src'
+import { toLang2 } from '../../../../../../libs/util/i18n/src'
 import { Gn4SettingsService } from './settings/gn4-settings.service'
 
 const minPublicationApiVersion = '4.2.5'
@@ -562,7 +562,7 @@ export class Gn4Repository implements RecordsRepositoryInterface {
       .pipe(
         map((languages) =>
           languages
-            .map((lang) => getLang2FromLang3(lang.id))
+            .map((lang) => toLang2(lang.id))
             .filter((code): code is string => !!code)
         )
       )

package/src/libs/api/repository/src/lib/gn4/organizations/organizations-from-groups.service.ts

@@ -7,7 +7,7 @@ import {
 import { forkJoin, Observable, of } from 'rxjs'
 import { map, shareReplay } from 'rxjs/operators'
 import { TranslateService } from '@ngx-translate/core'
-import { getLang3FromLang2 } from '../../../../../../../libs/util/i18n/src'
+import { toLang3 } from '../../../../../../../libs/util/i18n/src'
 import { FieldFilters } from '../../../../../../../libs/common/domain/src/lib/model/search'
 import {
   CatalogRecord,
@@ -52,7 +52,7 @@ export class OrganizationsFromGroupsService
   organisationsCount$ = this.organisations$.pipe(map((orgs) => orgs.length))
 
   private get lang3() {
-    return getLang3FromLang2(this.translateService.currentLang)
+    return toLang3(this.translateService.currentLang)
   }
 
   constructor(

package/src/libs/api/repository/src/lib/gn4/organizations/organizations-from-metadata.service.ts

@@ -33,7 +33,7 @@ import {
   tap,
   withLatestFrom,
 } from 'rxjs/operators'
-import { getLocalizedIndexKey } from '../../../../../../../libs/util/i18n/src'
+import { toLang3 } from '../../../../../../../libs/util/i18n/src'
 import { PlatformServiceInterface } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import { coerce, satisfies, valid } from 'semver'
 import { TranslateService } from '@ngx-translate/core'
@@ -126,7 +126,7 @@ export class OrganizationsFromMetadataService
   ) {}
 
   private get langIndex() {
-    return getLocalizedIndexKey(this.translateService.currentLang)
+    return `lang${toLang3(this.translateService.currentLang)}`
   }
 
   equalsNormalizedStrings(

package/src/libs/api/repository/src/lib/gn4/platform/gn4-platform.service.ts

@@ -45,7 +45,7 @@ import {
   throwError,
 } from 'rxjs'
 import { TranslateService } from '@ngx-translate/core'
-import { getLang3FromLang2 } from '../../../../../../../libs/util/i18n/src'
+import { toLang3 } from '../../../../../../../libs/util/i18n/src'
 
 const minApiVersion = '4.2.2'
 
@@ -98,7 +98,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
   private keywordsByThesauri: Record<string, Observable<Keyword[]>> = {}
 
   private get lang3() {
-    return getLang3FromLang2(this.translateService.currentLang)
+    return toLang3(this.translateService.currentLang)
   }
 
   constructor(

package/src/libs/api/repository/src/lib/metadata-language.token.ts

@@ -0,0 +1,8 @@
+import { InjectionToken } from '@angular/core'
+import { LanguageCode } from '../../../../../libs/common/domain/src/lib/model/record'
+
+export type LanguageCodeFactory = () => LanguageCode
+
+export const METADATA_LANGUAGE = new InjectionToken<
+  LanguageCode | LanguageCodeFactory
+>('metadata-language')

package/src/libs/feature/catalog/src/lib/sources/sources.service.ts

@@ -4,7 +4,7 @@ import { Observable } from 'rxjs'
 import { filter, map, shareReplay } from 'rxjs/operators'
 import { CatalogSource } from './sources.model'
 import { TranslateService } from '@ngx-translate/core'
-import { getLang3FromLang2 } from '../../../../../../libs/util/i18n/src'
+import { toLang3 } from '../../../../../../libs/util/i18n/src'
 
 @Injectable({
   providedIn: 'root',
@@ -23,10 +23,7 @@ export class SourcesService {
     return this.sources$.pipe(
       map((sources) => sources.filter((source) => source.uuid === uuid)[0]),
       filter((source) => !!source),
-      map(
-        (source) =>
-          source.label[getLang3FromLang2(this.translateService.currentLang)]
-      )
+      map((source) => source.label[toLang3(this.translateService.currentLang)])
     )
   }
 }

package/src/libs/util/app-config/src/lib/fixtures.ts

@@ -124,7 +124,7 @@ export const wrongLanguageCodeConfigFixture = () => `
 [global]
 geonetwork4_api_url = "/geonetwork/srv/api"
 proxy_path = "/proxy/?url="
-metadata_language = "fra"
+metadata_language = "abc"
 
 [map]
 

package/src/libs/util/app-config/src/lib/parse-utils.ts

@@ -1,4 +1,4 @@
-import { LANGUAGE_CODES_ISO_3 } from './constants'
+import { toLang2 } from '../../../../../libs/util/i18n/src'
 
 const flatten = (
   base: string,
@@ -129,13 +129,10 @@ export function checkMetadataLanguage(
   parsedConfigSection: any,
   outWarnings: string[]
 ) {
-  if (
-    LANGUAGE_CODES_ISO_3.indexOf(
-      parsedConfigSection.metadata_language.toLowerCase()
-    ) === -1
-  ) {
+  const lang2 = toLang2(parsedConfigSection.metadata_language.toLowerCase())
+  if (lang2?.length !== 2) {
     outWarnings.push(
-      `In the [global] section: metadata_language = "${parsedConfigSection.metadata_language}" is not in ISO 639-2/B format`
+      `In the [global] section: metadata_language = "${parsedConfigSection.metadata_language}" is not a recognized ISO 639 language code`
     )
   }
   return parsedConfigSection

package/src/libs/util/i18n/src/lib/language-codes.ts

@@ -1,20 +1,32 @@
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
 
+/**
+ * Taken from https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes
+ * Note: some languages have multiple 3-char codes, like 'fre' and 'fra'; in that case, the one to be used
+ * in priority is the one defined last
+ */
 const LANG_3_TO_2_MAPPER = {
   eng: 'en',
+  nld: 'nl', // duplicate for "dut"
   dut: 'nl',
+  fra: 'fr', // duplicate for "fre"
   fre: 'fr',
+  deu: 'de', // duplicate for "ger"
   ger: 'de',
   kor: 'ko',
   spa: 'es',
+  ces: 'cs', // duplicate for "cze"
   cze: 'cs',
   cat: 'ca',
   fin: 'fi',
+  isl: 'is', // duplicate for "ice"
   ice: 'is',
   ita: 'it',
   por: 'pt',
   rus: 'ru',
+  zho: 'zh', // duplicate for "chi"
   chi: 'zh',
+  slk: 'sk', // duplicate for "slo"
   slo: 'sk',
   roh: 'rm',
   ara: 'ar',
@@ -25,10 +37,12 @@ const LANG_3_TO_2_MAPPER = {
   tur: 'tr',
   arm: 'hy',
   aze: 'az',
+  kat: 'ka', // duplicate for "geo"
   geo: 'ka',
   ukr: 'uk',
+  cym: 'cy', // duplicate for "wel"
   wel: 'cy',
-}
+} as const
 
 export const LANGUAGE_NAMES = {
   en: 'English',
@@ -58,26 +72,63 @@ export const LANGUAGE_NAMES = {
   ka: 'ქართული',
   uk: 'українська',
   wel: 'Cymraeg',
-}
+} as const
+
+export type LanguageCode3 = keyof typeof LANG_3_TO_2_MAPPER
+export type LanguageCode2 = (typeof LANG_3_TO_2_MAPPER)[LanguageCode3]
 
 export const LANG_2_TO_3_MAPPER = Object.entries(LANG_3_TO_2_MAPPER).reduce(
   (mapperObject, langEntry) => {
     return { ...mapperObject, [langEntry[1]]: langEntry[0] }
   },
   {}
-)
+) as Record<LanguageCode2, LanguageCode3>
 
-export function getLang3FromLang2(lang2: string): string {
-  return LANG_2_TO_3_MAPPER[lang2] ?? lang2
-}
+/**
+ * This can be:
+ * - an ISO 639-2 language code in 3 characters (e.g. 'eng', 'fre', 'ger')
+ * - an ISO 639-1 language code in 2 characters (e.g. 'en', 'fr', 'de')
+ * - a 2-character language code with locale (e.g. 'fr_FR', 'fr_CA')
+ */
+export type LanguageCodeLike = LanguageCode2 | LanguageCode3 | string
 
-export function getLang2FromLang3(lang3: string): string {
-  return LANG_3_TO_2_MAPPER[lang3] ?? lang3
+/**
+ * Converts a language code in any format to the ISO 639-2 format (3 characters)
+ * Returns the given string if the corresponding language code could not be recognized
+ */
+export function toLang3(lang: LanguageCodeLike): LanguageCode3 | string {
+  if (!lang) {
+    // also handle falsy values just in case
+    return lang
+  }
+  if (lang.length === 3) {
+    return LANG_2_TO_3_MAPPER[LANG_3_TO_2_MAPPER[lang.toLowerCase()]] ?? lang
+  }
+  const lang2 = lang.toLowerCase().substring(0, 2)
+  return LANG_2_TO_3_MAPPER[lang2] ?? lang
 }
 
-export function getLocalizedIndexKey(lang2: string): string {
-  const lang3 = getLang3FromLang2(lang2)
-  return lang3 ? `lang${lang3}` : null
+/**
+ * Converts a language code in any format to the ISO 639-1 format (2 characters)
+ * Returns the given string if the corresponding language code could not be recognized
+ */
+export function toLang2(lang: LanguageCodeLike): LanguageCode2 | string {
+  if (!lang) {
+    // also handle falsy values just in case
+    return lang
+  }
+  if (lang.length === 3) {
+    return LANG_3_TO_2_MAPPER[lang.toLowerCase()] ?? lang
+  }
+  const lang2 = lang.toLowerCase().substring(0, 2)
+  if (lang2 in LANG_2_TO_3_MAPPER) {
+    return lang2
+  }
+  if (lang.match(/[a-z]{2}_[A-Z]{2}/)) {
+    // remove locale code even if the language code is not known
+    return lang2
+  }
+  return lang
 }
 
 marker('language.en')

package/esm2022/libs/api/repository/src/lib/metadata-language.mjs

@@ -1,3 +0,0 @@
-import { InjectionToken } from '@angular/core';
-export const METADATA_LANGUAGE = new InjectionToken('metadata-language');
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWV0YWRhdGEtbGFuZ3VhZ2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9saWJzL2FwaS9yZXBvc2l0b3J5L3NyYy9saWIvbWV0YWRhdGEtbGFuZ3VhZ2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGVBQWUsQ0FBQTtBQUU5QyxNQUFNLENBQUMsTUFBTSxpQkFBaUIsR0FBRyxJQUFJLGNBQWMsQ0FBUyxtQkFBbUIsQ0FBQyxDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0aW9uVG9rZW4gfSBmcm9tICdAYW5ndWxhci9jb3JlJ1xuXG5leHBvcnQgY29uc3QgTUVUQURBVEFfTEFOR1VBR0UgPSBuZXcgSW5qZWN0aW9uVG9rZW48c3RyaW5nPignbWV0YWRhdGEtbGFuZ3VhZ2UnKVxuIl19