From 183fc6a001f5bf7584ac11ca6f37ed2b627006b9 Mon Sep 17 00:00:00 2001
From: JosephK <josephk@framasoft.org>
Date: Thu, 26 Sep 2019 22:28:25 +0200
Subject: [PATCH] Meta data

---
 app/App.vue                     | 6 ++++--
 app/data/commons/link.yml       | 7 -------
 app/locales/en/main.yml         | 1 +
 app/locales/fr/main.yml         | 1 +
 app/locales/it/main.yml         | 1 +
 app/locales/ja/main.yml         | 1 +
 app/locales/ru/main.yml         | 1 +
 app/locales/sq/main.yml         | 1 +
 app/locales/sv/main.yml         | 1 +
 app/locales/zh_Hant_TW/main.yml | 1 +
 10 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/App.vue b/app/App.vue
index faddd6f..7b1b5a9 100644
--- a/app/App.vue
+++ b/app/App.vue
@@ -6,8 +6,10 @@
       :html="{ body: {id: $route.meta.id } }"
       :lang="$route.meta.lang"
       :head="{
-        'link[rel^=shortcut]': {href: `${$root['/']}icons/favicon.png`},
-        'link[rel=apple-touch-icon]': {href: `${$root['/']}icons/apple-touch-icon.png`},
+        'link[rel^=shortcut]': {href: `${$root.baseurl}icons/favicon.png`},
+        'link[rel=apple-touch-icon]': {href: `${$root.baseurl}icons/apple-touch-icon.png`},
+
+        'link[rel=canonical]': {href: `${$root.canonical}${$route.path}`},
 
         'meta[property^=og][property$=title]': {content: `${$t('meta.title')}`},
         'meta[property^=og][property$=image]': {content: `${$root.baseurl}icons/apple-touch-icon.png`},
diff --git a/app/data/commons/link.yml b/app/data/commons/link.yml
index 184cc0c..0191e6d 100644
--- a/app/data/commons/link.yml
+++ b/app/data/commons/link.yml
@@ -76,13 +76,6 @@ ptilouk: http://ptilouk.net
 start: http://framastart.org
 vvl: http://vvlibri.org
 
-diaspora: https://framasphere.org/u/framasoft
-mastodon: https://framapiaf.org/@Framasoft
-twitter: https://twitter.com/framasoft
-facebook: https://www.facebook.com/framasoft
-rss: https://rss.framasoft.org
-wikipedia: https://fr.wikipedia.org/wiki/Framasoft
-
 gitPT: https://github.com/Chocobozzz/PeerTube
 instancesPT: https://instances.joinpeertube.org
 docsPT: https://docs.joinpeertube.org
diff --git a/app/locales/en/main.yml b/app/locales/en/main.yml
index 18034c7..3091573 100644
--- a/app/locales/en/main.yml
+++ b/app/locales/en/main.yml
@@ -1,5 +1,6 @@
 meta:
   title: '@:home.title ! #JoinPeerTube'
+  description: A decentralized video hosting network, based on free/libre software
 menu:
   faq: F.A.Q.
   help: Support
diff --git a/app/locales/fr/main.yml b/app/locales/fr/main.yml
index 67fb9f8..e95fa4b 100644
--- a/app/locales/fr/main.yml
+++ b/app/locales/fr/main.yml
@@ -1,5 +1,6 @@
 meta:
   title: '@:home.title ! #JoinPeerTube'
+  description: L’hébergement de vidéos décentralisé, en réseau, basé sur du logiciel libre
 nav:
   langChange: Changer la langue
   lang: Langue
diff --git a/app/locales/it/main.yml b/app/locales/it/main.yml
index b5bf7f0..1544d4f 100644
--- a/app/locales/it/main.yml
+++ b/app/locales/it/main.yml
@@ -1,5 +1,6 @@
 meta:
   title: '@:home.title ! #JoinPeerTube'
+  description: Una rete di piattaforme video decentralizzata, basata su software libero
 nav:
   langChange: Cambia la lingua
   lang: Lingua
diff --git a/app/locales/ja/main.yml b/app/locales/ja/main.yml
index 4e31417..1013e1d 100644
--- a/app/locales/ja/main.yml
+++ b/app/locales/ja/main.yml
@@ -1,5 +1,6 @@
 meta:
   title: '@:home.title ! #JoinPeerTube'
+  description: 無料/自由なソフトウェアに基づく分散動画ホスティングネットワーク
 nav:
   langChange: 言語を変更
   lang: 言語
diff --git a/app/locales/ru/main.yml b/app/locales/ru/main.yml
index 0446f4a..7267743 100644
--- a/app/locales/ru/main.yml
+++ b/app/locales/ru/main.yml
@@ -1,5 +1,6 @@
 meta:
   title: '@:home.title ! #ПрисоединяйсяPeerTube'
+  description: Децентрализованный видеохостинг, основанный на бесплатном и свободном ПО
 nav:
   langChange: Изменить язык
   lang: Язык
diff --git a/app/locales/sq/main.yml b/app/locales/sq/main.yml
index 9929d77..b7383c4 100644
--- a/app/locales/sq/main.yml
+++ b/app/locales/sq/main.yml
@@ -1,5 +1,6 @@
 meta:
   title: '@:home.title ! #JoinPeerTube'
+  description: Një rrjet i decentralizuar strehimi videosh, bazuar në software-in e lirë/libre
 nav:
   langChange: Ndryshoni gjuhën
   lang: Gjuhë
diff --git a/app/locales/sv/main.yml b/app/locales/sv/main.yml
index 6484407..3eb7080 100644
--- a/app/locales/sv/main.yml
+++ b/app/locales/sv/main.yml
@@ -1,5 +1,6 @@
 meta:
   title: '@:home.title ! #JoinPeerTube'
+  description: En decentraliserad videoplattform byggd på fri mjukvara
 nav:
   langChange: Byt språk
   lang: Språk
diff --git a/app/locales/zh_Hant_TW/main.yml b/app/locales/zh_Hant_TW/main.yml
index 8a50535..55b7e7d 100644
--- a/app/locales/zh_Hant_TW/main.yml
+++ b/app/locales/zh_Hant_TW/main.yml
@@ -1,5 +1,6 @@
 meta:
   title: '@:home.title ! #JoinPeerTube'
+  description: 去中心化的影片託管網路，奠基於自由開放原始碼軟體
 nav:
   langChange: 變更語言
   lang: 語言