Browse Source

chore: rename a variable

pull/4968/head
mehmet-erim 6 years ago
parent
commit
3d8c72727b
  1. 4
      docs/en/UI/Angular/Localization.md
  2. 4
      docs/zh-Hans/UI/Angular/Localization.md
  3. 2
      npm/ng-packs/packages/core/src/lib/models/common.ts
  4. 4
      npm/ng-packs/packages/core/src/lib/services/localization.service.ts
  5. 2
      npm/ng-packs/packages/core/src/lib/tests/initial-utils.spec.ts
  6. 2
      npm/ng-packs/packages/core/src/lib/tests/localization.service.spec.ts
  7. 4
      npm/ng-packs/packages/core/src/lib/tokens/options.token.ts
  8. 2
      npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts

4
docs/en/UI/Angular/Localization.md

@ -199,7 +199,7 @@ Some of the culture names defined in .NET do not match Angular locales. In such
![locale-error](./images/locale-error.png)
If you see an error like this, you should pass the `cultureNameToLocaleFileNameMapping` property like below to CoreModule's forRoot static method.
If you see an error like this, you should pass the `cultureNameLocaleFileMap` property like below to CoreModule's forRoot static method.
```js
// app.module.ts
@ -209,7 +209,7 @@ If you see an error like this, you should pass the `cultureNameToLocaleFileNameM
// other imports
CoreModule.forRoot({
// other options
cultureNameToLocaleFileNameMapping: {
cultureNameLocaleFileMap: {
"DotnetCultureName": "AngularLocaleFileName",
"pt-BR": "pt" // example
}

4
docs/zh-Hans/UI/Angular/Localization.md

@ -199,7 +199,7 @@ export class AppComponent {}
![locale-error](./images/locale-error.png)
如果你看到这样的错误,你应该像下面这样传递 `cultureNameToLocaleFileNameMapping` 属性到CoreModule的forRoot静态方法.
如果你看到这样的错误,你应该像下面这样传递 `cultureNameLocaleFileMap` 属性到CoreModule的forRoot静态方法.
```js
// app.module.ts
@ -209,7 +209,7 @@ export class AppComponent {}
// other imports
CoreModule.forRoot({
// other options
cultureNameToLocaleFileNameMapping: {
cultureNameLocaleFileMap: {
"DotnetCultureName": "AngularLocaleFileName",
"pt-BR": "pt" // example
}

2
npm/ng-packs/packages/core/src/lib/models/common.ts

@ -9,7 +9,7 @@ export namespace ABP {
environment: Partial<Config.Environment>;
skipGetAppConfiguration?: boolean;
sendNullsAsQueryParam?: boolean;
cultureNameToLocaleFileNameMapping?: Dictionary<string>;
cultureNameLocaleFileMap?: Dictionary<string>;
}
export interface Test {

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

@ -45,12 +45,12 @@ export class LocalizationService {
registerLocale(locale: string) {
const router = this.injector.get(Router);
const { cultureNameToLocaleFileNameMapping } = this.injector.get(CORE_OPTIONS);
const { cultureNameLocaleFileMap } = this.injector.get(CORE_OPTIONS);
const { shouldReuseRoute } = router.routeReuseStrategy;
router.routeReuseStrategy.shouldReuseRoute = () => false;
router.navigated = false;
return registerLocale(locale, cultureNameToLocaleFileNameMapping).then(() => {
return registerLocale(locale, cultureNameLocaleFileMap).then(() => {
this.ngZone.run(async () => {
await router.navigateByUrl(router.url).catch(noop);
router.routeReuseStrategy.shouldReuseRoute = shouldReuseRoute;

2
npm/ng-packs/packages/core/src/lib/tests/initial-utils.spec.ts

@ -74,7 +74,7 @@ describe('InitialUtils', () => {
const store = spectator.inject(Store);
store.selectSnapshot.andCallFake(selector => selector({ SessionState: { language: 'tr' } }));
injectorSpy.mockReturnValueOnce(store);
injectorSpy.mockReturnValueOnce({ cultureNameToLocaleFileNameMapping: {} });
injectorSpy.mockReturnValueOnce({ cultureNameLocaleFileMap: {} });
expect(typeof localeInitializer(injector)).toBe('function');
expect(await localeInitializer(injector)()).toBe('resolved');
});

2
npm/ng-packs/packages/core/src/lib/tests/localization.service.spec.ts

@ -16,7 +16,7 @@ describe('LocalizationService', () => {
mocks: [Store, Router],
providers: [
{ provide: Actions, useValue: new Subject() },
{ provide: CORE_OPTIONS, useValue: { cultureNameToLocaleFileNameMapping: {} } },
{ provide: CORE_OPTIONS, useValue: { cultureNameLocaleFileMap: {} } },
],
});

4
npm/ng-packs/packages/core/src/lib/tokens/options.token.ts

@ -5,11 +5,11 @@ import differentLocales from '../constants/different-locales';
export const CORE_OPTIONS = new InjectionToken<ABP.Root>('CORE_OPTIONS');
export function coreOptionsFactory({
cultureNameToLocaleFileNameMapping: localeNameMap = {},
cultureNameLocaleFileMap: localeNameMap = {},
...options
}: ABP.Root) {
return {
...options,
cultureNameToLocaleFileNameMapping: { ...differentLocales, ...localeNameMap },
cultureNameLocaleFileMap: { ...differentLocales, ...localeNameMap },
} as ABP.Root;
}

2
npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts

@ -45,7 +45,7 @@ export function localeInitializer(injector: Injector) {
const lang = store.selectSnapshot(state => state.SessionState.language) || 'en';
return new Promise((resolve, reject) => {
registerLocale(lang, options.cultureNameToLocaleFileNameMapping).then(
registerLocale(lang, options.cultureNameLocaleFileMap).then(
() => resolve('resolved'),
reject,
);

Loading…
Cancel
Save