X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.module.ts;h=5a3b109da48bc34fd1d2e50b2b85d843cb81bb01;hb=437e8e06eb32ffe21111f0946115aae0e4c33381;hp=77d68a4ec1ad5a236b16d684a2b2f56b00aade64;hpb=63ac2857aa6550232a1727a395c40e722c32710d;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 77d68a4ec..5a3b109da 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -1,31 +1,35 @@
-import { NgModule } from '@angular/core'
+import { LOCALE_ID, NgModule, TRANSLATIONS, TRANSLATIONS_FORMAT } from '@angular/core'
 import { BrowserModule } from '@angular/platform-browser'
-import { AboutModule } from '@app/about'
 import { ServerService } from '@app/core'
 import { ResetPasswordModule } from '@app/reset-password'
 
 import { MetaLoader, MetaModule, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core'
-
-import { AccountModule } from './account'
+import 'focus-visible'
 
 import { AppRoutingModule } from './app-routing.module'
 import { AppComponent } from './app.component'
 import { CoreModule } from './core'
-import { HeaderComponent } from './header'
+import { HeaderComponent, SearchTypeaheadComponent, SuggestionsComponent, SuggestionComponent } from './header'
 import { LoginModule } from './login'
-import { MenuComponent } from './menu'
+import { AvatarNotificationComponent, LanguageChooserComponent, MenuComponent } from './menu'
 import { SharedModule } from './shared'
-import { SignupModule } from './signup'
 import { VideosModule } from './videos'
+import { SearchModule } from '@app/search'
+import { WelcomeModalComponent } from '@app/modal/welcome-modal.component'
+import { InstanceConfigWarningModalComponent } from '@app/modal/instance-config-warning-modal.component'
+import { buildFileLocale, getCompleteLocale, isDefaultLocale } from '@shared/models'
+import { APP_BASE_HREF } from '@angular/common'
+import { QuickSettingsModalComponent } from '@app/modal/quick-settings-modal.component'
+import { CustomModalComponent } from '@app/modal/custom-modal.component'
 
 export function metaFactory (serverService: ServerService): MetaLoader {
   return new MetaStaticLoader({
     pageTitlePositioning: PageTitlePositioning.PrependPageTitle,
     pageTitleSeparator: ' - ',
-    get applicationName () { return serverService.getConfig().instance.name },
+    get applicationName () { return serverService.getTmpConfig().instance.name },
     defaults: {
-      get title () { return serverService.getConfig().instance.name },
-      get description () { return serverService.getConfig().instance.shortDescription }
+      get title () { return serverService.getTmpConfig().instance.name },
+      get description () { return serverService.getTmpConfig().instance.shortDescription }
     }
   })
 }
@@ -36,7 +40,17 @@ export function metaFactory (serverService: ServerService): MetaLoader {
     AppComponent,
 
     MenuComponent,
-    HeaderComponent
+    LanguageChooserComponent,
+    QuickSettingsModalComponent,
+    AvatarNotificationComponent,
+    HeaderComponent,
+    SearchTypeaheadComponent,
+    SuggestionsComponent,
+    SuggestionComponent,
+
+    CustomModalComponent,
+    WelcomeModalComponent,
+    InstanceConfigWarningModalComponent
   ],
   imports: [
     BrowserModule,
@@ -44,23 +58,41 @@ export function metaFactory (serverService: ServerService): MetaLoader {
     CoreModule,
     SharedModule,
 
-    AppRoutingModule,
-
-    AccountModule,
     CoreModule,
     LoginModule,
     ResetPasswordModule,
-    SignupModule,
+    SearchModule,
     SharedModule,
     VideosModule,
-    AboutModule,
 
     MetaModule.forRoot({
       provide: MetaLoader,
       useFactory: (metaFactory),
       deps: [ ServerService ]
-    })
+    }),
+
+    AppRoutingModule // Put it after all the module because it has the 404 route
   ],
-  providers: [ ]
+
+  providers: [
+    {
+      provide: APP_BASE_HREF,
+      useValue: '/'
+    },
+
+    {
+      provide: TRANSLATIONS,
+      useFactory: (locale: string) => {
+        // Default locale, nothing to translate
+        const completeLocale = getCompleteLocale(locale)
+        if (isDefaultLocale(completeLocale)) return ''
+
+        const fileLocale = buildFileLocale(locale)
+        return require(`raw-loader!../locale/angular.${fileLocale}.xlf`).default
+      },
+      deps: [ LOCALE_ID ]
+    },
+    { provide: TRANSLATIONS_FORMAT, useValue: 'xlf' }
+  ]
 })
 export class AppModule {}