Browse Source

Reformat localizion.service.ts

pull/14561/head
Mahmut Gundogdu 4 years ago
parent
commit
8509e1f66a
  1. 30
      npm/ng-packs/packages/core/src/lib/services/localization.service.ts

30
npm/ng-packs/packages/core/src/lib/services/localization.service.ts

@ -58,7 +58,6 @@ export class LocalizationService {
this.initLocalizationValues(); this.initLocalizationValues();
} }
private initLocalizationValues() { private initLocalizationValues() {
localizations$.subscribe(val => this.addLocalization(val)); localizations$.subscribe(val => this.addLocalization(val));
@ -79,8 +78,7 @@ export class LocalizationService {
combineLatest([legacyResources$, remoteLocalizations$, uiLocalizations$]) combineLatest([legacyResources$, remoteLocalizations$, uiLocalizations$])
.pipe( .pipe(
map(([legacy, resource, local]) => { map(([legacy, resource, local]) => {
if (!resource) {
if(!resource){
return; return;
} }
const remote = combineLegacyandNewResources(legacy || {}, resource); const remote = combineLegacyandNewResources(legacy || {}, resource);
@ -265,31 +263,27 @@ export class LocalizationService {
} }
} }
function recursivelyMergeBaseResources(baseResourceName: string, source: ResourceDto) {
function recursivelyMergeBaseResources (baseResourceName: string, source: ResourceDto) {
const item = source[baseResourceName]; const item = source[baseResourceName];
if (item.baseResources.length === 0) { if (item.baseResources.length === 0) {
return item; return item;
} }
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, ...item.texts };
return {...acc,texts} return { ...acc, texts };
},item); }, item);
};
function mergeResourcesWithBaseResource(resource: ResourceDto):ResourceDto {
const entities = Object.keys(resource).map((key) => {
const newValue = recursivelyMergeBaseResources(key,resource)
return [key,newValue]
});
return entities.reduce((acc,[key,value]) => ({...acc,[key]:value}),{})
} }
function mergeResourcesWithBaseResource(resource: ResourceDto): ResourceDto {
const entities = Object.keys(resource).map(key => {
const newValue = recursivelyMergeBaseResources(key, resource);
return [key, newValue];
});
return entities.reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {});
}
function combineLegacyandNewResources( function combineLegacyandNewResources(
legacy: LegacyLanguageDto, legacy: LegacyLanguageDto,

Loading…
Cancel
Save