From 81fe3c67c5d70e69aa2d965a41afd7331cd4fb76 Mon Sep 17 00:00:00 2001
From: Rigel Kent <sendmemail@rigelk.eu>
Date: Tue, 2 Jun 2020 17:53:32 +0200
Subject: fix duplicate id in svg, empty alt in base email

---
 .../+about/about-peertube/about-peertube.component.html   |  4 ++--
 client/src/app/app.component.ts                           | 15 ++++-----------
 .../modal/instance-config-warning-modal.component.html    |  6 +++---
 3 files changed, 9 insertions(+), 16 deletions(-)

(limited to 'client/src/app')

diff --git a/client/src/app/+about/about-peertube/about-peertube.component.html b/client/src/app/+about/about-peertube/about-peertube.component.html
index e5a8b2097..1dbad3096 100644
--- a/client/src/app/+about/about-peertube/about-peertube.component.html
+++ b/client/src/app/+about/about-peertube/about-peertube.component.html
@@ -3,11 +3,11 @@
     What is PeerTube?
   </h1>
 
-  <img class="mascot" width="121px" height="147px" src="/client/assets/images/mascot/default.png" alt="mascot"/>
+  <img class="mascot" width="121px" height="147px" src="/client/assets/images/mascot/default.svg" alt="mascot"/>
 
   <div class="description">
     <p i18n>
-      PeerTube is a self hosted federated (ActivityPub) video streaming platform using P2P directly in the web browser.
+      PeerTube is a self-hosted ActivityPub-federated video streaming platform using P2P directly in your web browser.
     </p>
 
     <p i18n>
diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index aba91aad2..c77dc97de 100644
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, ViewChild, AfterViewInit, Inject } from '@angular/core'
+import { Component, OnInit, ViewChild, AfterViewInit, Inject, LOCALE_ID } from '@angular/core'
 import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
 import { Event, GuardsCheckStart, NavigationEnd, Router, Scroll } from '@angular/router'
 import { AuthService, RedirectService, ServerService, ThemeService } from '@app/core'
@@ -43,6 +43,7 @@ export class AppComponent implements OnInit, AfterViewInit {
 
   constructor (
     @Inject(DOCUMENT) private document: Document,
+    @Inject(LOCALE_ID) private localeId: string,
     private i18n: I18n,
     private viewportScroller: ViewportScroller,
     private router: Router,
@@ -97,6 +98,8 @@ export class AppComponent implements OnInit, AfterViewInit {
     this.location.onPopState(() => this.modalService.dismissAll(POP_STATE_MODAL_DISMISS))
 
     this.openModalsIfNeeded()
+
+    this.document.documentElement.lang = getShortLocale(this.localeId)
   }
 
   ngAfterViewInit () {
@@ -171,16 +174,6 @@ export class AppComponent implements OnInit, AfterViewInit {
       filter(pathname => !pathname || pathname === '/' || is18nPath(pathname))
     ).subscribe(() => this.redirectService.redirectToHomepage(true))
 
-    navigationEndEvent.pipe(
-      map(() => window.location.pathname),
-    ).subscribe(pathname => {
-      if (is18nPath(pathname)) {
-        this.document.documentElement.lang = getShortLocale(pathname.split('/')[1])
-      } else {
-        this.document.documentElement.lang = 'en'
-      }
-    })
-
     navigationEndEvent.subscribe(e => {
       this.hooks.runAction('action:router.navigation-end', 'common', { path: e.url })
     })
diff --git a/client/src/app/modal/instance-config-warning-modal.component.html b/client/src/app/modal/instance-config-warning-modal.component.html
index 44c994bc8..5a8290cda 100644
--- a/client/src/app/modal/instance-config-warning-modal.component.html
+++ b/client/src/app/modal/instance-config-warning-modal.component.html
@@ -5,7 +5,7 @@
   </div>
 
   <div class="modal-body">
-    <img class="mascot" src="/client/assets/images/mascot/oh.png" alt="mascot" />
+    <img class="mascot" src="/client/assets/images/mascot/oh.svg" alt="mascot" />
 
     <p i18n>Hello dear administrator. You enabled user registration on your instance but you did not configure the following fields:</p>
 
@@ -22,8 +22,8 @@
     </ul>
 
     <p i18n>
-      Please consider to configure these fields to help people to choose <strong>the appropriate instance</strong>.
-      Without them, your instance may not be referenced on <a target="_blank" rel="noopener noreferrer" href="https://joinpeertube.org">JoinPeerTube website</a>.
+      Please consider configuring these fields to help people to choose <strong>the appropriate instance</strong>.
+      Without them, your instance may not be referenced on the <a target="_blank" rel="noopener noreferrer" href="https://joinpeertube.org">JoinPeerTube website</a>.
     </p>
 
     <div class="configure-instance">
-- 
cgit v1.2.3