From: Chocobozzz <me@florianbigard.com>
Date: Thu, 22 Mar 2018 13:13:30 +0000 (+0100)
Subject: Use instance name for page titles
X-Git-Tag: v1.0.0-beta.2~65
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=63ac2857aa6550232a1727a395c40e722c32710d;p=oweals%2Fpeertube.git

Use instance name for page titles
---

diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index cae99786b..77d68a4ec 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -1,6 +1,7 @@
 import { NgModule } 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'
@@ -17,15 +18,14 @@ import { SharedModule } from './shared'
 import { SignupModule } from './signup'
 import { VideosModule } from './videos'
 
-export function metaFactory (): MetaLoader {
+export function metaFactory (serverService: ServerService): MetaLoader {
   return new MetaStaticLoader({
     pageTitlePositioning: PageTitlePositioning.PrependPageTitle,
     pageTitleSeparator: ' - ',
-    applicationName: 'PeerTube',
+    get applicationName () { return serverService.getConfig().instance.name },
     defaults: {
-      title: 'PeerTube',
-      description: 'PeerTube, a federated (ActivityPub) video streaming platform  ' +
-                   'using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular. '
+      get title () { return serverService.getConfig().instance.name },
+      get description () { return serverService.getConfig().instance.shortDescription }
     }
   })
 }
@@ -57,7 +57,8 @@ export function metaFactory (): MetaLoader {
 
     MetaModule.forRoot({
       provide: MetaLoader,
-      useFactory: (metaFactory)
+      useFactory: (metaFactory),
+      deps: [ ServerService ]
     })
   ],
   providers: [ ]
diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts
index bd85d9f0f..0b63ef5be 100644
--- a/client/src/app/core/server/server.service.ts
+++ b/client/src/app/core/server/server.service.ts
@@ -21,7 +21,8 @@ export class ServerService {
   private config: ServerConfig = {
     instance: {
       name: 'PeerTube',
-      shortDescription: '',
+      shortDescription: 'PeerTube, a federated (ActivityPub) video streaming platform  ' +
+                        'using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.',
       defaultClientRoute: '',
       customizations: {
         javascript: '',