[no-issue] Fix translate module - 1st iteration (#4290)

* [no-issue] Fix translate module - 1st iteration

* restore translate exports

* move i18n to the app level, fix lazy loading

* improve i18n imports

* update unit tests

* fix unit tests

* test fixes
This commit is contained in:
davidcanonieto
2019-02-12 05:56:05 +00:00
committed by Eugenio Romano
parent 0683c4d226
commit 7bf5e59740
20 changed files with 68 additions and 198 deletions

View File

@@ -16,11 +16,9 @@
*/
import { CommonModule } from '@angular/common';
import { HttpClient, HttpClientModule } from '@angular/common/http';
import { APP_INITIALIZER, NgModule, ModuleWithProviders } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
import { TranslateModule, TranslateLoader, TranslateStore, TranslateService } from '@ngx-translate/core';
import { MaterialModule } from './material.module';
import { AboutModule } from './about/about.module';
@@ -49,96 +47,15 @@ import { DialogModule } from './dialogs/dialog.module';
import { PipeModule } from './pipes/pipe.module';
import { AlfrescoApiService } from './services/alfresco-api.service';
import { LogService } from './services/log.service';
import { TranslateLoaderService } from './services/translate-loader.service';
import { TranslationService } from './services/translation.service';
import { startupServiceFactory } from './services/startup-service-factory';
import { SortingPickerModule } from './sorting-picker/sorting-picker.module';
import { IconModule } from './icon/icon.module';
export function createTranslateLoader(http: HttpClient) {
return new TranslateLoaderService(http);
}
import { TranslateLoaderService } from './services/translate-loader.service';
@NgModule({
imports: [
AboutModule,
ViewerModule,
SidenavLayoutModule,
PipeModule,
CommonModule,
DirectiveModule,
DialogModule,
ClipboardModule,
FormsModule,
ReactiveFormsModule,
HttpClientModule,
HostSettingsModule,
UserInfoModule,
MaterialModule,
AppConfigModule,
PaginationModule,
ToolbarModule,
ContextMenuModule,
CardViewModule,
FormModule,
CommentsModule,
LoginModule,
LanguageMenuModule,
InfoDrawerModule,
DataColumnModule,
DataTableModule,
ButtonsMenuModule,
TemplateModule,
IconModule,
TranslateModule.forChild({
loader: {
provide: TranslateLoader,
useFactory: (createTranslateLoader),
deps: [HttpClient, LogService]
}
}),
SortingPickerModule
],
exports: [
AboutModule,
ViewerModule,
SidenavLayoutModule,
PipeModule,
CommonModule,
DirectiveModule,
DialogModule,
ClipboardModule,
FormsModule,
ReactiveFormsModule,
HttpClientModule,
HostSettingsModule,
UserInfoModule,
MaterialModule,
AppConfigModule,
PaginationModule,
ToolbarModule,
ContextMenuModule,
CardViewModule,
FormModule,
CommentsModule,
LoginModule,
LanguageMenuModule,
InfoDrawerModule,
DataColumnModule,
DataTableModule,
TranslateModule,
ButtonsMenuModule,
TemplateModule,
SortingPickerModule,
IconModule
]
})
export class CoreModuleLazy {
}
@NgModule({
imports: [
AboutModule,
ViewerModule,
SidenavLayoutModule,
@@ -148,7 +65,6 @@ export class CoreModuleLazy {
DialogModule,
FormsModule,
ReactiveFormsModule,
HttpClientModule,
HostSettingsModule,
UserInfoModule,
MaterialModule,
@@ -167,13 +83,6 @@ export class CoreModuleLazy {
ButtonsMenuModule,
TemplateModule,
IconModule,
TranslateModule.forRoot({
loader: {
provide: TranslateLoader,
useFactory: (createTranslateLoader),
deps: [HttpClient, LogService]
}
}),
SortingPickerModule
],
exports: [
@@ -187,7 +96,6 @@ export class CoreModuleLazy {
ClipboardModule,
FormsModule,
ReactiveFormsModule,
HttpClientModule,
HostSettingsModule,
UserInfoModule,
MaterialModule,
@@ -215,6 +123,9 @@ export class CoreModule {
return {
ngModule: CoreModule,
providers: [
TranslateStore,
TranslateService,
{ provide: TranslateLoader, useClass: TranslateLoaderService },
{
provide: APP_INITIALIZER,
useFactory: startupServiceFactory,
@@ -229,7 +140,7 @@ export class CoreModule {
static forChild(): ModuleWithProviders {
return {
ngModule: CoreModuleLazy
ngModule: CoreModule
};
}