From 3e12050b4c1e7fc25581d7f98ade47d24689473b Mon Sep 17 00:00:00 2001
From: girst <girst@users.noreply.github.com>
Date: Sun, 8 Sep 2019 16:24:17 +0200
Subject: [PATCH] info message for youtube-import (#740)

since signing up through the big button on the welcome message leads to
/data_control, it needs a message on what to do next. the most common
option here is importing subscriptions from youtube, hence it was moved
to the top.
the rather inconspicuous link to google's support pages was replaced by
a infobox that instructs the user to click a link to download a file and
upload it on this page.
---
 locales/de.json                      |  3 +++
 locales/en-US.json                   |  5 ++++-
 src/invidious/views/data_control.ecr | 20 ++++++++++++--------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/locales/de.json b/locales/de.json
index 03cdd398..97346168 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -28,6 +28,9 @@
     "Import FreeTube subscriptions (.db)": "FreeTube Abonnements importieren (.db)",
     "Import NewPipe subscriptions (.json)": "NewPipe Abonnements importieren (.json)",
     "Import NewPipe data (.zip)": "NewPipe Daten importieren (.zip)",
+    "To import your subscriptions from YouTube,": "Zum Importieren deiner Youtube-Abos",
+    "click here to download your YouTube-Takeout": "klick hier um deinen YouTube-Takeout herunterzuladen",
+    "and upload the file below.": "und lade diese Datei hier hoch.",
     "Export": "Exportieren",
     "Export subscriptions as OPML": "Abonnements als OPML exportieren",
     "Export subscriptions as OPML (for NewPipe & FreeTube)": "Abonnements als OPML exportieren (für NewPipe & FreeTube)",
diff --git a/locales/en-US.json b/locales/en-US.json
index 580d9ead..37566439 100644
--- a/locales/en-US.json
+++ b/locales/en-US.json
@@ -34,6 +34,9 @@
     "Import FreeTube subscriptions (.db)": "Import FreeTube subscriptions (.db)",
     "Import NewPipe subscriptions (.json)": "Import NewPipe subscriptions (.json)",
     "Import NewPipe data (.zip)": "Import NewPipe data (.zip)",
+    "To import your subscriptions from YouTube,": "To import your subscriptions from YouTube,",
+    "click here to download your YouTube-Takeout": "click here to download your YouTube-Takeout",
+    "and upload the file below.": "and upload the file below.",
     "Export": "Export",
     "Export subscriptions as OPML": "Export subscriptions as OPML",
     "Export subscriptions as OPML (for NewPipe & FreeTube)": "Export subscriptions as OPML (for NewPipe & FreeTube)",
@@ -367,4 +370,4 @@
     "Playlists": "Playlists",
     "Community": "Community",
     "Current version: ": "Current version: "
-}
\ No newline at end of file
+}
diff --git a/src/invidious/views/data_control.ecr b/src/invidious/views/data_control.ecr
index 463d5fd4..6be54710 100644
--- a/src/invidious/views/data_control.ecr
+++ b/src/invidious/views/data_control.ecr
@@ -3,22 +3,26 @@
 <% end %>
 
 <div class="h-box">
+    <div class="infobox">
+        <%= translate(locale, "To import your subscriptions from YouTube,") %>
+        <a rel="noopener" target="_blank" href="https://www.youtube.com/subscription_manager?action_takeout=1">
+            <%= translate(locale, "click here to download your YouTube-Takeout") %>
+        </a>
+        <%= translate(locale, "and upload the file below.") %>
+    </div>
+
     <form class="pure-form pure-form-aligned" enctype="multipart/form-data" action="/data_control?referer=<%= URI.escape(referer) %>" method="post">
         <fieldset>
             <legend><%= translate(locale, "Import") %></legend>
 
             <div class="pure-control-group">
-                <label for="import_youtube"><%= translate(locale, "Import Invidious data") %></label>
-                <input type="file" id="import_invidious" name="import_invidious">
+                <label for="import_youtube"><%= translate(locale, "Import YouTube subscriptions") %></label>
+                <input type="file" id="import_youtube" name="import_youtube">
             </div>
 
             <div class="pure-control-group">
-                <label for="import_youtube">
-                    <a rel="noopener" target="_blank" href="https://support.google.com/youtube/answer/6224202?hl=en">
-                        <%= translate(locale, "Import YouTube subscriptions") %>
-                    </a>
-                </label>
-                <input type="file" id="import_youtube" name="import_youtube">
+                <label for="import_youtube"><%= translate(locale, "Import Invidious data") %></label>
+                <input type="file" id="import_invidious" name="import_invidious">
             </div>
 
             <div class="pure-control-group">