geonetwork-ui 2.7.0-dev.b9840dab3 → 2.7.0-dev.d3eeddaf5

package/src/libs/common/domain/src/lib/model/record/metadata.model.ts

@@ -108,6 +108,11 @@ export interface Keyword {
   translations?: KeywordTranslations
 }
 
+export interface INSPIRE_theme {
+  value: string
+  label: string
+}
+
 export interface BaseRecord {
   uniqueIdentifier: Uuid
   ownerOrganization: Organization
@@ -160,6 +165,17 @@ export type ServiceProtocol =
   | 'maplibre-style'
   | 'other'
 
+marker('record.metadata.api.accessServiceProtocol.wms')
+marker('record.metadata.api.accessServiceProtocol.wfs')
+marker('record.metadata.api.accessServiceProtocol.wps')
+marker('record.metadata.api.accessServiceProtocol.wmts')
+marker('record.metadata.api.accessServiceProtocol.esriRest')
+marker('record.metadata.api.accessServiceProtocol.ogcFeatures')
+marker('record.metadata.api.accessServiceProtocol.GPFDL')
+marker('record.metadata.api.accessServiceProtocol.tms')
+marker('record.metadata.api.accessServiceProtocol.maplibre-style')
+marker('record.metadata.api.accessServiceProtocol.other')
+
 export type OnlineResourceType = 'service' | 'download' | 'link' | 'endpoint'
 
 export interface DatasetServiceDistribution {
@@ -258,7 +274,7 @@ export interface ServiceRecord extends BaseRecord {
 export interface ReuseRecord extends BaseRecord {
   kind: 'reuse'
   lineage: string // Explanation of the origin of this record (e.g: how, why)"
-  onlineResources: Array<OnlineLinkResource>
+  onlineResources: Array<DatasetOnlineResource>
   reuseType: ReuseType
   spatialExtents: Array<DatasetSpatialExtent>
   temporalExtents: Array<DatasetTemporalExtent>

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/feature/editor/src/lib/components/record-form/form-field/form-field-inspire-field/form-field-inspire-theme.component.html

@@ -0,0 +1,20 @@
+<div class="flex flex-col gap-3">
+  <div class="flex flex-col gap-4">
+    <gn-ui-autocomplete
+      [placeholder]="'editor.record.form.inspire.placeholder' | translate"
+      [displayWithFn]="displayWithFn"
+      [action]="autoCompleteAction"
+      (itemSelected)="handleItemSelection($event)"
+      [minCharacterCount]="1"
+      [clearOnSelection]="true"
+    ></gn-ui-autocomplete>
+    <div class="flex gap-2 flex-wrap">
+      <gn-ui-badge
+        *ngFor="let theme of themes"
+        [removable]="true"
+        (badgeRemoveClicked)="removeTheme(theme)"
+        >{{ getTranslatedTheme(theme) }}
+      </gn-ui-badge>
+    </div>
+  </div>
+</div>

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-inspire-field/form-field-inspire-theme.component.ts

@@ -0,0 +1,85 @@
+import { Component, EventEmitter, Input, Output } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { AutocompleteComponent, BadgeComponent } from '../../../../../../../../../libs/ui/inputs/src'
+import { NgIconComponent } from '@ng-icons/core'
+import { INSPIRE_THEMES } from '../../../../fields.config'
+import { TranslatePipe, TranslateService } from '@ngx-translate/core'
+import { of } from 'rxjs'
+
+type AutocompleteItem = { title: string; value: string }
+
+@Component({
+  selector: 'gn-ui-form-field-inspire-theme',
+  standalone: true,
+  imports: [
+    CommonModule,
+    AutocompleteComponent,
+    NgIconComponent,
+    BadgeComponent,
+    TranslatePipe,
+  ],
+  templateUrl: './form-field-inspire-theme.component.html',
+  styleUrl: './form-field-inspire-theme.component.css',
+})
+export class FormFieldInspireThemeComponent {
+  themes = []
+  @Input() set value(themes: string[]) {
+    this.themes = themes
+  }
+  @Output() valueChange: EventEmitter<string[]> = new EventEmitter()
+  availableThemes = INSPIRE_THEMES
+
+  displayWithFn = (item: AutocompleteItem) => {
+    return item?.title ? `${item.title}` : ''
+  }
+
+  autoCompleteAction = (query: string) => {
+    return of(
+      this.availableThemes
+        .filter((theme) =>
+          theme.value.toLowerCase().includes(query.toLowerCase())
+        )
+        .sort((a, b) => {
+          const aStarts = a.value.startsWith(query)
+          const bStarts = b.value.startsWith(query)
+
+          if (aStarts && !bStarts) return -1
+          if (!aStarts && bStarts) return 1
+          return 0
+        })
+        .map((theme) => {
+          return {
+            title: this.translateService.instant(theme.label),
+            value: theme.value,
+          }
+        })
+    )
+  }
+
+  constructor(private translateService: TranslateService) {}
+
+  handleItemSelection(item: AutocompleteItem) {
+    this.addTheme(item.value)
+  }
+
+  addTheme(theme: string) {
+    const duplicatedTheme = this.themes.find((t) => t === theme)
+    if (!duplicatedTheme) {
+      this.themes = [...this.themes, theme]
+      this.valueChange.emit(this.themes)
+    }
+  }
+
+  removeTheme(theme: string) {
+    console.log(this.themes)
+    this.themes = this.themes.filter((t) => t !== theme)
+    this.valueChange.emit(this.themes)
+  }
+
+  getTranslatedTheme(theme: string) {
+    const themeKey = this.availableThemes.find(
+      (avail) => avail.value === theme
+    )?.label
+    return themeKey ? this.translateService.instant(themeKey) : ''
+  }
+}

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.html

@@ -109,6 +109,12 @@
         (valueChange)="valueChange.emit($event)"
       ></gn-ui-form-field-keywords>
     </ng-container>
+    <ng-container *ngSwitchCase="'topics'">
+      <gn-ui-form-field-inspire-theme
+        [value]="valueAsInspireTheme"
+        (valueChange)="valueChange.emit($event)"
+      ></gn-ui-form-field-inspire-theme>
+    </ng-container>
     <ng-container *ngSwitchCase="'licenses'">
       <gn-ui-form-field-license
         [label]="config.labelKey! | translate"

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.ts

@@ -45,6 +45,7 @@ import { FormFieldConstraintsShortcutsComponent } from './form-field-constraints
 import { FormFieldConstraintsComponent } from './form-field-constraints/form-field-constraints.component'
 import { TextFieldModule } from '@angular/cdk/text-field'
 import { FormFieldSpatialToggleComponent } from './form-field-spatial-toggle/form-field-spatial-toggle.component'
+import { FormFieldInspireThemeComponent } from './form-field-inspire-field/form-field-inspire-theme.component'
 
 @Component({
   selector: 'gn-ui-form-field',
@@ -73,6 +74,7 @@ import { FormFieldSpatialToggleComponent } from './form-field-spatial-toggle/for
     FormFieldConstraintsComponent,
     FormFieldConstraintsShortcutsComponent,
     FormFieldSpatialToggleComponent,
+    FormFieldInspireThemeComponent,
     TextFieldModule,
   ],
 })
@@ -128,6 +130,9 @@ export class FormFieldComponent {
   get valueAsKeywords() {
     return this.value as Array<Keyword>
   }
+  get valueAsInspireTheme() {
+    return this.value as Array<string>
+  }
   get valueAsConstraints() {
     return this.value as Array<Constraint>
   }

package/src/libs/feature/editor/src/lib/components/record-form/form-field/index.ts

@@ -10,3 +10,4 @@ export * from './form-field-array/form-field-array.component'
 export * from './form-field-spatial-extent/form-field-spatial-extent.component'
 export * from './form-field.component'
 export * from './form-field-constraints-shortcuts/constraints.utils'
+export * from './form-field-inspire-field/form-field-inspire-theme.component'

package/src/libs/feature/editor/src/lib/fields.config.ts

@@ -4,7 +4,10 @@ import {
   EditorField,
   EditorSection,
 } from './models/editor-config.model'
-import { Keyword } from '../../../../../libs/common/domain/src/lib/model/record'
+import {
+  INSPIRE_theme,
+  Keyword,
+} from '../../../../../libs/common/domain/src/lib/model/record'
 
 /**
  * This file contains the configuration of the fields that will be displayed in the editor.
@@ -64,6 +67,11 @@ export const RECORD_KEYWORDS_FIELD: EditorField = {
   formFieldConfig: {},
 }
 
+export const RECORD_TOPICS_FIELD: EditorField = {
+  model: 'topics',
+  formFieldConfig: {},
+}
+
 export const RECORD_RESOURCE_CREATED_FIELD: EditorField = {
   model: 'resourceCreated',
   formFieldConfig: {
@@ -235,6 +243,13 @@ export const CLASSIFICATION_SECTION: EditorSection = {
   fields: [RECORD_KEYWORDS_FIELD],
 }
 
+export const INSPIRE_SECTION: EditorSection = {
+  labelKey: marker('editor.record.form.section.inspire.label'),
+  descriptionKey: marker('editor.record.form.section.inspire.description'),
+  hidden: false,
+  fields: [RECORD_TOPICS_FIELD],
+}
+
 export const USE_AND_ACCESS_CONDITIONS_SECTION: EditorSection = {
   labelKey: marker('editor.record.form.section.useAndAccessConditions.label'),
   hidden: false,
@@ -274,6 +289,7 @@ export const DEFAULT_CONFIGURATION: EditorConfig = {
       sections: [
         TITLE_SECTION,
         CLASSIFICATION_SECTION,
+        INSPIRE_SECTION,
         ABOUT_SECTION,
         GEOGRAPHICAL_COVERAGE_SECTION,
       ],
@@ -341,3 +357,71 @@ export const SPATIAL_SCOPES: Keyword[] = [
     type: 'theme',
   },
 ]
+
+/************************************************************
+ ***************           INSPIRE THEMES            **************
+ ************************************************************
+ */
+
+export const INSPIRE_THEMES: INSPIRE_theme[] = [
+  { value: 'biota', label: 'editor.record.form.inspire.biota' },
+  { value: 'boundaries', label: 'editor.record.form.inspire.boundaries' },
+  {
+    value: 'climatologyMeteorologyAtmosphere',
+    label: 'editor.record.form.inspire.climatology',
+  },
+  { value: 'economy', label: 'editor.record.form.inspire.economy' },
+  { value: 'elevation', label: 'editor.record.form.inspire.elevation' },
+  { value: 'environment', label: 'editor.record.form.inspire.environnement' },
+  { value: 'farming', label: 'editor.record.form.inspire.farming' },
+  {
+    value: 'geoscientific information',
+    label: 'editor.record.form.inspire.geoscientific',
+  },
+  { value: 'health', label: 'editor.record.form.inspire.health' },
+  {
+    value: 'imageryBaseMapsEarthCover',
+    label: 'editor.record.form.inspire.imagery',
+  },
+  {
+    value: 'intelligenceMilitary',
+    label: 'editor.record.form.inspire.intelligence',
+  },
+  { value: 'Location', label: 'editor.record.form.inspire.location' },
+  { value: 'Oceans', label: 'editor.record.form.inspire.oceans' },
+  {
+    value: 'planningCadastre',
+    label: 'editor.record.form.inspire.planning',
+  },
+  { value: 'Society', label: 'editor.record.form.inspire.society' },
+  { value: 'Structure', label: 'editor.record.form.inspire.structure' },
+  {
+    value: 'Transportation',
+    label: 'editor.record.form.inspire.transportation',
+  },
+  {
+    value: 'utilitiesCommunication',
+    label: 'editor.record.form.inspire.utilities',
+  },
+  { value: 'inlandWaters', label: 'editor.record.form.inspire.waters' },
+]
+
+marker('editor.record.form.inspire.biota')
+marker('editor.record.form.inspire.boundaries')
+marker('editor.record.form.inspire.climatology')
+marker('editor.record.form.inspire.economy')
+marker('editor.record.form.inspire.elevation')
+marker('editor.record.form.inspire.environnement')
+marker('editor.record.form.inspire.farming')
+marker('editor.record.form.inspire.geoscientific')
+marker('editor.record.form.inspire.health')
+marker('editor.record.form.inspire.imagery')
+marker('editor.record.form.inspire.intelligence')
+marker('editor.record.form.inspire.location')
+marker('editor.record.form.inspire.oceans')
+marker('editor.record.form.inspire.planning')
+marker('editor.record.form.inspire.society')
+marker('editor.record.form.inspire.structure')
+marker('editor.record.form.inspire.transportation')
+marker('editor.record.form.inspire.utilities')
+marker('editor.record.form.inspire.waters')

package/src/libs/feature/map/src/lib/utils/map-utils.service.ts

@@ -1,25 +1,25 @@
 import { Injectable } from '@angular/core'
-import { extend, Extent } from 'ol/extent'
-import GeoJSON from 'ol/format/GeoJSON'
+import { extend } from 'ol/extent'
 import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
-
-const GEOJSON = new GeoJSON()
+import { BoundingBox, getGeometryBoundingBox } from '../../../../../../libs/util/shared/src'
 
 @Injectable({
   providedIn: 'root',
 })
 export class MapUtilsService {
-  getRecordExtent(record: Partial<CatalogRecord>): Extent {
+  getRecordExtent(record: Partial<CatalogRecord>): BoundingBox {
     if (!('spatialExtents' in record) || record.spatialExtents.length === 0) {
       return null
     }
     // extend all the spatial extents into an including bbox
     return record.spatialExtents.reduce(
       (prev, curr) => {
-        if ('bbox' in curr) return extend(prev, curr.bbox)
+        if ('bbox' in curr) return extend(prev, curr.bbox) as BoundingBox
         else if ('geometry' in curr) {
-          const geom = GEOJSON.readGeometry(curr.geometry)
-          return extend(prev, geom.getExtent())
+          return extend(
+            prev,
+            getGeometryBoundingBox(curr.geometry)
+          ) as BoundingBox
         }
         return prev
       },

package/src/libs/feature/router/src/lib/default/state/query-params.utils.ts

@@ -14,7 +14,10 @@ export function flattenQueryParams(
       Array.isArray(flattened[key]) &&
       (flattened[key] as string[]).length > 0
     ) {
-      flattened[key] = [(flattened[key] as string[]).join(',')]
+      const encoded = (flattened[key] as string[]).map((value) =>
+        typeof value === 'string' ? value.replace(/,/g, '%2C') : value
+      )
+      flattened[key] = [encoded.join(',')]
     } else if (isDateRange(flattened[key] as DateRange)) {
       const start = (flattened[key] as DateRange).start
       const end = (flattened[key] as DateRange).end
@@ -48,7 +51,7 @@ export function expandQueryParams(
           ...(end && { end: new Date(`${end}T00:00:00`) }),
         }
       } else {
-        expanded[key] = value.split(',')
+        expanded[key] = value.split(',').map((v) => v.replace(/%2C/g, ','))
       }
     }
   }

package/src/libs/feature/router/src/lib/default/state/router.facade.ts

@@ -63,7 +63,8 @@ export class RouterFacade {
   }
 
   goToOrganization(organizationName: string) {
-    const path = `${this.routerService.getOrganizationPageRoute()}/${organizationName}`
+    const safeOrgName = organizationName.replace(/\//g, '')
+    const path = `${this.routerService.getOrganizationPageRoute()}/${safeOrgName}`
     this.go({
       path,
       queryParamsHandling: '',

package/src/libs/feature/search/src/lib/state/reducer.ts

@@ -8,6 +8,7 @@ import {
   SortByField,
 } from '../../../../../../libs/common/domain/src/lib/model/search'
 import { DEFAULT_PAGE_SIZE, FIELDS_SUMMARY } from '../constants'
+import { getOptionalSearchConfig } from '../../../../../../libs/util/app-config/src'
 import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 
 export const SEARCH_FEATURE_KEY = 'searchState'
@@ -55,7 +56,9 @@ export const initSearch = (): SearchStateSearch => {
     },
     params: {
       filters: {},
-      pageSize: DEFAULT_PAGE_SIZE,
+      pageSize: getOptionalSearchConfig()?.LIMIT
+        ? getOptionalSearchConfig().LIMIT
+        : DEFAULT_PAGE_SIZE,
       currentPage: 0,
       favoritesOnly: false,
       useSpatialFilter: true,

package/src/libs/ui/elements/src/lib/api-card/api-card.component.html

@@ -67,7 +67,10 @@
         [ngClass]="{
           '!bg-primary': currentlyActive,
         }"
-        >{{ link.accessServiceProtocol }}</span
+        translate
+        >record.metadata.api.accessServiceProtocol.{{
+          link.accessServiceProtocol
+        }}</span
       >
       <span
         *ngIf="link.accessServiceProtocol === 'GPFDL'"

package/src/libs/ui/elements/src/lib/metadata-quality/metadata-quality.component.ts

@@ -74,10 +74,6 @@ export class MetadataQualityComponent implements OnChanges {
     )
   }
 
-  hasGetCapabilities(url: string): boolean {
-    return url.toLowerCase().includes('capabilities')
-  }
-
   initialize() {
     if (!this.propsToValidate) {
       this.propsToValidate = getAllKeysValidator()

package/src/libs/ui/elements/src/lib/metadata-quality-item/metadata-quality-item.component.ts

@@ -6,16 +6,16 @@ import { matCheck, matWarningAmber } from '@ng-icons/material-icons/baseline'
 
 marker('record.metadata.quality.title.success')
 marker('record.metadata.quality.title.failed')
-marker('record.metadata.quality.description.success')
-marker('record.metadata.quality.description.failed')
-marker('record.metadata.quality.topic.success')
-marker('record.metadata.quality.topic.failed')
+marker('record.metadata.quality.abstract.success')
+marker('record.metadata.quality.abstract.failed')
+marker('record.metadata.quality.topics.success')
+marker('record.metadata.quality.topics.failed')
 marker('record.metadata.quality.keywords.success')
 marker('record.metadata.quality.keywords.failed')
 marker('record.metadata.quality.legalConstraints.success')
 marker('record.metadata.quality.legalConstraints.failed')
-marker('record.metadata.quality.contact.success')
-marker('record.metadata.quality.contact.failed')
+marker('record.metadata.quality.contacts.success')
+marker('record.metadata.quality.contacts.failed')
 marker('record.metadata.quality.updateFrequency.success')
 marker('record.metadata.quality.updateFrequency.failed')
 marker('record.metadata.quality.organisation.success')

package/src/libs/ui/elements/src/lib/service-capabilities/service-capabilities.component.ts

@@ -136,12 +136,6 @@ export class ServiceCapabilitiesComponent implements OnInit {
   }
 
   selectLayer(layer: WfsFeatureTypeFull | WmsLayerFull | WmtsLayer) {
-    if (layer === this.selectedLayer) {
-      this.selectedLayer = null
-      this.layerInformation = []
-      return
-    }
-
     this.selectedLayer = layer
     const filteredInfo = []
     Object.keys(layer).map((key) => {

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

@@ -231,6 +231,7 @@ export function loadAppConfig() {
           'filter_geometry_url',
           'search_preset',
           'advanced_filters',
+          'limit',
         ],
         warnings,
         errors
@@ -257,6 +258,7 @@ export function loadAppConfig() {
                 filters: param.filters,
               })),
               ADVANCED_FILTERS: parsedSearchSection.advanced_filters,
+              LIMIT: parsedSearchSection.limit,
             } as SearchConfig)
 
       const parsedMetadataQualitySection = parseConfigSection(

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/model.ts

@@ -60,6 +60,7 @@ export interface SearchConfig {
   FILTER_GEOMETRY_DATA?: string
   SEARCH_PRESET?: SearchPreset[]
   ADVANCED_FILTERS?: []
+  LIMIT?: number
 }
 
 export interface MetadataQualityConfig {

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')