X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fmain.ts;h=3fb9b346e29ec91272528f4f43ce108c9260b48e;hb=a23062fe781bc546f9f1ee195a4e709df77f1e63;hp=dee962180896dbf66229d4a7ddab430ca6666345;hpb=be0f59b4eec3c2c4dcd151e2b174be39dff1568e;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/main.ts b/client/src/main.ts index dee962180..3fb9b346e 100644 --- a/client/src/main.ts +++ b/client/src/main.ts @@ -1,31 +1,17 @@ -import { enableProdMode, TRANSLATIONS, TRANSLATIONS_FORMAT } from '@angular/core' +import { enableProdMode } from '@angular/core' import { platformBrowserDynamic } from '@angular/platform-browser-dynamic' import { AppModule } from './app/app.module' import { environment } from './environments/environment' import { hmrBootstrap } from './hmr' -import { getDevLocale, isOnDevLocale } from '@app/shared/i18n/i18n-utils' -import { buildFileLocale } from '../../shared' -let providers: any[] = [] if (environment.production) { enableProdMode() } -// Template translation, should be in the bootstrap step -if (isOnDevLocale()) { - const locale = buildFileLocale(getDevLocale()) - const translations = require(`raw-loader!./locale/target/angular_${locale}.xml`) - - providers = [ - { provide: TRANSLATIONS, useValue: translations }, - { provide: TRANSLATIONS_FORMAT, useValue: 'xlf' } - ] -} - const bootstrap = () => platformBrowserDynamic() - .bootstrapModule(AppModule, { providers }) + .bootstrapModule(AppModule) .then(bootstrapModule => { // TODO: Uncomment and remove unregistration when https://github.com/angular/angular/issues/21191 is fixed // TODO: Remove when https://github.com/angular/angular-cli/issues/8779 is fixed? @@ -34,13 +20,13 @@ const bootstrap = () => platformBrowserDynamic() // .catch(err => console.error('Cannot register service worker.', err)) // } - if (navigator.serviceWorker) { + if (navigator.serviceWorker && typeof navigator.serviceWorker.getRegistrations === 'function') { navigator.serviceWorker.getRegistrations() - .then(registrations => { - for (const registration of registrations) { - registration.unregister() - } - }) + .then(registrations => { + for (const registration of registrations) { + registration.unregister() + } + }) } return bootstrapModule