From d3250e0f504d651280cfbd19626f86c97ae6385a Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Sat, 29 Jul 2023 17:06:30 +0200 Subject: Removed twitter field for users. --- README.md | 1 - .../73540b3bf183_removed_twitter_user_property.py | 23 + newspipe/models/user.py | 1 - newspipe/templates/article.html | 1 - newspipe/templates/article_pub.html | 1 - newspipe/templates/profile.html | 3 - newspipe/templates/profile_public.html | 6 - newspipe/translations/fr/LC_MESSAGES/messages.po | 346 +----- newspipe/translations/messages.pot | 1098 -------------------- newspipe/web/forms.py | 1 - newspipe/web/views/user.py | 1 - 11 files changed, 39 insertions(+), 1443 deletions(-) create mode 100644 migrations/versions/73540b3bf183_removed_twitter_user_property.py diff --git a/README.md b/README.md index 2813f69d..fcc50901 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,6 @@ https://www.newspipe.org * export and import feeds with OPML files; * search and favorite articles; * detection of inactive feeds; -* share articles on Pinboard, Reddit and Twitter; * management of bookmarks (with import from Pinboard). * Optional ldap authentication diff --git a/migrations/versions/73540b3bf183_removed_twitter_user_property.py b/migrations/versions/73540b3bf183_removed_twitter_user_property.py new file mode 100644 index 00000000..eb530a87 --- /dev/null +++ b/migrations/versions/73540b3bf183_removed_twitter_user_property.py @@ -0,0 +1,23 @@ +"""Removed Twitter user property. + +Revision ID: 73540b3bf183 +Revises: 2a5604bed382 +Create Date: 2023-07-29 16:44:57.629951 + +""" +# revision identifiers, used by Alembic. +revision = "73540b3bf183" +down_revision = "2a5604bed382" +branch_labels = None +depends_on = None + +from alembic import op +import sqlalchemy as sa + + +def upgrade(): + op.drop_column("user", "twitter") + + +def downgrade(): + op.add_column("user", sa.Column("twitter", sa.String(), default="")) diff --git a/newspipe/models/user.py b/newspipe/models/user.py index 72c35afc..90e682ca 100644 --- a/newspipe/models/user.py +++ b/newspipe/models/user.py @@ -53,7 +53,6 @@ class User(db.Model, UserMixin, RightMixin): is_public_profile = db.Column(db.Boolean(), default=False) bio = db.Column(db.String(5000), default="") webpage = db.Column(db.String(), default="") - twitter = db.Column(db.String(), default="") date_created = db.Column(db.DateTime(), default=datetime.utcnow) last_seen = db.Column(db.DateTime(), default=datetime.utcnow) diff --git a/newspipe/templates/article.html b/newspipe/templates/article.html index 5eff64e7..c62e3f0c 100644 --- a/newspipe/templates/article.html +++ b/newspipe/templates/article.html @@ -30,7 +30,6 @@
-
diff --git a/newspipe/templates/article_pub.html b/newspipe/templates/article_pub.html index 5f3ff0c1..962f60dd 100644 --- a/newspipe/templates/article_pub.html +++ b/newspipe/templates/article_pub.html @@ -17,7 +17,6 @@
-
diff --git a/newspipe/templates/profile.html b/newspipe/templates/profile.html index 12e0682a..d55e8968 100644 --- a/newspipe/templates/profile.html +++ b/newspipe/templates/profile.html @@ -37,9 +37,6 @@ {{ form.webpage.label }} {{ form.webpage(class_="form-control") }} {% for error in form.webpage.errors %} {{ error }}
{% endfor %} - {{ form.twitter.label }} - {{ form.twitter(class_="form-control") }} {% for error in form.twitter.errors %} {{ error }}
{% endfor %} -
{{ form.is_public_profile.label }} {{ form.is_public_profile(class_="form-check-input") }} diff --git a/newspipe/templates/profile_public.html b/newspipe/templates/profile_public.html index 9ba3578c..dc78f3f9 100644 --- a/newspipe/templates/profile_public.html +++ b/newspipe/templates/profile_public.html @@ -18,12 +18,6 @@ {{ _('Webpage') }}: {{ user.webpage | safe }}

{% endif %} - {% if user.twitter %} -

-   - {{ _('Twitter') }}: {{ user.twitter | safe }} -

- {% endif %}
diff --git a/newspipe/translations/fr/LC_MESSAGES/messages.po b/newspipe/translations/fr/LC_MESSAGES/messages.po index 73f17e08..20ece9d4 100644 --- a/newspipe/translations/fr/LC_MESSAGES/messages.po +++ b/newspipe/translations/fr/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2020-03-14 22:42+0100\n" -"PO-Revision-Date: 2020-03-14 22:48+0100\n" +"PO-Revision-Date: 2023-07-29 17:06+0200\n" "Last-Translator: Cédric Bonhomme \n" "Language-Team: fr \n" "Language: fr\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "Generated-By: Babel 1.3\n" -"X-Generator: Poedit 2.2.4\n" +"X-Generator: Poedit 3.2.2\n" #: newspipe/templates/about.html:6 newspipe/templates/layout.html:117 #: newspipe/templates/layout.html:129 @@ -31,15 +31,15 @@ msgstr "Newspipe est un agrégateur de nouvelles Web." #: newspipe/templates/about.html:9 msgid "" "This software is under AGPLv3 license. You are welcome to copy, modify or\n" -" redistribute the source code\n" +" redistribute the source code\n" " according to the Affero GPL license." msgstr "" "Ce logiciel est sous licence AGPLv3. Vous êtes invité à copier, modifier ou " "redistribuer le code source selon la licence Affero GPL." +"a> selon la licence Affero GPL." #: newspipe/templates/about.html:12 msgid "" @@ -76,11 +76,11 @@ msgstr "" #: newspipe/templates/about.html:22 #, python-format msgid "" -"Subscribe to this feed using Newspipe" +"Subscribe to this feed using Newspipe" msgstr "" -"Abonnez-vous à ce flux en utilisant Newspipe" +"Abonnez-vous à ce flux en utilisant Newspipe" #: newspipe/templates/about_more.html:5 msgid "Newspipe version" @@ -133,8 +133,8 @@ msgstr "Partager sur" #: newspipe/templates/categories.html:4 #, python-format msgid "" -"You have %(categories)d categories · Add a %(start_link)scategory" -"%(end_link)s" +"You have %(categories)d categories · Add a " +"%(start_link)scategory%(end_link)s" msgstr "" "Vous avez %(categories)d catégories · Ajouter une " "%(start_link)scategorie%(end_link)s" @@ -199,11 +199,11 @@ msgstr "" #: newspipe/templates/edit_bookmark.html:72 #, python-format msgid "" -"Bookmark this page using Newspipe" +"Bookmark this page using Newspipe" msgstr "" -"Marquez cette page en utilisant Newspipe" +"Marquez cette page en utilisant Newspipe" #: newspipe/templates/edit_bookmark.html:76 msgid "Import bookmarks from Pinboard" @@ -686,10 +686,6 @@ msgstr "Supprimer votre compte" msgid "Webpage" msgstr "Page web" -#: newspipe/templates/profile_public.html:24 newspipe/web/forms.py:200 -msgid "Twitter" -msgstr "Twitter" - #: newspipe/templates/signup.html:10 msgid "Letters, numbers, dots and underscores only." msgstr "Lettres, chiffres, points et '_' seulement." @@ -1131,313 +1127,3 @@ msgstr "Authentification requise." #: newspipe/web/views/views.py:30 msgid "Forbidden." msgstr "Interdit." - -#~ msgid "" -#~ "You can easily install Newspipe on your server." -#~ msgstr "" -#~ "Vous pouvez facilement installer Newspipe sur votre serveur." - -#~ msgid "Alternatively, you can deploy your own copy using this button:" -#~ msgstr "" -#~ "Alternativement, vous pouvez déployer votre propre copie en utilisant ce " -#~ "bouton:" - -#~ msgid "" -#~ "The documentation of the API is here." -#~ msgstr "" -#~ "La documentation de l'API est ici." - -#~ msgid "Running on Heroku" -#~ msgstr "Fonctionne sur Heroku" - -#~ msgid "Most recurrent words" -#~ msgstr "Mots les plus récurrents" - -#~ msgid "Data liberation" -#~ msgstr "Libération des données" - -#~ msgid "OPML import/export" -#~ msgstr "Import/export OPML" - -#~ msgid "Export format not supported." -#~ msgstr "Ce format d'export n'est pas supporté." - -#~ msgid "Please enter your email address." -#~ msgstr "S'il vous plaît, entrez votre adresse email." - -#~ msgid "Please enter your email." -#~ msgstr "S'il vous plaît, entrez votre email." - -#~ msgid "Recover" -#~ msgstr "Récupérer" - -#~ msgid "Account not confirmed." -#~ msgstr "Compte non confirmé." - -#~ msgid "Invalid email." -#~ msgstr "Email invalide." - -#~ msgid "Forgot password" -#~ msgstr "Mot de passe oublié" - -#~ msgid "Recover your account" -#~ msgstr "Récupérer votre compte" - -#~ msgid "Send notification messages" -#~ msgstr "Envoyer des messages de notification" - -#~ msgid "New password sent to your address." -#~ msgstr "Nouveau mot de passe envoyé à votre adresse." - -#~ msgid "Problem while sending your new password: %(error)s" -#~ msgstr "Problème lors de l'envoi de votre nouveau mot de passe: %(error)s" - -#~ msgid "Feeds refresh frequency (in minutes)" -#~ msgstr "Fréquence de rafraîchissement du flux (en minutes)" - -#~ msgid "Export articles" -#~ msgstr "Exporter les articles" - -#~ msgid "" -#~ "If you have any problem, contact the administrator." -#~ msgstr "" -#~ "Si vous avez des problèmes, contactez l'administrateur." - -#~ msgid "Last seen:" -#~ msgstr "Vue la dernière fois le" - -#~ msgid "Member since:" -#~ msgstr "Membre depuis le:" - -#~ msgid "Webpage:" -#~ msgstr "Page web:" - -#~ msgid "Donation" -#~ msgstr "Don" - -#~ msgid "" -#~ "If you wish and if you like Newspipe, you can donate via bitcoin 1GVmhR9fbBeEh7rP1qNq76jWArDdDQ3otZ. Thank you!" -#~ msgstr "" -#~ "Si vous le souhaitez et si vous aimez Newspipe, vous pouvez faire un don " -#~ "via bitcoin 1GVmhR9fbBeEh7rP1qNq76jWArDdDQ3otZ. Merci!" - -#~ msgid "Next post:" -#~ msgstr "Billet suivant:" - -#~ msgid "Previous post:" -#~ msgstr "Billet précédent:" - -#~ msgid "Submit" -#~ msgstr "Soumettre" - -#~ msgid "Account not confirmed" -#~ msgstr "Compte non confirmé" - -#~ msgid "Invalid email or password" -#~ msgstr "E-mail ou mot de passe invalide" - -#~ msgid "No feed" -#~ msgstr "Aucun flux" - -#~ msgid "Add a" -#~ msgstr "Ajouter un" - -#~ msgid "feed" -#~ msgstr "flux" - -#~ msgid "error" -#~ msgstr "erreur" - -#~ msgid "No icon found for this feed" -#~ msgstr "Aucune icône trouvé pour ce flux." - -#~ msgid "Home" -#~ msgstr "Accueil" - -#~ msgid "Favorites" -#~ msgstr "Favoris" - -#~ msgid "Mark all as read older than yesterday" -#~ msgstr "Marquer tout comme lu plus ancien qu'hier" - -#~ msgid "Mark all as read older than %(days)s days" -#~ msgstr "Marquer tout comme lu plus ancien que %(days)s jours" - -#~ msgid "View this user" -#~ msgstr "Voir cet utilisateur" - -#~ msgid "Membership" -#~ msgstr "Adhésion" - -#~ msgid "Logged out successfully." -#~ msgstr "Déconnecté avec succès." - -#~ msgid "Email already used." -#~ msgstr "Email déjà utilisé." - -#~ msgid "No text to search were provided." -#~ msgstr "Aucun texte à chercher a été soumis." - -#~ msgid "Search:" -#~ msgstr "Recherche:" - -#~ msgid "deleted." -#~ msgstr "supprimé." - -#~ msgid "This article do not exist." -#~ msgstr "Cet article n'existe pas." - -#~ msgid "User" -#~ msgstr "Utilisateur" - -#~ msgid "Problem while sending email" -#~ msgstr "Problème lors de l'envoi de l'email" - -#~ msgid "successfully deleted." -#~ msgstr "supprimé avec succès." - -#~ msgid "Account of the user" -#~ msgstr "Compte de l'utilisateur" - -#~ msgid "successfully activated." -#~ msgstr "activé avec succès." - -#~ msgid "Problem while sending activation email" -#~ msgstr "Problème lors de l'envoi d'email d'activation" - -#~ msgid "successfully disabled." -#~ msgstr "désactivé avec succès." - -#~ msgid "You can easily install Newspipe on your server." -#~ msgstr "Vous pouvez facilement installer Newspipe sur votre serveur." - -#~ msgid "This user is not subscribed to any feed." -#~ msgstr "Cet utilisateur n'est pas encore abonné à des flux." - -#~ msgid "(unread) articles" -#~ msgstr "(non lus) articles" - -#~ msgid "Logged in successfully." -#~ msgstr "Connecté avec succès." - -#~ msgid "Index database" -#~ msgstr "Indexer la base de données" - -#~ msgid "Indexing database..." -#~ msgstr "Indexation la base de données..." - -#~ msgid "An error occurred" -#~ msgstr "Une erreur est survenue." - -#~ msgid "Option not available on Heroku." -#~ msgstr "Option non disponible sur Heroku." - -#~ msgid "Full text search is not yet implemented for Heroku." -#~ msgstr "La recherche rapide n'est pas supporté sur Heroku." - -#~ msgid "Favorites articles" -#~ msgstr "Articles favoris" - -#~ msgid "More articles" -#~ msgstr "Plus d'articles" - -#~ msgid "Management" -#~ msgstr "Gestion" - -#~ msgid "Update your" -#~ msgstr "Mettez à jour votre" - -#~ msgid "No unread articles" -#~ msgstr "Pas d'articles non lus" - -#~ msgid "Unread articles" -#~ msgstr "Articles non lus" - -#~ msgid "Mark all feed as read" -#~ msgstr "Marquer tout comme lu" - -#~ msgid "Mark all feed as unread" -#~ msgstr "Marquer tout comme non lu" - -#~ msgid "Feed already in the database." -#~ msgstr "Flux déjà dans la base de données." - -#~ msgid "of the database" -#~ msgstr "de la base de données" - -#~ msgid "Email notification" -#~ msgstr "Notification par email" - -#~ msgid "Database indexed." -#~ msgstr "Base de données indexée." - -#~ msgid "Oh!" -#~ msgstr "Oh!" - -#~ msgid "This feed is empty." -#~ msgstr "Ce flux est vide." - -#~ msgid "Work for you!" -#~ msgstr "Du travail pour toi!" - -#~ msgid "All articles are unread." -#~ msgstr "Tous les articles sont non lus." - -#~ msgid "Well done!" -#~ msgstr "Bien joué!" - -#~ msgid "You read all articles." -#~ msgstr "Tu as lu tous les articles." - -#~ msgid "Please enter a link for the feed." -#~ msgstr "S'il vous plaît, entrez un lien pour le flux." - -#~ msgid "Articles marked as read." -#~ msgstr "Articles marqués comme lus." - -#~ msgid "Fetch this feed" -#~ msgstr "Récupérer ce flux" - -#~ msgid "Fix this." -#~ msgstr "Résolvez ce problème." - -#~ msgid "As an administrator you are not listed in this table" -#~ msgstr "En tant qu'administrateur vous ne figurez pas dans ce tableau" - -#~ msgid "Activation key:" -#~ msgstr "Clé d'activation:" - -#~ msgid "First name" -#~ msgstr "Prénom" - -#~ msgid "Please enter your last name." -#~ msgstr "S'il vous plaît, entrez votre nom de famille." - -#~ msgid "" -#~ "This lastname has invalid characters. Please use letters, numbers, dots " -#~ "and underscores only." -#~ msgstr "" -#~ "Ce nom de famille a des caractères non valides. S'il vous plaît utiliser " -#~ "des lettres, des chiffres, des points et '_' seulement." - -#~ msgid "Firstname" -#~ msgstr "Prénom" - -#~ msgid "Lastname" -#~ msgstr "Nom de famille" - -#~ msgid "Account creation" -#~ msgstr "Ouverture de compte" - -#~ msgid "Request an account." -#~ msgstr "Demander un compte." diff --git a/newspipe/translations/messages.pot b/newspipe/translations/messages.pot index 94c233fa..e69de29b 100644 --- a/newspipe/translations/messages.pot +++ b/newspipe/translations/messages.pot @@ -1,1098 +0,0 @@ -# Translations template for PROJECT. -# Copyright (C) 2020 ORGANIZATION -# This file is distributed under the same license as the PROJECT project. -# FIRST AUTHOR , 2020. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PROJECT VERSION\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2020-03-14 22:42+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.8.0\n" - -#: newspipe/templates/about.html:6 newspipe/templates/layout.html:117 -#: newspipe/templates/layout.html:129 -msgid "About" -msgstr "" - -#: newspipe/templates/about.html:8 -msgid "Newspipe is a news aggregator platform." -msgstr "" - -#: newspipe/templates/about.html:9 -msgid "" -"This software is under AGPLv3 license. You are welcome to copy, modify or" -"\n" -" redistribute the source code\n" -" according to the Affero GPL " -"license." -msgstr "" - -#: newspipe/templates/about.html:12 -msgid "" -"Found a bug? Report it here." -msgstr "" - -#: newspipe/templates/about.html:13 -msgid "More information" -msgstr "" - -#: newspipe/templates/about.html:13 -msgid "about this instance." -msgstr "" - -#: newspipe/templates/about.html:19 -msgid "Help" -msgstr "" - -#: newspipe/templates/about.html:20 -msgid "Contact" -msgstr "" - -#: newspipe/templates/about.html:21 -msgid "" -"You can subscribe to new feeds with a bookmarklet. Drag the following " -"button to your browser bookmarks." -msgstr "" - -#: newspipe/templates/about.html:22 -#, python-format -msgid "" -"Subscribe to this feed using Newspipe" -msgstr "" - -#: newspipe/templates/about_more.html:5 -msgid "Newspipe version" -msgstr "" - -#: newspipe/templates/about_more.html:6 -msgid "Registration" -msgstr "" - -#: newspipe/templates/about_more.html:7 -msgid "Python version" -msgstr "" - -#: newspipe/templates/about_more.html:8 -msgid "Number of users" -msgstr "" - -#: newspipe/templates/article.html:6 newspipe/templates/article_pub.html:6 -msgid "from" -msgstr "" - -#: newspipe/templates/article.html:7 newspipe/templates/duplicates.html:22 -#: newspipe/templates/duplicates.html:23 newspipe/templates/home.html:115 -msgid "Delete this article" -msgstr "" - -#: newspipe/templates/article.html:9 newspipe/templates/home.html:117 -msgid "One of your favorites" -msgstr "" - -#: newspipe/templates/article.html:11 newspipe/templates/home.html:119 -msgid "Click if you like this article" -msgstr "" - -#: newspipe/templates/article.html:14 newspipe/templates/home.html:122 -msgid "Mark this article as unread" -msgstr "" - -#: newspipe/templates/article.html:16 newspipe/templates/home.html:124 -msgid "Mark this article as read" -msgstr "" - -#: newspipe/templates/article.html:25 newspipe/templates/article.html:28 -#: newspipe/templates/article.html:31 newspipe/templates/article_pub.html:14 -#: newspipe/templates/article_pub.html:17 -#: newspipe/templates/article_pub.html:20 -msgid "Share on" -msgstr "" - -#: newspipe/templates/categories.html:4 -#, python-format -msgid "" -"You have %(categories)d categories · Add a " -"%(start_link)scategory%(end_link)s" -msgstr "" - -#: newspipe/templates/categories.html:6 -msgid "No category" -msgstr "" - -#: newspipe/templates/categories.html:13 -msgid "Name" -msgstr "" - -#: newspipe/templates/categories.html:14 newspipe/templates/layout.html:41 -#: newspipe/templates/layout.html:43 newspipe/templates/management.html:54 -#: newspipe/templates/profile_public.html:38 -msgid "Feeds" -msgstr "" - -#: newspipe/templates/categories.html:15 newspipe/templates/feed_list.html:10 -#: newspipe/templates/management.html:33 -msgid "Articles" -msgstr "" - -#: newspipe/templates/admin/dashboard.html:15 -#: newspipe/templates/categories.html:16 newspipe/templates/feed_list.html:11 -msgid "Actions" -msgstr "" - -#: newspipe/templates/categories.html:27 -msgid "Edit this category" -msgstr "" - -#: newspipe/templates/categories.html:28 -msgid "Delete this category" -msgstr "" - -#: newspipe/templates/categories.html:28 -msgid "You are going to delete this category." -msgstr "" - -#: newspipe/templates/duplicates.html:4 -msgid "Duplicates in the feed" -msgstr "" - -#: newspipe/templates/duplicates.html:11 newspipe/templates/duplicates.html:14 -msgid "Delete all in this column" -msgstr "" - -#: newspipe/templates/edit_bookmark.html:68 newspipe/templates/layout.html:83 -#: newspipe/web/views/bookmark.py:127 -msgid "Add a new bookmark" -msgstr "" - -#: newspipe/templates/edit_bookmark.html:71 -msgid "" -"You can add a bookmark with a bookmarklet. Drag the following button to " -"your browser bookmarks." -msgstr "" - -#: newspipe/templates/edit_bookmark.html:72 -#, python-format -msgid "" -"Bookmark this page using Newspipe" -msgstr "" - -#: newspipe/templates/edit_bookmark.html:76 -msgid "Import bookmarks from Pinboard" -msgstr "" - -#: newspipe/templates/edit_feed.html:19 newspipe/templates/edit_feed.html:27 -#: newspipe/templates/edit_feed.html:35 -msgid "Optional" -msgstr "" - -#: newspipe/templates/edit_feed.html:55 -#, python-format -msgid "" -"If checked, articles of this feed won't be available to others and the " -"feed won't be listed on your profile page." -msgstr "" - -#: newspipe/templates/edit_feed.html:56 -msgid "Check this box if there is a private token in the link of the feed." -msgstr "" - -#: newspipe/templates/edit_feed.html:62 -msgid "Filters" -msgstr "" - -#: newspipe/templates/edit_feed.html:73 -msgid "simple match" -msgstr "" - -#: newspipe/templates/edit_feed.html:74 -msgid "regex" -msgstr "" - -#: newspipe/templates/edit_feed.html:78 -msgid "match" -msgstr "" - -#: newspipe/templates/edit_feed.html:79 -msgid "no match" -msgstr "" - -#: newspipe/templates/edit_feed.html:82 -msgid "mark as read" -msgstr "" - -#: newspipe/templates/edit_feed.html:83 -msgid "mark as favorite" -msgstr "" - -#: newspipe/templates/feed.html:8 newspipe/templates/feed_list.html:35 -#: newspipe/templates/home.html:45 newspipe/templates/home.html:64 -msgid "Delete this feed" -msgstr "" - -#: newspipe/templates/feed.html:8 newspipe/templates/feed_list.html:35 -#: newspipe/templates/home.html:45 newspipe/templates/home.html:64 -msgid "You are going to delete this feed." -msgstr "" - -#: newspipe/templates/feed.html:9 newspipe/templates/feed_list.html:33 -#: newspipe/templates/home.html:42 newspipe/templates/home.html:61 -msgid "Edit this feed" -msgstr "" - -#: newspipe/templates/feed.html:14 -msgid "This feed contains" -msgstr "" - -#: newspipe/templates/feed.html:14 -msgid "articles" -msgstr "" - -#: newspipe/templates/feed.html:16 -#, python-format -msgid "This feed is part of category %(category_name)s" -msgstr "" - -#: newspipe/templates/feed.html:18 -msgid "Address of the feed" -msgstr "" - -#: newspipe/templates/feed.html:20 -msgid "Address of the site" -msgstr "" - -#: newspipe/templates/feed.html:26 -msgid "Last download:" -msgstr "" - -#: newspipe/templates/feed.html:30 -msgid "" -"That feed has encountered too much consecutive errors and won't be " -"retrieved anymore." -msgstr "" - -#: newspipe/templates/feed.html:31 -#, python-format -msgid "" -"You can click here to reset the error " -"count and reactivate the feed." -msgstr "" - -#: newspipe/templates/feed.html:33 -msgid "" -"The download of this feed has encountered some problems. However its " -"error counter will be reinitialized at the next successful retrieving." -msgstr "" - -#: newspipe/templates/feed.html:37 -msgid "Here's the last error encountered while retrieving this feed:" -msgstr "" - -#: newspipe/templates/feed.html:41 -msgid "The last article was posted" -msgstr "" - -#: newspipe/templates/feed.html:41 -msgid "day(s) ago." -msgstr "" - -#: newspipe/templates/feed.html:42 -msgid "Daily average" -msgstr "" - -#: newspipe/templates/feed.html:42 -msgid "between the" -msgstr "" - -#: newspipe/templates/feed.html:42 -msgid "and the" -msgstr "" - -#: newspipe/templates/feed.html:53 newspipe/templates/home.html:107 -msgid "Article" -msgstr "" - -#: newspipe/templates/feed.html:54 newspipe/templates/home.html:108 -msgid "Date" -msgstr "" - -#: newspipe/templates/feed_list.html:7 -msgid "Status" -msgstr "" - -#: newspipe/templates/feed_list.html:8 -#: newspipe/templates/feed_list_per_categories.html:25 -#: newspipe/templates/feed_list_simple.html:7 -#: newspipe/templates/user_stream.html:48 newspipe/web/forms.py:224 -#: newspipe/web/forms.py:251 -msgid "Title" -msgstr "" - -#: newspipe/templates/feed_list.html:9 -#: newspipe/templates/feed_list_per_categories.html:26 -#: newspipe/templates/feed_list_simple.html:8 -msgid "Site" -msgstr "" - -#: newspipe/templates/feed_list.html:20 -msgid "Feed enabled" -msgstr "" - -#: newspipe/templates/feed_list.html:22 -msgid "Feed disabled" -msgstr "" - -#: newspipe/templates/feed_list.html:25 -msgid "Feed encountered too much errors." -msgstr "" - -#: newspipe/templates/feed_list.html:32 -msgid "Information" -msgstr "" - -#: newspipe/templates/feed_list.html:34 -msgid "Duplicate articles" -msgstr "" - -#: newspipe/templates/feeds.html:4 -#, python-format -msgid "You are subscribed to %(feed_count)d feeds." -msgstr "" - -#: newspipe/templates/feeds.html:4 newspipe/templates/management.html:9 -msgid "Add" -msgstr "" - -#: newspipe/templates/feeds.html:4 newspipe/templates/management.html:9 -msgid "a feed" -msgstr "" - -#: newspipe/templates/history.html:4 newspipe/templates/layout.html:46 -msgid "History" -msgstr "" - -#: newspipe/templates/history.html:9 -msgid "all years" -msgstr "" - -#: newspipe/templates/home.html:12 -msgid "You don't have any feeds." -msgstr "" - -#: newspipe/templates/home.html:13 -msgid "Add some" -msgstr "" - -#: newspipe/templates/home.html:13 -msgid "or" -msgstr "" - -#: newspipe/templates/home.html:13 -msgid "upload an OPML file." -msgstr "" - -#: newspipe/templates/home.html:22 -msgid "All feeds" -msgstr "" - -#: newspipe/templates/home.html:27 -msgid "Mark all as read" -msgstr "" - -#: newspipe/templates/home.html:41 newspipe/templates/home.html:60 -msgid "Details" -msgstr "" - -#: newspipe/templates/home.html:43 newspipe/templates/home.html:62 -msgid "Mark this feed as unread" -msgstr "" - -#: newspipe/templates/home.html:44 newspipe/templates/home.html:63 -#: newspipe/templates/home.html:101 -msgid "Mark this feed as read" -msgstr "" - -#: newspipe/templates/home.html:73 newspipe/templates/home.html:89 -msgid "All" -msgstr "" - -#: newspipe/templates/home.html:76 -msgid "Read" -msgstr "" - -#: newspipe/templates/home.html:79 -msgid "Unread" -msgstr "" - -#: newspipe/templates/home.html:82 -msgid "Liked" -msgstr "" - -#: newspipe/templates/home.html:105 -msgid "Feed" -msgstr "" - -#: newspipe/templates/inactives.html:6 -msgid "Days of inactivity" -msgstr "" - -#: newspipe/templates/inactives.html:17 -msgid "days" -msgstr "" - -#: newspipe/templates/inactives.html:22 -msgid "No inactive feeds." -msgstr "" - -#: newspipe/templates/layout.html:37 -msgid "Fetch" -msgstr "" - -#: newspipe/templates/layout.html:44 -msgid "Inactive" -msgstr "" - -#: newspipe/templates/layout.html:45 -msgid "Popular" -msgstr "" - -#: newspipe/templates/layout.html:48 newspipe/templates/layout.html:50 -msgid "Add a new feed" -msgstr "" - -#: newspipe/templates/layout.html:53 -msgid "Site or feed url" -msgstr "" - -#: newspipe/templates/layout.html:62 newspipe/templates/layout.html:64 -msgid "Categories" -msgstr "" - -#: newspipe/templates/layout.html:66 newspipe/templates/layout.html:68 -msgid "Add a new category" -msgstr "" - -#: newspipe/templates/layout.html:71 newspipe/web/forms.py:243 -msgid "Category name" -msgstr "" - -#: newspipe/templates/layout.html:80 newspipe/templates/layout.html:82 -#: newspipe/templates/management.html:92 newspipe/web/views/bookmark.py:61 -msgid "Bookmarks" -msgstr "" - -#: newspipe/templates/layout.html:88 -msgid "Search" -msgstr "" - -#: newspipe/templates/layout.html:92 -msgid "Query" -msgstr "" - -#: newspipe/templates/layout.html:110 -msgid "Profile" -msgstr "" - -#: newspipe/templates/layout.html:111 newspipe/templates/management.html:27 -msgid "Your data" -msgstr "" - -#: newspipe/templates/layout.html:114 -msgid "Dashboard" -msgstr "" - -#: newspipe/templates/layout.html:118 -msgid "Logout" -msgstr "" - -#: newspipe/templates/layout.html:123 newspipe/web/views/bookmark.py:92 -msgid "Recent bookmarks" -msgstr "" - -#: newspipe/templates/layout.html:126 newspipe/templates/popular.html:6 -msgid "Popular feeds" -msgstr "" - -#: newspipe/templates/login.html:6 newspipe/web/forms.py:135 -msgid "Log In" -msgstr "" - -#: newspipe/templates/login.html:10 newspipe/templates/signup.html:9 -msgid "Your nickname" -msgstr "" - -#: newspipe/templates/login.html:16 -msgid "Your Password" -msgstr "" - -#: newspipe/templates/login.html:22 newspipe/web/forms.py:78 -msgid "Sign up" -msgstr "" - -#: newspipe/templates/management.html:8 -msgid "Your subscriptions" -msgstr "" - -#: newspipe/templates/management.html:9 -msgid "You are subscribed to" -msgstr "" - -#: newspipe/templates/management.html:9 -msgid "feeds" -msgstr "" - -#: newspipe/templates/management.html:10 -msgid "articles are stored in the database with" -msgstr "" - -#: newspipe/templates/management.html:10 -msgid "unread articles" -msgstr "" - -#: newspipe/templates/management.html:11 newspipe/templates/management.html:16 -msgid "You have" -msgstr "" - -#: newspipe/templates/management.html:11 -msgid "categories" -msgstr "" - -#: newspipe/templates/management.html:12 -msgid "You are going to delete old articles." -msgstr "" - -#: newspipe/templates/management.html:12 -msgid "Delete articles older than 10 weeks" -msgstr "" - -#: newspipe/templates/management.html:15 -msgid "Your bookmarks" -msgstr "" - -#: newspipe/templates/management.html:16 -msgid "bookmarks" -msgstr "" - -#: newspipe/templates/management.html:17 -msgid "You are going to delete all bookmarks." -msgstr "" - -#: newspipe/templates/management.html:17 -msgid "Delete all bookmarks" -msgstr "" - -#: newspipe/templates/management.html:38 newspipe/templates/management.html:59 -msgid "Import" -msgstr "" - -#: newspipe/templates/management.html:39 -msgid "Import a Newspipe account (*.json)." -msgstr "" - -#: newspipe/templates/management.html:46 newspipe/templates/management.html:48 -#: newspipe/templates/management.html:67 newspipe/templates/management.html:84 -msgid "Export" -msgstr "" - -#: newspipe/templates/management.html:47 -msgid "Export your newspipe account to JSON." -msgstr "" - -#: newspipe/templates/management.html:60 -msgid "Import feeds from OPML (*.xml or *.opml)." -msgstr "" - -#: newspipe/templates/management.html:68 -msgid "Export feeds to OPML." -msgstr "" - -#: newspipe/templates/management.html:93 -msgid "Export your bookmarks to JSON" -msgstr "" - -#: newspipe/templates/popular.html:18 -msgid "add this feed" -msgstr "" - -#: newspipe/templates/profile.html:4 -msgid "Your Profile" -msgstr "" - -#: newspipe/templates/admin/dashboard.html:13 newspipe/templates/profile.html:7 -#: newspipe/templates/profile_public.html:9 -msgid "Member since" -msgstr "" - -#: newspipe/templates/admin/dashboard.html:14 newspipe/templates/profile.html:8 -#: newspipe/templates/profile_public.html:13 -msgid "Last seen" -msgstr "" - -#: newspipe/templates/profile.html:45 -#, python-format -msgid "Your profile will be available here." -msgstr "" - -#: newspipe/templates/profile.html:49 -msgid "Uncheck if you are using your own crawler." -msgstr "" - -#: newspipe/templates/profile.html:64 -msgid "You are going to delete your account." -msgstr "" - -#: newspipe/templates/profile.html:64 -msgid "Delete your account" -msgstr "" - -#: newspipe/templates/profile_public.html:18 newspipe/web/forms.py:199 -msgid "Webpage" -msgstr "" - -#: newspipe/templates/profile_public.html:24 newspipe/web/forms.py:200 -msgid "Twitter" -msgstr "" - -#: newspipe/templates/signup.html:10 -msgid "Letters, numbers, dots and underscores only." -msgstr "" - -#: newspipe/templates/signup.html:13 -msgid "Your email" -msgstr "" - -#: newspipe/templates/signup.html:14 -msgid "Only for account activation. Your email won't be stored." -msgstr "" - -#: newspipe/templates/signup.html:17 -msgid "Your password" -msgstr "" - -#: newspipe/templates/signup.html:18 -msgid "Minimum 6 characters." -msgstr "" - -#: newspipe/templates/user_stream.html:49 -msgid "Published at" -msgstr "" - -#: newspipe/templates/admin/dashboard.html:7 -msgid "Registered users" -msgstr "" - -#: newspipe/templates/admin/dashboard.html:12 newspipe/web/forms.py:57 -#: newspipe/web/forms.py:166 newspipe/web/forms.py:192 -msgid "Nickname" -msgstr "" - -#: newspipe/templates/admin/dashboard.html:33 -msgid "Edit this user" -msgstr "" - -#: newspipe/templates/admin/dashboard.html:37 -msgid "Disable this account" -msgstr "" - -#: newspipe/templates/admin/dashboard.html:39 -msgid "Enable this account" -msgstr "" - -#: newspipe/templates/admin/dashboard.html:42 -msgid "Delete this user" -msgstr "" - -#: newspipe/templates/admin/dashboard.html:42 -msgid "You are going to delete this account." -msgstr "" - -#: newspipe/templates/admin/dashboard.html:49 newspipe/web/views/admin.py:44 -msgid "Add a new user" -msgstr "" - -#: newspipe/web/forms.py:58 newspipe/web/forms.py:125 newspipe/web/forms.py:167 -#: newspipe/web/forms.py:193 -msgid "Please enter your nickname." -msgstr "" - -#: newspipe/web/forms.py:61 -msgid "Email" -msgstr "" - -#: newspipe/web/forms.py:65 -msgid "" -"Please enter your email address (only for account activation, won't be " -"stored)." -msgstr "" - -#: newspipe/web/forms.py:72 newspipe/web/forms.py:129 newspipe/web/forms.py:169 -#: newspipe/web/forms.py:195 -msgid "Password" -msgstr "" - -#: newspipe/web/forms.py:74 newspipe/web/forms.py:131 -msgid "Please enter a password." -msgstr "" - -#: newspipe/web/forms.py:88 newspipe/web/forms.py:177 newspipe/web/forms.py:213 -msgid "" -"This nickname has invalid characters. Please use letters, numbers, dots " -"and underscores only." -msgstr "" - -#: newspipe/web/forms.py:170 newspipe/web/forms.py:197 -msgid "Automatic crawling" -msgstr "" - -#: newspipe/web/forms.py:171 newspipe/web/forms.py:202 -#: newspipe/web/forms.py:231 newspipe/web/forms.py:244 -#: newspipe/web/forms.py:258 -msgid "Save" -msgstr "" - -#: newspipe/web/forms.py:196 -msgid "Password Confirmation" -msgstr "" - -#: newspipe/web/forms.py:198 -msgid "Bio" -msgstr "" - -#: newspipe/web/forms.py:201 -msgid "Public profile" -msgstr "" - -#: newspipe/web/forms.py:207 -msgid "Passwords aren't the same." -msgstr "" - -#: newspipe/web/forms.py:226 -msgid "Feed link" -msgstr "" - -#: newspipe/web/forms.py:227 -msgid "Please enter the URL." -msgstr "" - -#: newspipe/web/forms.py:229 -msgid "Site link" -msgstr "" - -#: newspipe/web/forms.py:230 -msgid "Check for updates" -msgstr "" - -#: newspipe/web/forms.py:233 -msgid "Category of the feed" -msgstr "" - -#: newspipe/web/forms.py:235 -msgid "Private" -msgstr "" - -#: newspipe/web/forms.py:249 -msgid "URL" -msgstr "" - -#: newspipe/web/forms.py:249 -msgid "Please enter an URL." -msgstr "" - -#: newspipe/web/forms.py:253 -msgid "Description" -msgstr "" - -#: newspipe/web/forms.py:255 -msgid "Tags" -msgstr "" - -#: newspipe/web/forms.py:256 -msgid "To read" -msgstr "" - -#: newspipe/web/forms.py:257 -msgid "Shared" -msgstr "" - -#: newspipe/web/forms.py:263 -msgid "Subject" -msgstr "" - -#: newspipe/web/forms.py:264 -msgid "Please enter a subject." -msgstr "" - -#: newspipe/web/forms.py:267 -msgid "Message" -msgstr "" - -#: newspipe/web/forms.py:268 -msgid "Please enter a content." -msgstr "" - -#: newspipe/web/forms.py:270 -msgid "Send" -msgstr "" - -#: newspipe/web/views/admin.py:41 -#, python-format -msgid "Edit the user %(nick)s" -msgstr "" - -#: newspipe/web/views/admin.py:63 -msgid "Some errors were found" -msgstr "" - -#: newspipe/web/views/admin.py:78 newspipe/web/views/user.py:184 -#, python-format -msgid "User %(nick)s successfully updated" -msgstr "" - -#: newspipe/web/views/admin.py:90 -#, python-format -msgid "User %(nick)s successfully created" -msgstr "" - -#: newspipe/web/views/admin.py:105 -#, python-format -msgid "User %(nick)s successfully deleted" -msgstr "" - -#: newspipe/web/views/admin.py:109 -#, python-format -msgid "An error occurred while trying to delete a user: %(error)s" -msgstr "" - -#: newspipe/web/views/admin.py:130 -msgid "This user does not exist." -msgstr "" - -#: newspipe/web/views/admin.py:135 -#, python-format -msgid "User %(nickname)s successfully %(is_active)s" -msgstr "" - -#: newspipe/web/views/article.py:87 -#, python-format -msgid "Article %(article_title)s deleted" -msgstr "" - -#: newspipe/web/views/article.py:146 -#, python-format -msgid "%(count)d articles deleted" -msgstr "" - -#: newspipe/web/views/article.py:160 -msgid "Error when exporting articles." -msgstr "" - -#: newspipe/web/views/bookmark.py:137 -msgid "Edit bookmark" -msgstr "" - -#: newspipe/web/views/bookmark.py:184 -msgid "Bookmark successfully updated." -msgstr "" - -#: newspipe/web/views/bookmark.py:197 newspipe/web/views/bookmark.py:254 -msgid "Bookmark successfully created." -msgstr "" - -#: newspipe/web/views/bookmark.py:207 -#, python-format -msgid "Bookmark %(bookmark_name)s successfully deleted." -msgstr "" - -#: newspipe/web/views/bookmark.py:222 -msgid "Bookmarks successfully deleted." -msgstr "" - -#: newspipe/web/views/bookmark.py:232 -msgid "Couldn't add bookmark: url missing." -msgstr "" - -#: newspipe/web/views/bookmark.py:242 -msgid "Couldn't add bookmark: bookmark already exists." -msgstr "" - -#: newspipe/web/views/bookmark.py:267 -#, python-format -msgid "%(nb_bookmarks)s bookmarks successfully imported." -msgstr "" - -#: newspipe/web/views/bookmark.py:274 -msgid "Error when importing bookmarks." -msgstr "" - -#: newspipe/web/views/category.py:34 -msgid "Add a category" -msgstr "" - -#: newspipe/web/views/category.py:44 -msgid "Edit category" -msgstr "" - -#: newspipe/web/views/category.py:62 -#, python-format -msgid "Category %(category_name)s successfully deleted." -msgstr "" - -#: newspipe/web/views/category.py:82 -msgid "Couldn't add category: already exists." -msgstr "" - -#: newspipe/web/views/category.py:90 -#, python-format -msgid "Category %(cat_name)r successfully updated." -msgstr "" - -#: newspipe/web/views/category.py:102 -#, python-format -msgid "Category %(category_name)r successfully created." -msgstr "" - -#: newspipe/web/views/feed.py:126 -#, python-format -msgid "Feed %(feed_title)s successfully deleted." -msgstr "" - -#: newspipe/web/views/feed.py:139 newspipe/web/views/feed.py:271 -#, python-format -msgid "Feed %(feed_title)r successfully updated." -msgstr "" - -#: newspipe/web/views/feed.py:151 -msgid "Couldn't add feed: url missing." -msgstr "" - -#: newspipe/web/views/feed.py:156 newspipe/web/views/feed.py:247 -msgid "Couldn't add feed: feed already exists." -msgstr "" - -#: newspipe/web/views/feed.py:163 -msgid "Impossible to connect to the address: {}." -msgstr "" - -#: newspipe/web/views/feed.py:172 -msgid "" -"Couldn't find a feed url, you'll need to find a Atom or RSS link manually" -" and reactivate this feed" -msgstr "" - -#: newspipe/web/views/feed.py:179 -msgid "Feed was successfully created." -msgstr "" - -#: newspipe/web/views/feed.py:182 newspipe/web/views/feed.py:289 -msgid "Downloading articles for the new feed..." -msgstr "" - -#: newspipe/web/views/feed.py:200 -msgid "Feed successfully updated." -msgstr "" - -#: newspipe/web/views/feed.py:209 -msgid "Add a feed" -msgstr "" - -#: newspipe/web/views/feed.py:221 -msgid "Edit feed" -msgstr "" - -#: newspipe/web/views/feed.py:283 -#, python-format -msgid "Feed %(feed_title)r successfully created." -msgstr "" - -#: newspipe/web/views/feed.py:313 -msgid "No duplicates in the feed \"{}\"." -msgstr "" - -#: newspipe/web/views/home.py:203 newspipe/web/views/user.py:116 -msgid "Downloading articles..." -msgstr "" - -#: newspipe/web/views/home.py:206 -msgid "" -"The manual retrieving of news is only available for administrator, on the" -" Heroku platform." -msgstr "" - -#: newspipe/web/views/session_mgmt.py:37 -msgid "Please log in to access this page." -msgstr "" - -#: newspipe/web/views/session_mgmt.py:101 -msgid "Self-registration is disabled." -msgstr "" - -#: newspipe/web/views/session_mgmt.py:118 -#, python-format -msgid "Problem while sending activation email: %(error)s" -msgstr "" - -#: newspipe/web/views/session_mgmt.py:126 -msgid "Your account has been created. Check your mail to confirm it." -msgstr "" - -#: newspipe/web/views/user.py:33 newspipe/web/views/user.py:58 -msgid "You must set your profile to public." -msgstr "" - -#: newspipe/web/views/user.py:109 newspipe/web/views/user.py:123 -#: newspipe/web/views/user.py:131 -msgid "File not allowed." -msgstr "" - -#: newspipe/web/views/user.py:115 -msgid "feeds imported." -msgstr "" - -#: newspipe/web/views/user.py:118 -msgid "Impossible to import the new feeds." -msgstr "" - -#: newspipe/web/views/user.py:127 -msgid "Account imported." -msgstr "" - -#: newspipe/web/views/user.py:129 -msgid "Impossible to import the account." -msgstr "" - -#: newspipe/web/views/user.py:177 -#, python-format -msgid "Problem while updating your profile: %(error)s" -msgstr "" - -#: newspipe/web/views/user.py:203 -msgid "Your account has been deleted." -msgstr "" - -#: newspipe/web/views/user.py:220 -msgid "Your account has been confirmed." -msgstr "" - -#: newspipe/web/views/user.py:222 -msgid "Impossible to confirm this account." -msgstr "" - -#: newspipe/web/views/views.py:22 -msgid "Authentication required." -msgstr "" - -#: newspipe/web/views/views.py:30 -msgid "Forbidden." -msgstr "" diff --git a/newspipe/web/forms.py b/newspipe/web/forms.py index 3eac8e6b..e804890c 100644 --- a/newspipe/web/forms.py +++ b/newspipe/web/forms.py @@ -259,7 +259,6 @@ class ProfileForm(FlaskForm): automatic_crawling = BooleanField(lazy_gettext("Automatic crawling"), default=True) bio = TextAreaField(lazy_gettext("Bio")) webpage = URLField(lazy_gettext("Webpage")) - twitter = URLField(lazy_gettext("Twitter")) is_public_profile = BooleanField(lazy_gettext("Public profile"), default=True) submit = SubmitField(lazy_gettext("Save")) diff --git a/newspipe/web/views/user.py b/newspipe/web/views/user.py index 00615ba8..5f2240bc 100644 --- a/newspipe/web/views/user.py +++ b/newspipe/web/views/user.py @@ -177,7 +177,6 @@ def profile(): "is_public_profile": form.is_public_profile.data, "bio": form.bio.data, "webpage": form.webpage.data, - "twitter": form.twitter.data, }, ) except Exception as error: -- cgit