X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.module.ts;h=14fdb7588b9a3996e6e7b7fe090ca65f25379c7d;hb=361dcebc75dea74947b6c3aafd9d7d720c054b01;hp=e60a74cc022b57ee9f410e03005c459094e28757;hpb=f07d6385b4b46c3254898292a8a53ed415b8d49b;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index e60a74cc0..14fdb7588 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -1,32 +1,32 @@
 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 { ClipboardModule } from 'ngx-clipboard'
+import 'focus-visible'
 
 import { AppRoutingModule } from './app-routing.module'
 import { AppComponent } from './app.component'
 import { CoreModule } from './core'
 import { HeaderComponent } 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 { buildFileLocale, getDefaultLocale } from '../../../shared/models/i18n'
-import { environment } from '../environments/environment'
+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'
 
 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 }
     }
   })
 }
@@ -37,12 +37,15 @@ export function metaFactory (serverService: ServerService): MetaLoader {
     AppComponent,
 
     MenuComponent,
-    HeaderComponent
+    LanguageChooserComponent,
+    AvatarNotificationComponent,
+    HeaderComponent,
+
+    WelcomeModalComponent,
+    InstanceConfigWarningModalComponent
   ],
   imports: [
     BrowserModule,
-    // FIXME: https://github.com/maxisam/ngx-clipboard/issues/133
-    ClipboardModule,
 
     CoreModule,
     SharedModule,
@@ -50,10 +53,9 @@ export function metaFactory (serverService: ServerService): MetaLoader {
     CoreModule,
     LoginModule,
     ResetPasswordModule,
-    SignupModule,
+    SearchModule,
     SharedModule,
     VideosModule,
-    AboutModule,
 
     MetaModule.forRoot({
       provide: MetaLoader,
@@ -63,22 +65,17 @@ export function metaFactory (serverService: ServerService): MetaLoader {
 
     AppRoutingModule // Put it after all the module because it has the 404 route
   ],
+
   providers: [
     {
       provide: TRANSLATIONS,
-      useFactory: (locale) => {
-        // On dev mode, test locales
-        if (environment.production === false && window.location.search === '?lang=fr') {
-          return require(`raw-loader!../locale/target/angular_fr.xml`)
-        }
+      useFactory: (locale: string) => {
+                // Default locale, nothing to translate
+        const completeLocale = getCompleteLocale(locale)
+        if (isDefaultLocale(completeLocale)) return ''
 
         const fileLocale = buildFileLocale(locale)
-
-        // Default locale, nothing to translate
-        const defaultFileLocale = buildFileLocale(getDefaultLocale())
-        if (fileLocale === defaultFileLocale) return ''
-
-        return require(`raw-loader!../locale/target/angular_${fileLocale}.xml`)
+        return require(`raw-loader!../locale/angular.${fileLocale}.xlf`)
       },
       deps: [ LOCALE_ID ]
     },