geonetwork-ui 2.10.0-dev.122ccbde0 → 2.10.0-dev.12ab1b88c

package/src/libs/ui/map/src/lib/map-utils.ts

@@ -12,6 +12,54 @@ import {
   MouseWheelZoom,
 } from 'ol/interaction.js'
 import MapBrowserEvent from 'ol/MapBrowserEvent.js'
+import type { DatasetSpatialExtent } from '../../../../../libs/common/domain/src/lib/model/record'
+import type {
+  MapContextLayer,
+  MapContextLayerGeojson,
+} from '@geospatial-sdk/core'
+import { spatialExtentsToFeatureCollection } from '../../../../../libs/util/shared/src'
+
+export type SpatialExtentLayerStyle = NonNullable<
+  MapContextLayerGeojson['style']
+>
+
+/**
+ * Default style for a spatial-extent layer: a solid black outline over a
+ * translucent grey fill.
+ */
+export const DEFAULT_SPATIAL_EXTENT_STYLE: SpatialExtentLayerStyle = {
+  'stroke-color': 'black',
+  'stroke-width': 2,
+  'fill-color': 'rgba(153, 153, 153, 0.3)',
+}
+
+/**
+ * Builds a GeoJSON map layer drawing the given spatial extents: each extent is
+ * rendered from its own geometry or, when only a bounding box is available,
+ * from a polygon derived from that box.
+ *
+ * @returns the layer, or `null` when none of the extents can be represented.
+ */
+export function createSpatialExtentLayer(
+  extents: DatasetSpatialExtent[],
+  overrides?: {
+    label?: string
+    clickable?: boolean
+    style?: SpatialExtentLayerStyle
+  }
+): MapContextLayer | null {
+  const data = spatialExtentsToFeatureCollection(extents)
+  if (data.features.length === 0) {
+    return null
+  }
+  return {
+    type: 'geojson',
+    data,
+    label: 'Spatial extents',
+    style: DEFAULT_SPATIAL_EXTENT_STYLE,
+    ...overrides,
+  }
+}
 
 export function prioritizePageScroll(interactions: Collection<Interaction>) {
   interactions.clear()

package/src/libs/ui/search/src/lib/record-preview-feed/record-preview-feed.component.ts

@@ -52,7 +52,7 @@ export class RecordPreviewFeedComponent extends RecordPreviewComponent {
   protected elementRef: ElementRef
   private translate = inject(TranslateService)
 
-  timeFormat = new Duration(this.translate.currentLang, {})
+  timeFormat = new Duration(this.translate.getCurrentLang(), {})
 
   constructor() {
     const elementRef = inject(ElementRef)

package/src/libs/ui/search/src/lib/results-table/action-menu/action-menu.component.html

@@ -52,10 +52,10 @@
       class="w-72 p-6 flex flex-col gap-3 mt-2 border border-gray-100 bg-white shadow-2xl rounded-2xl"
     >
       <span class="text-lg font-bold text-center">{{
-        'editor.record.delete.confirmation.title' | translate
+        'editor.record.delete.confirmation.title' | translate: { recordKind }
       }}</span>
       <span class="text-center">{{
-        'editor.record.delete.confirmation.message' | translate
+        'editor.record.delete.confirmation.message' | translate: { recordKind }
       }}</span>
       <div class="flex flex-row gap-8 justify-center">
         <gn-ui-button
@@ -65,14 +65,16 @@
           data-cy="confirm-button"
           [style.--gn-ui-button-width]="'100px'"
           >{{
-            'editor.record.delete.confirmation.confirmText' | translate
+            'editor.record.delete.confirmation.confirmText'
+              | translate: { recordKind }
           }}</gn-ui-button
         >
         <gn-ui-button
           [style.--gn-ui-button-width]="'100px'"
           (buttonClick)="closeActionMenu.emit()"
           >{{
-            'editor.record.delete.confirmation.cancelText' | translate
+            'editor.record.delete.confirmation.cancelText'
+              | translate: { recordKind }
           }}</gn-ui-button
         >
       </div>
@@ -84,10 +86,10 @@
       class="w-80 p-6 flex flex-col gap-3 mt-2 border border-gray-100 bg-white shadow-2xl rounded-2xl"
     >
       <span class="text-lg font-bold text-center">{{
-        'editor.record.undo.confirmation.title' | translate
+        'editor.record.undo.confirmation.title' | translate: { recordKind }
       }}</span>
       <span class="text-center">{{
-        'editor.record.undo.confirmation.message' | translate
+        'editor.record.undo.confirmation.message' | translate: { recordKind }
       }}</span>
       <div class="flex flex-row gap-8 justify-center">
         <gn-ui-button
@@ -97,14 +99,16 @@
           data-cy="confirm-button"
           [style.--gn-ui-button-width]="'120px'"
           >{{
-            'editor.record.undo.confirmation.confirmText' | translate
+            'editor.record.undo.confirmation.confirmText'
+              | translate: { recordKind }
           }}</gn-ui-button
         >
         <gn-ui-button
           [style.--gn-ui-button-width]="'120px'"
           (buttonClick)="closeActionMenu.emit()"
           >{{
-            'editor.record.undo.confirmation.cancelText' | translate
+            'editor.record.undo.confirmation.cancelText'
+              | translate: { recordKind }
           }}</gn-ui-button
         >
       </div>

package/src/libs/ui/search/src/lib/results-table/action-menu/action-menu.component.ts

@@ -2,15 +2,16 @@ import {
   ChangeDetectorRef,
   Component,
   EventEmitter,
+  inject,
   Input,
   Output,
   ViewChild,
-  inject,
 } from '@angular/core'
 import { MatDialog, MatDialogModule } from '@angular/material/dialog'
 import { MatMenuModule, MatMenuTrigger } from '@angular/material/menu'
 import { ButtonComponent } from '../../../../../../../libs/ui/inputs/src'
 import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
+import { RecordKind } from '../../../../../../../libs/common/domain/src/lib/model'
 
 type ActionMenuPage = 'mainMenu' | 'deleteMenu' | 'rollbackMenu'
 
@@ -35,6 +36,7 @@ export class ActionMenuComponent {
   @Input() isDuplicating: boolean
   @Input() canDelete = true
   @Input() page: 'draft' | 'main' | 'record'
+  @Input() recordKind: RecordKind
   @Output() duplicate = new EventEmitter<void>()
   @Output() delete = new EventEmitter<void>()
   @Output() closeActionMenu = new EventEmitter<void>()

package/src/libs/ui/search/src/lib/results-table/results-table.component.html

@@ -172,6 +172,7 @@
           (delete)="handleDelete(item)"
           (closeActionMenu)="closeActionMenu()"
           (rollback)="handleRollback(item)"
+          [recordKind]="item.kind"
         >
         </gn-ui-action-menu>
       </ng-template>

package/src/libs/ui/widgets/src/lib/popover/popover.component.ts

@@ -28,7 +28,13 @@ export class PopoverComponent implements AfterViewInit, OnChanges, OnDestroy {
 
   @ViewChild('popoverContent', { static: false }) popoverContent: ElementRef
   @Input() content: string | TemplateRef<any>
-  @Input() theme: 'light' | 'light-border' | 'translucent' | 'material' | ''
+  @Input() theme:
+    | 'light'
+    | 'light-border'
+    | 'translucent'
+    | 'material'
+    | 'dark'
+    | ''
 
   private tippyInstance: Instance
   private view: EmbeddedViewRef<any>

package/src/libs/ui/widgets/src/lib/spinning-loader/spinning-loader.component.html

@@ -1,6 +1,6 @@
 <span>
   <svg
-    class="animate-spin h-8 w-8 text-primary"
+    class="animate-spin"
     xmlns="http://www.w3.org/2000/svg"
     fill="none"
     viewBox="0 0 24 24"

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

@@ -1,6 +1,8 @@
 import * as TOML from '@ltd/j-toml'
 import {
   checkMetadataLanguage,
+  checkNewRecordDefaultLanguage,
+  checkNewRecordStandard,
   parseConfigSection,
   parseMultiConfigSection,
   parseTranslationsConfigSection,
@@ -8,6 +10,7 @@ import {
 import {
   CustomTranslations,
   CustomTranslationsAllLanguages,
+  EditorConfig,
   GlobalConfig,
   LayerConfig,
   MapConfig,
@@ -15,10 +18,15 @@ import {
   SearchConfig,
   ThemeConfig,
 } from './model'
-import { TranslateCompiler, TranslateLoader } from '@ngx-translate/core'
+import {
+  TranslateCompiler,
+  TranslateLoader,
+  TranslateModuleConfig,
+} from '@ngx-translate/core'
 import { TranslateMessageFormatCompiler } from 'ngx-translate-messageformat-compiler'
-import { HttpClient } from '@angular/common/http'
 import { FileWithOverridesTranslateLoader } from './i18n/file-with-overrides.translate.loader'
+import { TRANSLATE_HTTP_LOADER_CONFIG } from '@ngx-translate/http-loader'
+import { HttpClient } from '@angular/common/http'
 
 const MISSING_CONFIG_ERROR = `Application configuration was not initialized correctly.
 This error might show up in case of an invalid/malformed configuration file.
@@ -51,6 +59,12 @@ export function getOptionalSearchConfig(): SearchConfig | null {
   return searchConfig
 }
 
+let editorConfig: EditorConfig = null
+
+export function getOptionalEditorConfig(): EditorConfig | null {
+  return editorConfig
+}
+
 let metadataQualityConfig: MetadataQualityConfig = null
 export function getMetadataQualityConfig(): MetadataQualityConfig {
   return (
@@ -285,6 +299,45 @@ export function loadAppConfig(configUrl = 'assets/configuration/default.toml') {
               SORTABLE: parsedMetadataQualitySection.sortable,
             } as MetadataQualityConfig)
 
+      let parsedEditingSection = parseConfigSection(
+        parsed,
+        'editing',
+        [],
+        ['new_record_default_language', 'new_record_standard'],
+        warnings,
+        errors
+      )
+      if (
+        parsedEditingSection !== null &&
+        parsedEditingSection.new_record_default_language !== undefined
+      ) {
+        parsedEditingSection = checkNewRecordDefaultLanguage(
+          parsedEditingSection,
+          warnings
+        )
+      }
+      if (
+        parsedEditingSection !== null &&
+        parsedEditingSection.new_record_standard !== undefined
+      ) {
+        parsedEditingSection = checkNewRecordStandard(
+          parsedEditingSection,
+          warnings
+        )
+      }
+      editorConfig =
+        parsedEditingSection === null
+          ? null
+          : ({
+              NEW_RECORD_DEFAULT_LANGUAGE:
+                parsedEditingSection.new_record_default_language as
+                  | string
+                  | undefined,
+              NEW_RECORD_STANDARD: parsedEditingSection.new_record_standard as
+                | EditorConfig['NEW_RECORD_STANDARD']
+                | undefined,
+            } as EditorConfig)
+
       customTranslations = parseTranslationsConfigSection(
         parsed,
         'translations'
@@ -309,19 +362,27 @@ export function isConfigLoaded() {
 export function _reset() {
   globalConfig = null
   themeConfig = null
+  editorConfig = null
   customTranslations = null
 }
 
-export const TRANSLATE_WITH_OVERRIDES_CONFIG = {
+export const TRANSLATE_WITH_OVERRIDES_CONFIG: TranslateModuleConfig = {
   compiler: {
     provide: TranslateCompiler,
     useClass: TranslateMessageFormatCompiler,
   },
-  loader: {
-    provide: TranslateLoader,
-    useFactory: function HttpLoaderFactory(http: HttpClient) {
-      return new FileWithOverridesTranslateLoader(http, './assets/i18n/')
+  loader: [
+    {
+      provide: TRANSLATE_HTTP_LOADER_CONFIG,
+      useValue: {
+        prefix: './assets/i18n/',
+        suffix: '.json',
+      },
     },
-    deps: [HttpClient],
-  },
+    {
+      provide: TranslateLoader,
+      useClass: FileWithOverridesTranslateLoader,
+      deps: [HttpClient, TRANSLATE_HTTP_LOADER_CONFIG],
+    },
+  ],
 }

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

@@ -69,6 +69,13 @@ export interface MetadataQualityConfig {
   ENABLED: boolean
 }
 
+export type NewRecordStandard = 'iso19139' | 'iso19115-3'
+
+export interface EditorConfig {
+  NEW_RECORD_DEFAULT_LANGUAGE?: string
+  NEW_RECORD_STANDARD?: NewRecordStandard
+}
+
 export type CustomTranslations = { [translationKey: string]: string }
 export type CustomTranslationsAllLanguages = {
   [lang: string]: CustomTranslations

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

@@ -1,4 +1,4 @@
-import { toLang2 } from '../../../../../libs/util/i18n/src'
+import { LANG_2_TO_3_MAPPER, toLang2 } from '../../../../../libs/util/i18n/src'
 
 const flatten = (
   base: string,
@@ -137,3 +137,52 @@ export function checkMetadataLanguage(
   }
   return parsedConfigSection
 }
+
+export function checkNewRecordDefaultLanguage(
+  parsedConfigSection: any,
+  outWarnings: string[]
+) {
+  const lang2 = toLang2(
+    parsedConfigSection.new_record_default_language.toLowerCase()
+  )
+  if (!(lang2 in LANG_2_TO_3_MAPPER)) {
+    outWarnings.push(
+      `In the [editing] section: new_record_default_language = "${parsedConfigSection.new_record_default_language}" is not a recognized ISO 639 language code`
+    )
+    return {
+      ...parsedConfigSection,
+      new_record_default_language: undefined,
+    }
+  }
+  return {
+    ...parsedConfigSection,
+    new_record_default_language: lang2,
+  }
+}
+
+export function checkNewRecordStandard(
+  parsedConfigSection: any,
+  outWarnings: string[]
+) {
+  const standard = parsedConfigSection.new_record_standard
+  const normalizedStandard =
+    typeof standard === 'string' ? standard.trim().toLowerCase() : null
+
+  if (
+    normalizedStandard === 'iso19139' ||
+    normalizedStandard === 'iso19115-3'
+  ) {
+    return {
+      ...parsedConfigSection,
+      new_record_standard: normalizedStandard,
+    }
+  }
+
+  outWarnings.push(
+    `In the [editing] section: new_record_standard = "${standard}" is not a supported metadata standard`
+  )
+  return {
+    ...parsedConfigSection,
+    new_record_standard: undefined,
+  }
+}

package/src/libs/util/data-fetcher/src/lib/readers/base-file.ts

@@ -1,4 +1,3 @@
-import { BaseReader } from './base'
 import { DataItem, DatasetInfo, PropertyInfo } from '../model'
 import { getJsonDataItemsProxy, jsonToGeojsonFeature } from '../utils'
 import { generateSqlQuery } from '../sql-utils'
@@ -58,7 +57,7 @@ export class BaseFileReader extends BaseCacheReader {
       this.groupedBy,
       this.aggregations
     )
-    const result = await import('alasql').then((module) =>
+    const result: any[] = await import('alasql').then((module) =>
       module.default(query, [jsonItems])
     )
     return result.map(jsonToGeojsonFeature)

package/src/libs/util/data-fetcher/src/lib/readers/wfs.ts

@@ -1,10 +1,13 @@
 import { EndpointError, WfsEndpoint, WfsVersion } from '@camptocamp/ogc-client'
 import { DataItem, DatasetInfo, FetchError, PropertyInfo } from '../model'
-import { fetchDataAsText } from '../utils'
+import {
+  fetchDataAsText,
+  getJsonDataItemsProxy,
+  jsonToGeojsonFeature,
+} from '../utils'
 import { GmlReader, parseGml } from './gml'
 import { GeojsonReader, parseGeojson } from './geojson'
 import { BaseCacheReader } from './base-cache'
-import { getJsonDataItemsProxy, jsonToGeojsonFeature } from '../utils'
 import { generateSqlQuery } from '../sql-utils'
 
 export async function getWfsEndpoint(wfsUrl: string): Promise<WfsEndpoint> {
@@ -167,7 +170,7 @@ export class WfsReader extends BaseCacheReader {
       this.groupedBy,
       this.aggregations
     )
-    const result = await import('alasql').then((module) =>
+    const result: any[] = await import('alasql').then((module) =>
       module.default(query, [jsonItems])
     )
     return result.map(jsonToGeojsonFeature)

package/src/libs/util/i18n/src/index.ts

@@ -2,6 +2,5 @@ export * from './lib/i18n.providers'
 export * from './lib/i18n.constants'
 export * from './lib/i18n.interceptor'
 export * from './lib/file.translate.loader'
-export * from './lib/embedded.translate.loader'
 export * from './lib/translate.loader.utils'
 export * from './lib/language-codes'

package/src/libs/util/i18n/src/lib/i18n.constants.ts

@@ -1,6 +1,4 @@
-import { HttpClient } from '@angular/common/http'
 import { TranslateMessageFormatCompiler } from 'ngx-translate-messageformat-compiler'
-import { FileTranslateLoader } from './file.translate.loader'
 import {
   TranslateCompiler,
   TranslateDefaultParser,
@@ -9,26 +7,34 @@ import {
   TranslateParser,
 } from '@ngx-translate/core'
 import { Injectable } from '@angular/core'
+import { TRANSLATE_HTTP_LOADER_CONFIG } from '@ngx-translate/http-loader'
+import { HttpClient } from '@angular/common/http'
+import { FileTranslateLoader } from './file.translate.loader'
 
 export const DEFAULT_LANG = 'en'
 
 // Caution: changing this can break language selection from third parties!
 export const LANGUAGE_STORAGE_KEY = 'geonetwork-ui-language'
 
-export function HttpLoaderFactory(http: HttpClient) {
-  return new FileTranslateLoader(http, './assets/i18n/')
-}
-
 export const TRANSLATE_DEFAULT_CONFIG: TranslateModuleConfig = {
   compiler: {
     provide: TranslateCompiler,
     useClass: TranslateMessageFormatCompiler,
   },
-  loader: {
-    provide: TranslateLoader,
-    useFactory: HttpLoaderFactory,
-    deps: [HttpClient],
-  },
+  loader: [
+    {
+      provide: TRANSLATE_HTTP_LOADER_CONFIG,
+      useValue: {
+        prefix: './assets/i18n/',
+        suffix: '.json',
+      },
+    },
+    {
+      provide: TranslateLoader,
+      useClass: FileTranslateLoader,
+      deps: [HttpClient, TRANSLATE_HTTP_LOADER_CONFIG],
+    },
+  ],
 }
 
 @Injectable()

package/src/libs/util/i18n/src/lib/i18n.interceptor.ts

@@ -6,7 +6,7 @@ import {
 } from '@angular/common/http'
 import { DEFAULT_LANG } from './i18n.constants'
 import { Observable } from 'rxjs'
-import { Injectable, Injector, inject } from '@angular/core'
+import { inject, Injectable, Injector } from '@angular/core'
 import { TranslateService } from '@ngx-translate/core'
 
 @Injectable()
@@ -21,7 +21,7 @@ export class I18nInterceptor implements HttpInterceptor {
     const translate = this.injector.get(TranslateService)
     request = request.clone({
       setHeaders: {
-        'Accept-Language': translate.currentLang || DEFAULT_LANG,
+        'Accept-Language': translate.getCurrentLang() || DEFAULT_LANG,
       },
     })
     return next.handle(request)

package/src/libs/util/i18n/src/lib/i18n.providers.ts

@@ -1,7 +1,8 @@
 import {
-  APP_INITIALIZER,
   EnvironmentProviders,
+  inject,
   makeEnvironmentProviders,
+  provideAppInitializer,
   Provider,
 } from '@angular/core'
 import {
@@ -22,17 +23,16 @@ import {
 } from '@angular/common/http'
 import { I18nInterceptor } from './i18n.interceptor'
 
-function i18nInitializerFromLocalStorageFactory(translate: TranslateService) {
-  return () => {
-    translate.setDefaultLang(DEFAULT_LANG)
-    let storageLang = null
-    try {
-      storageLang = localStorage.getItem(LANGUAGE_STORAGE_KEY)
-    } catch (error) {
-      console.warn(error)
-    }
-    translate.use(storageLang || translate.getBrowserLang() || DEFAULT_LANG)
+function i18nInitializerFromLocalStorageFactory() {
+  const translate = inject(TranslateService)
+  translate.setFallbackLang(DEFAULT_LANG)
+  let storageLang = null
+  try {
+    storageLang = localStorage.getItem(LANGUAGE_STORAGE_KEY)
+  } catch (error) {
+    console.warn(error)
   }
+  translate.use(storageLang || translate.getBrowserLang() || DEFAULT_LANG)
 }
 
 export function provideI18n(
@@ -56,12 +56,9 @@ export function provideI18n(
     provideTranslateService(usedConfig),
   ]
   if (useLocalStorage) {
-    providers.push({
-      provide: APP_INITIALIZER,
-      useFactory: i18nInitializerFromLocalStorageFactory,
-      deps: [TranslateService],
-      multi: true,
-    })
+    providers.push(
+      provideAppInitializer(i18nInitializerFromLocalStorageFactory)
+    )
   }
 
   return makeEnvironmentProviders(providers)

package/src/libs/util/i18n/src/lib/test.translate.loader.ts

@@ -0,0 +1,48 @@
+import { inject, Injectable, InjectionToken } from '@angular/core'
+import {
+  provideTranslateService,
+  TranslateCompiler,
+  TranslateLoader,
+  TranslationObject,
+} from '@ngx-translate/core'
+import { Observable, of } from 'rxjs'
+import { TranslateMessageFormatCompiler } from 'ngx-translate-messageformat-compiler'
+
+/**
+ * This translate loader is used for testing purposes, it allows to provide translations directly in the test file without having to create JSON files
+ * Taken from https://github.com/mwootendev/ngx-translate-plugins/issues/87
+ */
+
+const TestTranslations = new InjectionToken<Record<string, TranslationObject>>(
+  'test-translations'
+)
+
+@Injectable()
+class TestTranslateLoader implements TranslateLoader {
+  translations = inject(TestTranslations)
+  getTranslation(lang: string): Observable<TranslationObject> {
+    return of(this.translations[lang] as TranslationObject)
+  }
+}
+
+export function provideTranslateTestingService(
+  translations: Record<string, TranslationObject>
+) {
+  return provideTranslateService({
+    loader: [
+      {
+        provide: TestTranslations,
+        useValue: translations,
+      },
+      {
+        provide: TranslateLoader,
+        useClass: TestTranslateLoader,
+      },
+    ],
+    fallbackLang: 'en',
+    compiler: {
+      provide: TranslateCompiler,
+      useClass: TranslateMessageFormatCompiler,
+    },
+  })
+}

package/src/libs/util/shared/src/lib/links/link-utils.ts

@@ -171,6 +171,28 @@ export const FORMATS = {
   },
 } as const
 
+marker('downloads.format.csv')
+marker('downloads.format.excel')
+marker('downloads.format.geojson')
+marker('downloads.format.json')
+marker('downloads.format.shp')
+marker('downloads.format.gml')
+marker('downloads.format.kml')
+marker('downloads.format.gpkg')
+marker('downloads.format.zip')
+marker('downloads.format.pdf')
+marker('downloads.format.jpg')
+marker('downloads.format.png')
+marker('downloads.format.tiff')
+marker('downloads.format.svg')
+marker('downloads.format.dxf')
+marker('downloads.format.html')
+marker('downloads.format.xml')
+marker('downloads.format.fgb')
+marker('downloads.format.jsonfg')
+marker('downloads.format.webp')
+marker('downloads.format.postgis')
+
 export type FileFormat = keyof typeof FORMATS
 
 export function getFormatPriority(linkFormat: FileFormat): number {
@@ -266,7 +288,7 @@ export function checkFileFormat(
       new RegExp(`[./]${format}`, 'i').test(link.name.toLowerCase())) ||
     ('url' in link &&
       new RegExp(`[./]${format}`, 'i').test(link.url.toString())) ||
-    ('name' in link && link.name.toLowerCase().includes(format))
+    ('name' in link && new RegExp(`\\b${format}\\b`, 'i').test(link.name))
   )
 }
 

package/src/libs/util/shared/src/lib/services/date.service.ts

@@ -1,4 +1,4 @@
-import { Injectable, inject } from '@angular/core'
+import { inject, Injectable } from '@angular/core'
 import { TranslateService } from '@ngx-translate/core'
 import { type Locale } from 'date-fns/locale'
 import { formatDistance } from 'date-fns/formatDistance'
@@ -30,13 +30,13 @@ export class DateService {
     locale: string
     dateObj: Date
   } {
-    const locale = this.translateService.currentLang || DEFAULT_LANGUAGE
+    const locale = this.translateService.getCurrentLang() || DEFAULT_LANGUAGE
     const dateObj = this.getDateObject(date)
     return { locale, dateObj }
   }
 
   private async getDateLocale(): Promise<Locale> {
-    const lang = this.translateService.currentLang || DEFAULT_LANGUAGE
+    const lang = this.translateService.getCurrentLang() || DEFAULT_LANGUAGE
     const locales = await this.dateLocales
     return locales[lang]
   }