Merge branch 'master' of https://git.loafle.net/overflow/overflow-webapp
This commit is contained in:
commit
15e507de3b
|
@ -40,6 +40,10 @@ export function initL10n(l10nLoader: L10nLoader): Function {
|
|||
LocalizationModule.forRoot(l10nConfig),
|
||||
LocaleValidationModule.forRoot()
|
||||
],
|
||||
exports: [
|
||||
LocalizationModule,
|
||||
LocaleValidationModule,
|
||||
],
|
||||
providers: [
|
||||
Title,
|
||||
{
|
||||
|
|
|
@ -16,22 +16,26 @@ import {
|
|||
} from 'ngx-perfect-scrollbar';
|
||||
import { NotificationModule } from 'packages/notification/notification.module';
|
||||
|
||||
// import {
|
||||
// L10nConfig,
|
||||
// L10nLoader,
|
||||
// LocalizationModule,
|
||||
// ProviderType
|
||||
// } from 'angular-l10n';
|
||||
|
||||
import {
|
||||
L10nConfig,
|
||||
L10nLoader,
|
||||
LocalizationModule,
|
||||
ProviderType
|
||||
} from 'angular-l10n';
|
||||
|
||||
const l10nConfig: L10nConfig = {
|
||||
translation: {
|
||||
providers: [
|
||||
{ type: ProviderType.Static, prefix: './assets/translations/of-' }
|
||||
],
|
||||
composedKeySeparator: '.',
|
||||
missingValue: 'No key'
|
||||
}
|
||||
};
|
||||
// const l10nConfig: L10nConfig = {
|
||||
// translation: {
|
||||
// providers: [
|
||||
// { type: ProviderType.Static, prefix: './assets/translations/of-' }
|
||||
// ],
|
||||
// composedKeySeparator: '.',
|
||||
// missingValue: 'No key'
|
||||
// }
|
||||
// };
|
||||
|
||||
const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = {
|
||||
suppressScrollX: true
|
||||
|
@ -46,7 +50,8 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = {
|
|||
MaterialModule,
|
||||
PerfectScrollbarModule,
|
||||
NotificationModule,
|
||||
LocalizationModule.forChild(l10nConfig)
|
||||
LocalizationModule,
|
||||
// LocalizationModule.forChild(l10nConfig)
|
||||
],
|
||||
declarations: [
|
||||
PagesComponent,
|
||||
|
@ -63,7 +68,7 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = {
|
|||
],
|
||||
})
|
||||
export class PagesModule {
|
||||
constructor(public l10nLoader: L10nLoader) {
|
||||
this.l10nLoader.load();
|
||||
}
|
||||
// constructor(public l10nLoader: L10nLoader) {
|
||||
// this.l10nLoader.load();
|
||||
// }
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user