diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html index 705c14bffb..30624a5768 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html @@ -162,11 +162,7 @@ @if (prop().displayTextResolver) { {{ prop().displayTextResolver(data()) | abpLocalization }} } @else { - @if (prop().isExtra) { - {{ '::' + prop().displayName | abpLocalization }} - } @else { - {{ prop().displayName | abpLocalization }} - } + {{ prop().displayName | abpLocalization }} } {{ asterisk() }} @if (prop().tooltip) { diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html index e19808ce49..fa77b526bd 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html @@ -136,7 +136,7 @@ *abpVisible="prop.columnVisible(getInjected)" [width]="columnWidths()[i] || 200" [canAutoResize]="!columnWidths()[i]" - [name]="(prop.isExtra ? '::' + prop.displayName : prop.displayName) | abpLocalization" + [name]="prop.displayName | abpLocalization" [prop]="prop.name" [sortable]="prop.sortable" > diff --git a/npm/ng-packs/packages/core/src/lib/utils/localization-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/localization-utils.ts index 890a83c2e4..5d40bb84f1 100644 --- a/npm/ng-packs/packages/core/src/lib/utils/localization-utils.ts +++ b/npm/ng-packs/packages/core/src/lib/utils/localization-utils.ts @@ -13,11 +13,17 @@ export function createLocalizer(localization: ApplicationLocalizationConfigurati return (resourceName: string, key: string, defaultValue: string | null) => { if (resourceName === '_') return key; - const resource = localization?.values?.[resourceName]; + const resource = localization?.resources?.[resourceName]; - if (!resource) return defaultValue; + if (!resource) { + const fallbackResource = localization?.values?.[resourceName]; - return resource[key] || defaultValue; + if (!fallbackResource) return defaultValue; + + return fallbackResource[key] || defaultValue; + } + + return resource.texts?.[key] || defaultValue; }; }