chore: rename a variable

pull/4968/head
mehmet-erim 5 years ago
parent 6c3463070a
commit 3d8c72727b

@ -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) ![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 ```js
// app.module.ts // app.module.ts
@ -209,7 +209,7 @@ If you see an error like this, you should pass the `cultureNameToLocaleFileNameM
// other imports // other imports
CoreModule.forRoot({ CoreModule.forRoot({
// other options // other options
cultureNameToLocaleFileNameMapping: { cultureNameLocaleFileMap: {
"DotnetCultureName": "AngularLocaleFileName", "DotnetCultureName": "AngularLocaleFileName",
"pt-BR": "pt" // example "pt-BR": "pt" // example
} }

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

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

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

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

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

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

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

Loading…
Cancel
Save