X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.module.ts;h=89332ec5f4720057f163396a03b37ef370d60ad3;hb=1bab226f5c2e678039ed40f87ab3fe05f3ebd0f4;hp=cae99786b32911c9d7f67700a72793709f03b50e;hpb=78967fca4cacbc247fa6fb62d64b2d6825a10804;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts index cae99786b..89332ec5f 100644 --- a/client/src/app/app.module.ts +++ b/client/src/app/app.module.ts @@ -1,34 +1,28 @@ -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, 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, registerLocaleData } from '@angular/common' +import { QuickSettingsModalComponent } from '@app/modal/quick-settings-modal.component' +import { CustomModalComponent } from '@app/modal/custom-modal.component' +import localeOc from '@app/shared/locale/oc' -export function metaFactory (): MetaLoader { - return new MetaStaticLoader({ - pageTitlePositioning: PageTitlePositioning.PrependPageTitle, - pageTitleSeparator: ' - ', - applicationName: 'PeerTube', - defaults: { - title: 'PeerTube', - description: 'PeerTube, a federated (ActivityPub) video streaming platform ' + - 'using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular. ' - } - }) -} +registerLocaleData(localeOc, 'oc') @NgModule({ bootstrap: [ AppComponent ], @@ -36,7 +30,16 @@ export function metaFactory (): MetaLoader { AppComponent, MenuComponent, - HeaderComponent + LanguageChooserComponent, + QuickSettingsModalComponent, + AvatarNotificationComponent, + HeaderComponent, + SearchTypeaheadComponent, + SuggestionComponent, + + CustomModalComponent, + WelcomeModalComponent, + InstanceConfigWarningModalComponent ], imports: [ BrowserModule, @@ -44,22 +47,51 @@ export function metaFactory (): MetaLoader { CoreModule, SharedModule, - AppRoutingModule, - - AccountModule, CoreModule, LoginModule, ResetPasswordModule, - SignupModule, + SearchModule, SharedModule, VideosModule, - AboutModule, MetaModule.forRoot({ provide: MetaLoader, - useFactory: (metaFactory) - }) + useFactory: (serverService: ServerService) => { + return new MetaStaticLoader({ + pageTitlePositioning: PageTitlePositioning.PrependPageTitle, + pageTitleSeparator: ' - ', + get applicationName () { return serverService.getTmpConfig().instance.name }, + defaults: { + get title () { return serverService.getTmpConfig().instance.name }, + get description () { return serverService.getTmpConfig().instance.shortDescription } + } + }) + }, + 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 {}