Browse Source
Merge pull request #23718 from abpframework/auto-merge/rel-9-3/3975
Merge branch dev with rel-9.3
pull/23719/head
Ma Liming
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
1 additions and
1 deletions
-
npm/ng-packs/packages/core/src/lib/services/localization.service.ts
|
|
@ -279,7 +279,7 @@ function recursivelyMergeBaseResources( |
|
|
|
|
|
|
|
|
return item.baseResources.reduce((acc, baseResource) => { |
|
|
return item.baseResources.reduce((acc, baseResource) => { |
|
|
const baseItem = recursivelyMergeBaseResources(baseResource, source); |
|
|
const baseItem = recursivelyMergeBaseResources(baseResource, source); |
|
|
const texts = { ...baseItem.texts, ...item.texts }; |
|
|
const texts = { ...baseItem.texts, ...acc.texts }; |
|
|
return { ...acc, texts }; |
|
|
return { ...acc, texts }; |
|
|
}, item); |
|
|
}, item); |
|
|
} |
|
|
} |
|
|
|
