Merge branch 'daviddavo:master' into revolut

_data/sites.json

@@ -23,6 +23,16 @@
         "notes_es-ES": "Entra en la dirección indicada arriba y rellena el formulario."
     },
 
+    {
+        "name": "Akinator",
+        "url": "https://en.akinator.com/content/13/privacy-policy",
+        "difficulty": "hard",
+        "email": "privacypolicy@elokence.com",
+        "notes": "According to privacy policy (item 8), you have to send an e-mail to them requesting the data.",
+        "notes_pt-BR": "De acordo com a política de privacidade (item 8), você tem de enviar um e-mail para eles, solicitando os dados.",
+        "notes_pt-PT": "De acordo com a política de privacidade (item 8), você tem de enviar um e-mail para eles, solicitando os dados."
+    },
+
     {
         "name": "Algor Education",
         "url": "https://en.algoreducation.com/contact-us",
@@ -207,6 +217,15 @@
         "notes_cs-CZ": "Go to your account settings, then click on \"Request your eBay data\", follow the simple steps and in 7 days you should receive your data back"
     },
 
+    {
+        "name": "Edizioni Simone",
+        "url": "https://edizioni.simone.it/informativa-sulla-privacy",
+        "difficulty": "hard",
+        "email": "privacy@simone.it",
+        "notes": "Contact the customer support via email and request a copy of your data.",
+        "notes_it-IT": "Contatta l'assistenza clienti via email e richiedi una copia dei tuoi dati."
+    },
+
     {
         "name": "Electroneum",
         "url": "https://support.electroneum.com/hc/en-gb/requests/new",
@@ -301,6 +320,13 @@
         "notes_cs-CZ": "In the section \"Export account data\" select \"Start report\". Once done, wait for an email to arrive."
     },
 
+    {
+        "name": "Gmail",
+        "url": "https://takeout.google.com/",
+        "difficulty": "easy",
+        "notes": "Since Gmail is a service by Google, please refer to the instructions for [Google](./#google)."
+    },
+
     {
         "name": "GOG",
         "url": "https://support.gog.com/hc/en-us/requests/new?form=other&product=gog",
@@ -315,7 +341,7 @@
         "meta": "popular",
         "url": "https://takeout.google.com/",
         "difficulty": "easy",
-        "notes": "Go to https://takeout.google.com/ logged in a Google Account and select the data from every Google Service you need/want and click \"Next Step\". Then you can choose between export now or once every 2 months for 1 year, the file type and size. Click \"Create Export\" and wait until the process is finished. Then, just download your data.",
+        "notes": "Go to [Google Takeout](https://takeout.google.com/) while logged in to a Google Account and select the data from every Google Service you need/want and click \"Next Step\". Then you can choose between export now or once every 2 months for 1 year, the file type and size. Click \"Create Export\" and wait until the process is finished. Then, just download your data.",
         "notes_es-ES": "Ve a https://takeout.google.com/, inicia sesión con tu cuenta de Google, selecciona los servicios que necesites. Puedes elegir entre exportar ahora o exportar cada 2 meses durante un año.",
         "notes_pl-PL": "Wejdź na stronę https://takeout.google.com/, zaloguj się za pomocą swojego konta Google, wybierz potrzebne usługi. Możesz wybrać eksport teraz lub eksport co 2 miesiące przez rok."
     },
@@ -381,10 +407,7 @@
     {
         "name": "Livelo",
         "url": "https://www.livelo.com.br/profile?occsite=points&tab=tab_label_1",
-        "difficulty": "easy",
-        "domains": [
-            "livelo.com.br"
-        ]
+        "difficulty": "easy"
     },
 
     {
@@ -440,6 +463,15 @@
         "notes_it-IT": "L'unico modo per contattarli è tramite email, ma nessuno risponde."
     },
 
+    {
+        "name": "Modrinth",
+        "url": "https://modrinth.com/legal/privacy",
+        "difficulty": "hard",
+        "email": "gdpr@modrinth.com",
+        "notes": "Send an email requesting a copy of your data.",
+        "notes_it-IT": "Invia una email richiedendo una copia dei tuoi dati."
+    },
+
     {
         "name": "Mozilla",
         "url": "https://www.mozilla.org/privacy/#contact",
@@ -465,8 +497,8 @@
         "url_cs-CZ": "https://cz.mlgame.org/",
         "difficulty": "hard",
         "email": "support_uk@elyland.net",
-        "notes": "Contact the customer support via email and ask to access your data. You should use the email of the country where you are registered.",
-        "notes_it-IT": "Contatta l'assistenza clienti via email e chiedi di accedere ai tuoi dati. Dovresti utilizzare l'email della nazione in cui sei registrato."
+        "notes": "Contact the customer support via email and ask to access your data. You should use the email of the country where you are registered: it's in the contacts, at the bottom of the website.",
+        "notes_it-IT": "Contatta l'assistenza clienti via email e chiedi di accedere ai tuoi dati. Dovresti utilizzare l'email della nazione in cui sei registrato: è nei contatti, in fondo al sito web."
     },
 
     {
@@ -495,6 +527,15 @@
         "notes_pt-PT": "Clique no link acima e preencha o formulário para confirmar a solicitação."
     },
 
+    {
+        "name": "Notion",
+        "url": "https://www.notion.so/Privacy-Policy-3468d120cf614d4c9014c09f6adc9091",
+        "difficulty": "hard",
+        "email": "team@makenotion.com",
+        "notes": "Contact the customer support via email and request a copy of your data.",
+        "notes_it-IT": "Contatta l'assistenza clienti via email e richiedi una copia dei tuoi dati."
+    },
+
     {
         "name": "OpenAI",
         "meta": "popular",
@@ -522,6 +563,20 @@
         "notes": "Click the link and confirm the request. The email with the data is usually sent within a few minutes."
     },
 
+    {
+        "name": "Paypal Account",
+        "url": "https://www.paypal.com/myaccount/privacy/data/dar",
+        "difficulty": "easy",
+        "notes": "Download all your personal data (transaction history excluded). Click on the 'send request' button, you will be notified via email once your data is ready."
+    },
+
+    {
+        "name": "Paypal Transactions",
+        "url": "https://www.paypal.com/reports/dlog",
+        "difficulty": "medium",
+        "notes": "This page allows you to download all the transactions of your account. Select 'all transactions' in the 'transaction type' dropdown, insert the date interval you want (note: you cannot go back more than ~6 years). Then click 'create report'. You will receive an email once your report is ready. "
+    },
+
     {
         "name": "PcComponentes",
         "url": "https://www.pccomponentes.com/",
@@ -531,6 +586,14 @@
         "notes_cs-CZ": "You will have to send a written request with your passport, or another identification document, to  Av. Europa Parcela 2-3, Pol. Ind. Las Salinas 30840 Alhama de Murcia. You can also request the data throught a e-mail to [lopd@pccomponentes.com](mailto:lopd@pccomponentes.com)."
     },
 
+    {
+        "name": "PlayStation Network",
+        "url": "https://id.sonyentertainmentnetwork.com/id/management_ca/?entry=privacy_settings",
+        "difficulty": "easy",
+        "notes": "Click on your profile icon, then on \"Account Settings\", then on \"Privacy Settings\", then on \"Data Access Request\", then on \"Request Data\". You will receive an email with a link to download your data when it is ready.",
+        "notes_it-IT": "Fai clic sull'icona del tuo profilo, quindi su \"Impostazioni account\", quindi su \"Impostazioni privacy\", quindi su \"Richiesta di accesso ai dati\", quindi su \"Richiedi i dati\". Riceverai un'email con un collegamento per scaricare i tuoi dati quando saranno pronti."
+    },
+
     {
         "name": "Popeyes",
         "url": "https://privacyportal-eu-cdn.onetrust.com/dsarwebform/7ae425dd-1c76-46b0-a1b4-2422a364fae3/draft/1d4481aa-204a-4cb5-a40a-82e4369d16b2.html",
@@ -788,6 +851,15 @@
     {
         "name": "Vinted",
         "url": "https://www.vinted.com/request_data_export",
+        "url_cs-CZ": "https://www.vinted.cz/request_data_export",
+        "url_de-DE": "https://www.vinted.de/request_data_export",
+        "url_es-ES": "https://www.vinted.es/request_data_export",
+        "url_fr-FR": "https://www.vinted.fr/request_data_export",
+        "url_it-IT": "https://www.vinted.it/request_data_export",
+        "url_nl-NL": "https://www.vinted.nl/request_data_export",
+        "url_pl-PL": "https://www.vinted.pl/request_data_export",
+        "url_pt-PT": "https://www.vinted.pt/request_data_export",
+        "url_en-GB": "https://www.vinted.co.uk/request_data_export",
         "difficulty": "easy",
         "notes": "Click on your profile icon, then \"Settings\", \"Privacy settings\", \"Download account data\" and \"Request data\".",
         "notes_it-IT": "Fai clic sull'icona del tuo profilo, quindi su \"Impostazioni\", \"Impostazioni di privacy\", \"Scarica i dati del tuo account\" e \"Richiedi i dati\"."
@@ -827,9 +899,20 @@
         "notes_es-ES": "Toda tu información está accesible la API. Puedes cambiar el idioma de Wikipedia cambiando la url."
     },
 
+    {
+        "name": "Withings",
+        "url": "https://account.withings.com/export/user_select",
+        "difficulty": "easy",
+        "notes": "Visit the linked paged to request your data. After a short while you'll receive an email and you can download your data."
+    },
+
     {
         "name": "Yahoo!",
-        "url": "https://es.yahoo.com/",
+        "url": "https://yahoo.com/",
+        "url_de-DE": "https://de.yahoo.com/",
+        "url_en-GB": "https://uk.yahoo.com/",
+        "url_es-ES": "https://espanol.yahoo.com/",
+        "url_fr-FR": "https://fr.yahoo.com/",
         "difficulty": "easy",
         "notes": "Go to https://yahoo.mydashboard.oath.com/ with a Yahoo! account, scroll down and select 'Request a download' and on the next page you select all the data you want to download, then add an email that you want notify when the download will be ready, this process may take about 30 days."
     },
@@ -841,6 +924,13 @@
         "notes": "You must to send e-mail to [datospersonales@yoigo.com](mailto:datospersonales@yoigo.com) with your DNI scaned by two sides with a request for what right you want to exercise."
     },
 
+    {
+        "name": "YouTube / YouTube Music",
+        "url": "https://takeout.google.com/",
+        "difficulty": "easy",
+        "notes": "Since YouTube and YouTube Music are services by Google, please refer to the instructions for [Google](./#google)."
+    },
+
     {
         "name": "Zanichelli",
         "url": "https://my.zanichelli.it/contattaci",

_data/trans/de-DE.json

@@ -19,7 +19,7 @@
     "hideinfo": "Informationen ausblenden...",
     "link_jdm": "Besuchen Sie JustDeleteMe",
     "link_jwtd": "Besuche JustWhatsTheData",
-    "name": "Englisch",
+    "name": "Deutsch",
     "noinfo": "Weitere Informationen nicht vorhanden",
     "noresults": "Finden Sie nicht, wonach Sie suchen?",
     "noresultshelp": "Hilf mit, JustGetMyData zu verbessern",

_includes/body.html

@@ -1,3 +1,4 @@
+<!-- Search / Filter Section -->
 <div class="search">
     <div class="search-container">
         <input type="text" id="search">
@@ -7,11 +8,13 @@
     <div class="sort-container">
         <button class="popular">{{ site.data.trans[page.lang].popular }}</button>
         <button data-dropdown="#alphabetical-dropdown" class="az-sort">A - Z</button>
+        <button data-dropdown="#numerical-dropdown" class="09-sort">0 - 9</button>
         <button data-dropdown="#difficulty-dropdown" class="diff-sort">{{ site.data.trans[page.lang].difficulty }}</button>
         <button class="reset">{{ site.data.trans[page.lang].reset }}</button>
     </div>
 </div>
 
+<!-- Site List -->
 <main>
     <section class="sites" id="sites">
         <p class="no-results">{{ site.data.trans[page.lang].noresults }} <a href='https://github.com/justgetmydata/jgmd'>{{ site.data.trans[page.lang].noresultshelp }}</a>.</p>
@@ -62,6 +65,7 @@
     </section>
 </main>
 
+<!-- About Section -->
 <section id="about" class="info-block about">
     <div class="info-container">
         <div class="info-block-half">
@@ -135,6 +139,19 @@ <h2>{{ site.data.trans[page.lang].extensionguide|safe }}</h2>
     </ul>
 </div>
 
+<!-- Numerical sorting -->
+<div id="numerical-dropdown" class="dropdown dropdown-tip">
+    <ul class="dropdown-menu ltr">
+        <span class="num-sort">
+            {% assign digits = '0,1,2,3,4,5,6,7,8,9' | split:',' %}
+            {% for digit in digits %}
+            <li><a href="">{{ digit }}</a></li>
+            {% endfor %}
+        </span>
+    </ul>
+</div>
+
+<!-- Difficulty sorting -->
 <div id="difficulty-dropdown" class="dropdown dropdown-tip">
     <ul class="dropdown-menu">
         <span class="diff-sort">

assets/js/scripts.js

@@ -55,6 +55,17 @@ $(function(){
         });
     });
 
+    // 0 - 9 filtering
+    $(".num-sort a").click(function(e){
+        e.preventDefault();
+        var term = $(this).text().toLowerCase();
+
+        hideFilteredSites(function() {
+            var text = $(this).find(".site-header").text().trim().toLowerCase().substr(0,1);
+            return !~text.indexOf(term);
+        });
+    });
+
     // Difficulty filtering
     $(".diff-sort a").click(function(e){
         e.preventDefault();

script/validate_json.rb

@@ -18,10 +18,11 @@ module ExitCodes
     UNEXPECTED_LANGUAGE_KEY = 10   # Unexpected language key for translation
     UNSUPPORTED_FIELD = 11         # Unsupported field for site entry
     UNEXPECTED_NOTES = 12          # Unexpected notes key for translation
+    DUPLICATES = 13                # Duplicate entries
 end
 
 SupportedDifficulties = ["easy", "medium", "hard", "limited", "impossible"]
-SupportedEntryKeys = ["difficulty", "domains", "email", "email_body", "email_subject", "meta", "name", "notes", "url"]
+SupportedEntryKeys = ["difficulty", "email", "email_body", "email_subject", "meta", "name", "notes", "url"]
 SupportedLanguageKeys = ["about", "contribute", "difficulty", "difficulty_easy", "difficulty_hard", "difficulty_impossible",
                         "difficulty_limited", "difficulty_medium", "footercredits", "footerlicense",
                         "guide", "guideeasy", "guideexplanations", "guidehard", "guideimpossible", "guidelimited",
@@ -112,7 +113,6 @@ def validate_website_entry(key, i)
     validate_accepted_keys(key)
     error_on_missing_field(key, 'url', ExitCodes::MISSING_URL)
     error_on_missing_field(key, 'difficulty', ExitCodes::MISSING_DIFFICULTY)
-    warning_on_missing_field(key, 'domains')
     validate_difficulty(key)
     validate_localized_urls(key)
     validate_localized_notes(key)
@@ -143,6 +143,13 @@ def validate_site_translation(is_sites_json, keys_in_language_json, file)
         json = JSON.parse(File.read(file))
         is_sites_json = File.basename(file) =~ /sites.json/
         keys_in_language_json = []
+
+        # check for duplicates
+        if json.uniq.length != json.length
+            STDERR.puts file + " contains duplicates"
+            exit ExitCodes::DUPLICATES
+        end
+
         # check for alphabetical ordering
         json.each_with_index do |(key, _), i|
             # sites.json is an array of objects; this would expand to: