Browse Source

Merge pull request #15462 from abpframework/auto-merge/rel-7-0/1671

Merge branch dev with rel-7.0
pull/15471/head
Enis Necipoglu 4 years ago
committed by GitHub
parent
commit
e6cfd4cfd2
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json
  2. 1
      modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/tr.json
  3. 6
      npm/ng-packs/packages/core/src/lib/services/localization.service.ts

1
modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json

@ -14,6 +14,7 @@
"HasException": "Has Exception", "HasException": "Has Exception",
"IpAddress": "IP Address", "IpAddress": "IP Address",
"Time": "Time", "Time": "Time",
"Date": "Date",
"Duration": "Duration", "Duration": "Duration",
"Detail": "Detail", "Detail": "Detail",
"Overall": "Overall", "Overall": "Overall",

1
modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/tr.json

@ -43,6 +43,7 @@
"PropertyTypeFullName": "Property Türü", "PropertyTypeFullName": "Property Türü",
"ServiceName": "Servis", "ServiceName": "Servis",
"Time": "Tarih", "Time": "Tarih",
"Date": "Tarih",
"Url": "Url", "Url": "Url",
"UserName": "Kullanıcı adı", "UserName": "Kullanıcı adı",
"TenantImpersonator": "Kiracı Taklitçisi", "TenantImpersonator": "Kiracı Taklitçisi",

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

@ -1,7 +1,7 @@
import { registerLocaleData } from '@angular/common'; import { registerLocaleData } from '@angular/common';
import { Injectable, Injector, isDevMode, Optional, SkipSelf } from '@angular/core'; import { Injectable, Injector, isDevMode, Optional, SkipSelf } from '@angular/core';
import { BehaviorSubject, combineLatest, from, Observable, of, Subject } from 'rxjs'; import { BehaviorSubject, combineLatest, from, Observable, Subject } from 'rxjs';
import { filter, map, mapTo, switchMap } from 'rxjs/operators'; import { filter, map, switchMap } from 'rxjs/operators';
import { ABP } from '../models/common'; import { ABP } from '../models/common';
import { LocalizationWithDefault } from '../models/localization'; import { LocalizationWithDefault } from '../models/localization';
import { import {
@ -133,7 +133,7 @@ export class LocalizationService {
filter( filter(
lang => this.configState.getDeep('localization.currentCulture.cultureName') !== lang, lang => this.configState.getDeep('localization.currentCulture.cultureName') !== lang,
), ),
switchMap(lang => this.configState.refreshLocalization(lang).pipe(map(()=> lang))), switchMap(lang => this.configState.refreshAppState().pipe(map(() => lang))),
switchMap(lang => from(this.registerLocale(lang).then(() => lang))), switchMap(lang => from(this.registerLocale(lang).then(() => lang))),
) )
.subscribe(lang => this._languageChange$.next(lang)); .subscribe(lang => this._languageChange$.next(lang));

Loading…
Cancel
Save