X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.module.ts;h=38b7328e21951f913d9d897b925e3a117f7b78cb;hb=0912f1b4caaa7394516567044f896132ad991131;hp=37119944227d427107d979862c023594f84fac76;hpb=244b4ae3973bc1511464a08158a123767f83179c;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts index 371199442..38b7328e2 100644 --- a/client/src/app/app.module.ts +++ b/client/src/app/app.module.ts @@ -12,14 +12,14 @@ 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, getCompleteLocale, isDefaultLocale } from '../../../shared/models/i18n' import { getDevLocale, isOnDevLocale } from '@app/shared/i18n/i18n-utils' -import { LanguageChooserComponent } from '@app/menu/language-chooser.component' import { SearchModule } from '@app/search' +import { WelcomeModalComponent } from '@app/modal/welcome-modal.component' +import { InstanceConfigWarningModalComponent } from '@app/modal/instance-config-warning-modal.component' export function metaFactory (serverService: ServerService): MetaLoader { return new MetaStaticLoader({ @@ -40,7 +40,11 @@ export function metaFactory (serverService: ServerService): MetaLoader { MenuComponent, LanguageChooserComponent, - HeaderComponent + AvatarNotificationComponent, + HeaderComponent, + + WelcomeModalComponent, + InstanceConfigWarningModalComponent ], imports: [ BrowserModule, @@ -53,7 +57,6 @@ export function metaFactory (serverService: ServerService): MetaLoader { CoreModule, LoginModule, ResetPasswordModule, - SignupModule, SearchModule, SharedModule, VideosModule, @@ -73,7 +76,7 @@ export function metaFactory (serverService: ServerService): MetaLoader { // On dev mode, test localization if (isOnDevLocale()) { locale = buildFileLocale(getDevLocale()) - return require(`raw-loader!../locale/target/angular_${locale}.xml`) + return require(`raw-loader!../locale/angular.${locale}.xlf`) } // Default locale, nothing to translate @@ -81,7 +84,7 @@ export function metaFactory (serverService: ServerService): MetaLoader { if (isDefaultLocale(completeLocale)) return '' const fileLocale = buildFileLocale(locale) - return require(`raw-loader!../locale/target/angular_${fileLocale}.xml`) + return require(`raw-loader!../locale/angular.${fileLocale}.xlf`) }, deps: [ LOCALE_ID ] },