From d3ca747f2f317a901d6e5856e97d90957ba785b9 Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Mon, 15 Oct 2018 10:16:55 +0200 Subject: Updated some links --- src/conf/conf.cfg-sample | 2 +- src/crawler/default_crawler.py | 2 +- src/lib/data.py | 2 +- src/lib/misc_utils.py | 2 +- src/notifications/emails.py | 2 +- src/notifications/notifications.py | 2 +- src/runserver.py | 2 +- src/web/forms.py | 2 +- src/web/models/__init__.py | 2 +- src/web/models/article.py | 2 +- src/web/models/bookmark.py | 2 +- src/web/models/feed.py | 2 +- src/web/models/role.py | 2 +- src/web/models/user.py | 2 +- src/web/templates/about.html | 6 +- src/web/templates/about_more.html | 2 +- src/web/translations/fr/LC_MESSAGES/messages.mo | Bin 20667 -> 19672 bytes src/web/translations/fr/LC_MESSAGES/messages.po | 266 +++++++++++------------- src/web/translations/messages.pot | 194 ++++++++--------- src/web/views/api/v3/article.py | 2 +- src/web/views/api/v3/common.py | 2 +- src/web/views/api/v3/feed.py | 2 +- src/web/views/bookmark.py | 2 +- 23 files changed, 228 insertions(+), 276 deletions(-) (limited to 'src') diff --git a/src/conf/conf.cfg-sample b/src/conf/conf.cfg-sample index 160c4629..40938851 100644 --- a/src/conf/conf.cfg-sample +++ b/src/conf/conf.cfg-sample @@ -16,7 +16,7 @@ database_url = sqlite:///newspipe.db [crawler] crawling_method = default default_max_error = 6 -user_agent = Newspipe (https://github.com/newspipe/newspipe) +user_agent = Newspipe (https://gitlab.com/newspipe/newspipe) timeout = 30 resolv = true feed_refresh_interval = 120 diff --git a/src/crawler/default_crawler.py b/src/crawler/default_crawler.py index 853c1de7..80cee92f 100644 --- a/src/crawler/default_crawler.py +++ b/src/crawler/default_crawler.py @@ -4,7 +4,7 @@ # newspipe - A Web based news aggregator. # Copyright (C) 2010-2018 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/Newspipe/Newspipe +# For more information : https://gitlab.com/newspipe/newspipe # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/src/lib/data.py b/src/lib/data.py index e7c88055..067a0a04 100644 --- a/src/lib/data.py +++ b/src/lib/data.py @@ -4,7 +4,7 @@ # Newspipe - A Web based news aggregator. # Copyright (C) 2010-2018 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/newspipe/newspipe +# For more information : https://gitlab.com/newspipe/newspipe # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/src/lib/misc_utils.py b/src/lib/misc_utils.py index 578d3d24..8fb2d284 100755 --- a/src/lib/misc_utils.py +++ b/src/lib/misc_utils.py @@ -4,7 +4,7 @@ # Newspipe - A Web based news aggregator. # Copyright (C) 2010-2018 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/newspipe/newspipe +# For more information : https://gitlab.com/newspipe/newspipe # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/src/notifications/emails.py b/src/notifications/emails.py index e2c9f444..098c29bf 100644 --- a/src/notifications/emails.py +++ b/src/notifications/emails.py @@ -4,7 +4,7 @@ # Newspipe - A Web based news aggregator. # Copyright (C) 2010-2018 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/Newspipe/Newspipe +# For more information : https://gitlab.com/newspipe/newspipe # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/src/notifications/notifications.py b/src/notifications/notifications.py index 377eed5d..e775f4b9 100644 --- a/src/notifications/notifications.py +++ b/src/notifications/notifications.py @@ -4,7 +4,7 @@ # Newspipe - A Web based news aggregator. # Copyright (C) 2010-2018 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/Newspipe/Newspipe +# For more information : https://gitlab.com/newspipe/newspipe # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/src/runserver.py b/src/runserver.py index 7cbe4b23..ca71891d 100755 --- a/src/runserver.py +++ b/src/runserver.py @@ -4,7 +4,7 @@ # Newspipe - A Web based news aggregator. # Copyright (C) 2010-2018 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/Newspipe/Newspipe +# For more information : https://gitlab.com/newspipe/newspipe # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/src/web/forms.py b/src/web/forms.py index 73ad6e85..cc1fc787 100644 --- a/src/web/forms.py +++ b/src/web/forms.py @@ -4,7 +4,7 @@ # Newspipe - A Web based news aggregator. # Copyright (C) 2010-2018 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : http://github.com/Newspipe/Newspipe +# For more information : http://gitlab.com/newspipe/newspipe # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/web/models/__init__.py b/src/web/models/__init__.py index 5ce39115..91a2121e 100644 --- a/src/web/models/__init__.py +++ b/src/web/models/__init__.py @@ -4,7 +4,7 @@ # newspipe - A Web based news aggregator. # Copyright (C) 2010-2018 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/Newspipe/Newspipe +# For more information : https://gitlab.com/newspipe/newspipe # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/src/web/models/article.py b/src/web/models/article.py index 5ce43db8..9429b485 100644 --- a/src/web/models/article.py +++ b/src/web/models/article.py @@ -4,7 +4,7 @@ # Newspipe - A Web based news aggregator. # Copyright (C) 2010-2018 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/Newspipe/Newspipe +# For more information : https://gitlab.com/newspipe/newspipe # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/src/web/models/bookmark.py b/src/web/models/bookmark.py index c1204e9a..eb6b73e3 100644 --- a/src/web/models/bookmark.py +++ b/src/web/models/bookmark.py @@ -4,7 +4,7 @@ # Newspipe - A Web based news aggregator. # Copyright (C) 2010-2018 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/newspipe/newspipe +# For more information : https://gitlab.com/newspipe/newspipe # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/src/web/models/feed.py b/src/web/models/feed.py index b733cd58..fc0b64cb 100644 --- a/src/web/models/feed.py +++ b/src/web/models/feed.py @@ -4,7 +4,7 @@ # newspipe - A Web based news aggregator. # Copyright (C) 2010-2018 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/Newspipe/Newspipe +# For more information : https://gitlab.com/newspipe/newspipe # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/src/web/models/role.py b/src/web/models/role.py index 82601bbb..0a2ecd4a 100644 --- a/src/web/models/role.py +++ b/src/web/models/role.py @@ -4,7 +4,7 @@ # newspipe - A Web based news aggregator. # Copyright (C) 2010-2018 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/Newspipe/Newspipe +# For more information : https://gitlab.com/newspipe/newspipe # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/src/web/models/user.py b/src/web/models/user.py index e0f86328..66627777 100644 --- a/src/web/models/user.py +++ b/src/web/models/user.py @@ -4,7 +4,7 @@ # newspipe - A Web based news aggregator. # Copyright (C) 2010-2018 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/newspipe/newspipe +# For more information : https://gitlab.com/newspipe/newspipe # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/src/web/templates/about.html b/src/web/templates/about.html index 54deaf11..bed2d0d0 100644 --- a/src/web/templates/about.html +++ b/src/web/templates/about.html @@ -7,11 +7,11 @@ {{ _('Newspipe is a news aggregator platform.') }} {{ _('You can easily install Newspipe on your server.') }} {{ _('Alternatively, you can deploy your own copy using this button:') }}

- https://www.herokucdn.com/deploy/button.png

+ https://www.herokucdn.com/deploy/button.png

{{ _('This software is under AGPLv3 license. You are welcome to copy, modify or - redistribute the source code + redistribute the source code according to the Affero GPL license.') }}

-

{{ _('Found a bug? Report it here.') }}

+

{{ _('Found a bug? Report it here.') }}

{{ _('More information') }} {{ _('about this instance.') }}

diff --git a/src/web/templates/about_more.html b/src/web/templates/about_more.html index d530861f..136bd5b0 100644 --- a/src/web/templates/about_more.html +++ b/src/web/templates/about_more.html @@ -2,7 +2,7 @@ {% block content %}
    -
  • {{ _('Newspipe version') }}: {{newspipe_version}}
    • +
  • {{ _('Newspipe version') }}: {{newspipe_version}}
  • {{ _('Running on Heroku') }}: {{on_heroku}}
  • {{ _('Registration') }}: {{registration}}
  • {{ _('Python version') }}: {{python_version}}
    • diff --git a/src/web/translations/fr/LC_MESSAGES/messages.mo b/src/web/translations/fr/LC_MESSAGES/messages.mo index 2390da9c..87b48bb3 100644 Binary files a/src/web/translations/fr/LC_MESSAGES/messages.mo and b/src/web/translations/fr/LC_MESSAGES/messages.mo differ diff --git a/src/web/translations/fr/LC_MESSAGES/messages.po b/src/web/translations/fr/LC_MESSAGES/messages.po index 7895b0a7..be948d2e 100644 --- a/src/web/translations/fr/LC_MESSAGES/messages.po +++ b/src/web/translations/fr/LC_MESSAGES/messages.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2018-03-31 16:09+0200\n" -"PO-Revision-Date: 2018-03-31 16:10+0200\n" +"POT-Creation-Date: 2018-10-15 10:14+0200\n" +"PO-Revision-Date: 2018-10-15 10:14+0200\n" "Last-Translator: Cédric Bonhomme \n" "Language-Team: fr \n" "Language: fr\n" @@ -17,31 +17,34 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "Generated-By: Babel 1.3\n" -"X-Generator: Poedit 2.0.4\n" +"X-Generator: Poedit 2.0.6\n" -#: ../forms.py:46 ../forms.py:130 ../forms.py:154 +#: ../forms.py:46 ../forms.py:130 ../forms.py:151 #: ../templates/admin/dashboard.html:12 msgid "Nickname" msgstr "Pseudonyme" -#: ../forms.py:47 ../forms.py:131 ../forms.py:155 +#: ../forms.py:47 ../forms.py:96 ../forms.py:131 ../forms.py:152 msgid "Please enter your nickname." msgstr "S'il vous plaît, entrez votre pseudonyme." -#: ../forms.py:48 ../forms.py:132 ../forms.py:156 ../forms.py:230 -#: ../templates/admin/dashboard.html:13 +#: ../forms.py:48 msgid "Email" msgstr "Email" -#: ../forms.py:51 ../forms.py:233 -msgid "Please enter your email address." -msgstr "S'il vous plaît, entrez votre adresse email." +#: ../forms.py:51 +#, fuzzy +#| msgid "Please enter your email address or nickname." +msgid "" +"Please enter your email address (only for account activation, won't be " +"stored)." +msgstr "S'il vous plaît, entrez votre adresse email ou pseudo." -#: ../forms.py:52 ../forms.py:95 ../forms.py:135 ../forms.py:159 +#: ../forms.py:52 ../forms.py:97 ../forms.py:132 ../forms.py:153 msgid "Password" msgstr "Mot de passe" -#: ../forms.py:53 ../forms.py:96 +#: ../forms.py:53 ../forms.py:98 msgid "Please enter a password." msgstr "S'il vous plaît entrer un mot de passe." @@ -49,148 +52,128 @@ msgstr "S'il vous plaît entrer un mot de passe." msgid "Sign up" msgstr "S'inscrire" -#: ../forms.py:94 -msgid "Please enter your email address or nickname." -msgstr "S'il vous plaît, entrez votre adresse email ou pseudo." +#: ../forms.py:64 ../forms.py:140 ../forms.py:172 +msgid "" +"This nickname has invalid characters. Please use letters, numbers, dots and " +"underscores only." +msgstr "" +"Ce pseudonyme a des caractères non valides. Utilisez seulement des lettres, " +"des chiffres, des points et '_'." -#: ../forms.py:98 ../templates/login.html:5 +#: ../forms.py:100 ../templates/login.html:5 msgid "Log In" msgstr "Connexion" -#: ../forms.py:134 ../forms.py:158 -msgid "Please enter your email." -msgstr "S'il vous plaît, entrez votre email." - -#: ../forms.py:136 ../forms.py:161 +#: ../forms.py:133 ../forms.py:155 msgid "Automatic crawling" msgstr "Récupération automatique" -#: ../forms.py:138 ../forms.py:168 ../forms.py:191 ../forms.py:204 -#: ../forms.py:218 +#: ../forms.py:135 ../forms.py:162 ../forms.py:185 ../forms.py:198 +#: ../forms.py:212 msgid "Save" msgstr "Sauver" -#: ../forms.py:143 ../forms.py:178 -msgid "" -"This nickname has invalid characters. Please use letters, numbers, dots and " -"underscores only." -msgstr "" -"Ce pseudonyme a des caractères non valides. Utilisez seulement des lettres, " -"des chiffres, des points et '_'." - -#: ../forms.py:160 +#: ../forms.py:154 msgid "Password Confirmation" msgstr "Confirmation du mot de passe" -#: ../forms.py:163 +#: ../forms.py:157 msgid "Bio" msgstr "Bio" -#: ../forms.py:164 ../templates/profile_public.html:18 +#: ../forms.py:158 ../templates/profile_public.html:18 msgid "Webpage" msgstr "Page web" -#: ../forms.py:165 ../templates/profile_public.html:24 +#: ../forms.py:159 ../templates/profile_public.html:24 msgid "Twitter" msgstr "Twitter" -#: ../forms.py:166 +#: ../forms.py:160 msgid "Public profile" msgstr "Profil public" -#: ../forms.py:173 +#: ../forms.py:167 msgid "Passwords aren't the same." msgstr "Les mots de passe ne sont pas identiques." -#: ../forms.py:186 ../forms.py:211 ../templates/feed_list.html:8 +#: ../forms.py:180 ../forms.py:205 ../templates/feed_list.html:8 #: ../templates/feed_list_simple.html:7 msgid "Title" msgstr "Titre" -#: ../forms.py:187 +#: ../forms.py:181 msgid "Feed link" msgstr "Lien du flux" -#: ../forms.py:188 +#: ../forms.py:182 msgid "Please enter the URL." msgstr "S'il vous plaît, entrez une adresse." -#: ../forms.py:189 +#: ../forms.py:183 msgid "Site link" msgstr "Lien du site" -#: ../forms.py:190 +#: ../forms.py:184 msgid "Check for updates" msgstr "Vérifier les mises à jour" -#: ../forms.py:192 +#: ../forms.py:186 msgid "Category of the feed" msgstr "Catégorie du flux" -#: ../forms.py:194 +#: ../forms.py:188 msgid "Private" msgstr "Privé" -#: ../forms.py:203 ../templates/layout.html:87 +#: ../forms.py:197 ../templates/layout.html:87 msgid "Category name" msgstr "Nom de la catégorie" -#: ../forms.py:208 +#: ../forms.py:202 msgid "URL" msgstr "URL" -#: ../forms.py:210 +#: ../forms.py:204 msgid "Please enter an URL." msgstr "S'il vous plaît, entrez une adresse." -#: ../forms.py:213 +#: ../forms.py:207 msgid "Description" msgstr "Description" -#: ../forms.py:215 +#: ../forms.py:209 msgid "Tags" msgstr "Tags" -#: ../forms.py:216 +#: ../forms.py:210 msgid "To read" msgstr "À lire" -#: ../forms.py:217 +#: ../forms.py:211 msgid "Shared" msgstr "Partagé" -#: ../forms.py:222 +#: ../forms.py:216 msgid "Subject" msgstr "Objet" -#: ../forms.py:223 +#: ../forms.py:217 msgid "Please enter a subject." msgstr "S'il vous plaît entrer un objet." -#: ../forms.py:224 +#: ../forms.py:218 msgid "Message" msgstr "Message" -#: ../forms.py:225 +#: ../forms.py:219 msgid "Please enter a content." msgstr "S'il vous plaît entrer un contenu." -#: ../forms.py:226 +#: ../forms.py:220 msgid "Send" msgstr "Envoyer" -#: ../forms.py:234 -msgid "Recover" -msgstr "Récupérer" - -#: ../forms.py:244 -msgid "Account not confirmed." -msgstr "Compte non confirmé." - -#: ../forms.py:247 -msgid "Invalid email." -msgstr "Email invalide." - #: ../templates/about.html:5 ../templates/layout.html:113 #: ../templates/layout.html:125 msgid "About" @@ -217,22 +200,22 @@ msgstr "" #: ../templates/about.html:11 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 "" "Ce logiciel est sous licence AGPLv3. Vous êtes invité à copier, modifier ou " -"redistribuer le code " +"redistribuer le code " "source selon la licence Affero GPL." #: ../templates/about.html:14 msgid "" -"Found a bug? Report it here." msgstr "" -"Vous avez trouvé un bug? Signalez-le ici." #: ../templates/about.html:15 @@ -352,7 +335,7 @@ msgstr "Flux" msgid "Articles" msgstr "Articles" -#: ../templates/admin/dashboard.html:16 ../templates/categories.html:16 +#: ../templates/admin/dashboard.html:15 ../templates/categories.html:16 #: ../templates/feed_list.html:11 msgid "Actions" msgstr "Actions" @@ -669,18 +652,16 @@ msgstr "Marque-pages récents" msgid "Popular feeds" msgstr "Flux populaires" -#: ../templates/login.html:10 -msgid "Your email or nickname" +#: ../templates/login.html:10 ../templates/signup.html:8 +#, fuzzy +#| msgid "Your email or nickname" +msgid "Your nickname" msgstr "Votre email ou pseudo" #: ../templates/login.html:17 msgid "Your Password" msgstr "Votre mot de passe" -#: ../templates/login.html:28 -msgid "Forgot password" -msgstr "Mot de passe oublié" - #: ../templates/management.html:7 msgid "Your subscriptions" msgstr "Vos abonnements" @@ -769,44 +750,50 @@ msgstr "ajouter ce flux" msgid "Your Profile" msgstr "Votre profil" -#: ../templates/admin/dashboard.html:14 ../templates/profile.html:7 +#: ../templates/admin/dashboard.html:13 ../templates/profile.html:7 #: ../templates/profile_public.html:9 msgid "Member since" msgstr "Membre depuis le" -#: ../templates/admin/dashboard.html:15 ../templates/profile.html:8 +#: ../templates/admin/dashboard.html:14 ../templates/profile.html:8 #: ../templates/profile_public.html:13 msgid "Last seen" msgstr "Vue la dernière fois le" -#: ../templates/profile.html:47 +#: ../templates/profile.html:44 #, python-format msgid "Your profile will be available here." msgstr "Votre profil sera accessible ici." -#: ../templates/profile.html:51 +#: ../templates/profile.html:48 msgid "Uncheck if you are using your own crawler." msgstr "Décochez si vous utilisez votre propre crawler." -#: ../templates/profile.html:64 +#: ../templates/profile.html:61 msgid "You are going to delete your account." msgstr "Vous allez supprimer votre compte." -#: ../templates/profile.html:64 +#: ../templates/profile.html:61 msgid "Delete your account" msgstr "Supprimer votre compte" -#: ../templates/recover.html:5 -msgid "Recover your account" -msgstr "Récupérer votre compte" +#: ../templates/signup.html:9 +msgid "Letters, numbers, dots and underscores only." +msgstr "Lettres, chiffres, points et '_' seulement." -#: ../templates/recover.html:12 +#: ../templates/signup.html:12 msgid "Your email" msgstr "Votre email" -#: ../templates/signup.html:10 -msgid "Letters, numbers, dots and underscores only." -msgstr "Lettres, chiffres, points et '_' seulement." +#: ../templates/signup.html:13 +msgid "Only for account activation. Your email won't be stored." +msgstr "" + +#: ../templates/signup.html:16 +#, fuzzy +#| msgid "Your Password" +msgid "Your password" +msgstr "Votre mot de passe" #: ../templates/signup.html:17 msgid "Minimum 6 characters." @@ -816,34 +803,30 @@ msgstr "Minimum 6 caractères." msgid "Registered users" msgstr "Utilisateurs enregistrés" -#: ../templates/admin/dashboard.html:35 +#: ../templates/admin/dashboard.html:33 msgid "Edit this user" msgstr "Éditer cet utilisateur" -#: ../templates/admin/dashboard.html:39 +#: ../templates/admin/dashboard.html:37 msgid "Disable this account" msgstr "Désactiver ce comptes" -#: ../templates/admin/dashboard.html:41 +#: ../templates/admin/dashboard.html:39 msgid "Enable this account" msgstr "Activer ce compte" -#: ../templates/admin/dashboard.html:44 +#: ../templates/admin/dashboard.html:42 msgid "Delete this user" msgstr "Supprimer cet utilisateur" -#: ../templates/admin/dashboard.html:44 +#: ../templates/admin/dashboard.html:42 msgid "You are going to delete this account." msgstr "Vous allez supprimer ce compte." -#: ../templates/admin/dashboard.html:51 ../views/admin.py:40 +#: ../templates/admin/dashboard.html:49 ../views/admin.py:40 msgid "Add a new user" msgstr "Ajouter un nouvel utilisateur" -#: ../templates/admin/dashboard.html:52 -msgid "Send notification messages" -msgstr "Envoyer des messages de notification" - #: ../views/admin.py:37 #, python-format msgid "Edit the user %(nick)s" @@ -853,32 +836,32 @@ msgstr "Éditer l'utilisateur %(nick)s" msgid "Some errors were found" msgstr "Des erreurs ont été trouvées" -#: ../views/admin.py:68 ../views/user.py:126 +#: ../views/admin.py:67 ../views/user.py:125 #, python-format msgid "User %(nick)s successfully updated" msgstr "Utilisateur %(nick)s mis à jour avec succès." -#: ../views/admin.py:78 +#: ../views/admin.py:76 #, python-format msgid "User %(nick)s successfully created" msgstr "Utilisateur %(nick)s créé avec succès." -#: ../views/admin.py:92 +#: ../views/admin.py:90 #, python-format msgid "User %(nick)s successfully deleted" msgstr "Utilisateur %(nick)s supprimé avec succès." -#: ../views/admin.py:96 +#: ../views/admin.py:94 #, python-format msgid "An error occurred while trying to delete a user: %(error)s" msgstr "" "Une erreur est apparue lors de la suppression de l'utilisateur: %(error)s" -#: ../views/admin.py:114 +#: ../views/admin.py:112 msgid "This user does not exist." msgstr "Cet utilisateur n'existe pas." -#: ../views/admin.py:119 +#: ../views/admin.py:117 #, python-format msgid "User %(nickname)s successfully %(is_active)s" msgstr "Utilisateur %(nickname)s %(is_active)s avec succès." @@ -1049,12 +1032,12 @@ msgstr "S'il vous plaît connectez vous pour accéder à cette page." msgid "Self-registration is disabled." msgstr "L'auto-enregistrement est désactivé." -#: ../views/session_mgmt.py:105 +#: ../views/session_mgmt.py:104 #, python-format msgid "Problem while sending activation email: %(error)s" msgstr "Problème lors de l'envoi d'email d'activation: %(error)s" -#: ../views/session_mgmt.py:109 +#: ../views/session_mgmt.py:108 msgid "Your account has been created. Check your mail to confirm it." msgstr "Votre compte a été créé. Vérifiez votre courrier pour le confirmer." @@ -1082,32 +1065,23 @@ msgstr "Compte importé." msgid "Impossible to import the account." msgstr "Impossible d'importer le compte." -#: ../views/user.py:123 +#: ../views/user.py:122 #, python-format msgid "Problem while updating your profile: %(error)s" msgstr "Problème lors de la mise à jour de votre profil: %(error)s" -#: ../views/user.py:144 +#: ../views/user.py:143 msgid "Your account has been deleted." msgstr "Votre compte a été supprimé." -#: ../views/user.py:161 +#: ../views/user.py:160 msgid "Your account has been confirmed." msgstr "Votre compte a été confirmé." -#: ../views/user.py:163 +#: ../views/user.py:162 msgid "Impossible to confirm this account." msgstr "Impossible de confirmer ce compte." -#: ../views/user.py:188 -msgid "New password sent to your address." -msgstr "Nouveau mot de passe envoyé à votre adresse." - -#: ../views/user.py:190 -#, python-format -msgid "Problem while sending your new password: %(error)s" -msgstr "Problème lors de l'envoi de votre nouveau mot de passe: %(error)s" - #: ../views/views.py:23 msgid "Authentication required." msgstr "Authentification requise." @@ -1116,25 +1090,35 @@ msgstr "Authentification requise." msgid "Forbidden." msgstr "Interdit." -#~ 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 "" -#~ "Ce logiciel est sous licence AGPLv3. Vous êtes invité à copier, modifier " -#~ "ou redistribuer le code " -#~ "source selon la licence Affero GPL." +#~ msgid "Please enter your email address." +#~ msgstr "S'il vous plaît, entrez votre adresse email." -#~ msgid "" -#~ "Found a bug? Report it here." -#~ msgstr "" -#~ "Vous avez trouvé un bug? Signalez-le ici." +#~ 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)" diff --git a/src/web/translations/messages.pot b/src/web/translations/messages.pot index df66cda2..871417c8 100644 --- a/src/web/translations/messages.pot +++ b/src/web/translations/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2018-03-31 16:09+0200\n" +"POT-Creation-Date: 2018-10-15 10:14+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,29 +17,30 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.5.3\n" -#: ../forms.py:46 ../forms.py:130 ../forms.py:154 +#: ../forms.py:46 ../forms.py:130 ../forms.py:151 #: ../templates/admin/dashboard.html:12 msgid "Nickname" msgstr "" -#: ../forms.py:47 ../forms.py:131 ../forms.py:155 +#: ../forms.py:47 ../forms.py:96 ../forms.py:131 ../forms.py:152 msgid "Please enter your nickname." msgstr "" -#: ../forms.py:48 ../forms.py:132 ../forms.py:156 ../forms.py:230 -#: ../templates/admin/dashboard.html:13 +#: ../forms.py:48 msgid "Email" msgstr "" -#: ../forms.py:51 ../forms.py:233 -msgid "Please enter your email address." +#: ../forms.py:51 +msgid "" +"Please enter your email address (only for account activation, won't be " +"stored)." msgstr "" -#: ../forms.py:52 ../forms.py:95 ../forms.py:135 ../forms.py:159 +#: ../forms.py:52 ../forms.py:97 ../forms.py:132 ../forms.py:153 msgid "Password" msgstr "" -#: ../forms.py:53 ../forms.py:96 +#: ../forms.py:53 ../forms.py:98 msgid "Please enter a password." msgstr "" @@ -47,146 +48,126 @@ msgstr "" msgid "Sign up" msgstr "" -#: ../forms.py:94 -msgid "Please enter your email address or nickname." +#: ../forms.py:64 ../forms.py:140 ../forms.py:172 +msgid "" +"This nickname has invalid characters. Please use letters, numbers, dots " +"and underscores only." msgstr "" -#: ../forms.py:98 ../templates/login.html:5 +#: ../forms.py:100 ../templates/login.html:5 msgid "Log In" msgstr "" -#: ../forms.py:134 ../forms.py:158 -msgid "Please enter your email." -msgstr "" - -#: ../forms.py:136 ../forms.py:161 +#: ../forms.py:133 ../forms.py:155 msgid "Automatic crawling" msgstr "" -#: ../forms.py:138 ../forms.py:168 ../forms.py:191 ../forms.py:204 -#: ../forms.py:218 +#: ../forms.py:135 ../forms.py:162 ../forms.py:185 ../forms.py:198 +#: ../forms.py:212 msgid "Save" msgstr "" -#: ../forms.py:143 ../forms.py:178 -msgid "" -"This nickname has invalid characters. Please use letters, numbers, dots " -"and underscores only." -msgstr "" - -#: ../forms.py:160 +#: ../forms.py:154 msgid "Password Confirmation" msgstr "" -#: ../forms.py:163 +#: ../forms.py:157 msgid "Bio" msgstr "" -#: ../forms.py:164 ../templates/profile_public.html:18 +#: ../forms.py:158 ../templates/profile_public.html:18 msgid "Webpage" msgstr "" -#: ../forms.py:165 ../templates/profile_public.html:24 +#: ../forms.py:159 ../templates/profile_public.html:24 msgid "Twitter" msgstr "" -#: ../forms.py:166 +#: ../forms.py:160 msgid "Public profile" msgstr "" -#: ../forms.py:173 +#: ../forms.py:167 msgid "Passwords aren't the same." msgstr "" -#: ../forms.py:186 ../forms.py:211 ../templates/feed_list.html:8 +#: ../forms.py:180 ../forms.py:205 ../templates/feed_list.html:8 #: ../templates/feed_list_simple.html:7 msgid "Title" msgstr "" -#: ../forms.py:187 +#: ../forms.py:181 msgid "Feed link" msgstr "" -#: ../forms.py:188 +#: ../forms.py:182 msgid "Please enter the URL." msgstr "" -#: ../forms.py:189 +#: ../forms.py:183 msgid "Site link" msgstr "" -#: ../forms.py:190 +#: ../forms.py:184 msgid "Check for updates" msgstr "" -#: ../forms.py:192 +#: ../forms.py:186 msgid "Category of the feed" msgstr "" -#: ../forms.py:194 +#: ../forms.py:188 msgid "Private" msgstr "" -#: ../forms.py:203 ../templates/layout.html:87 +#: ../forms.py:197 ../templates/layout.html:87 msgid "Category name" msgstr "" -#: ../forms.py:208 +#: ../forms.py:202 msgid "URL" msgstr "" -#: ../forms.py:210 +#: ../forms.py:204 msgid "Please enter an URL." msgstr "" -#: ../forms.py:213 +#: ../forms.py:207 msgid "Description" msgstr "" -#: ../forms.py:215 +#: ../forms.py:209 msgid "Tags" msgstr "" -#: ../forms.py:216 +#: ../forms.py:210 msgid "To read" msgstr "" -#: ../forms.py:217 +#: ../forms.py:211 msgid "Shared" msgstr "" -#: ../forms.py:222 +#: ../forms.py:216 msgid "Subject" msgstr "" -#: ../forms.py:223 +#: ../forms.py:217 msgid "Please enter a subject." msgstr "" -#: ../forms.py:224 +#: ../forms.py:218 msgid "Message" msgstr "" -#: ../forms.py:225 +#: ../forms.py:219 msgid "Please enter a content." msgstr "" -#: ../forms.py:226 +#: ../forms.py:220 msgid "Send" msgstr "" -#: ../forms.py:234 -msgid "Recover" -msgstr "" - -#: ../forms.py:244 -msgid "Account not confirmed." -msgstr "" - -#: ../forms.py:247 -msgid "Invalid email." -msgstr "" - #: ../templates/about.html:5 ../templates/layout.html:113 #: ../templates/layout.html:125 msgid "About" @@ -212,7 +193,7 @@ msgid "" "This software is under AGPLv3 license. You are welcome to copy, modify or" "\n" " redistribute the source code\n" +"href=\"https://gitlab.com/newspipe/newspipe\">source code\n" " according to the Affero GPL " "license." @@ -221,7 +202,7 @@ msgstr "" #: ../templates/about.html:14 msgid "" "Found a bug? Report it here." +"href=\"https://gitlab.com/newspipe/newspipe/issues\">here." msgstr "" #: ../templates/about.html:15 @@ -334,7 +315,7 @@ msgstr "" msgid "Articles" msgstr "" -#: ../templates/admin/dashboard.html:16 ../templates/categories.html:16 +#: ../templates/admin/dashboard.html:15 ../templates/categories.html:16 #: ../templates/feed_list.html:11 msgid "Actions" msgstr "" @@ -638,18 +619,14 @@ msgstr "" msgid "Popular feeds" msgstr "" -#: ../templates/login.html:10 -msgid "Your email or nickname" +#: ../templates/login.html:10 ../templates/signup.html:8 +msgid "Your nickname" msgstr "" #: ../templates/login.html:17 msgid "Your Password" msgstr "" -#: ../templates/login.html:28 -msgid "Forgot password" -msgstr "" - #: ../templates/management.html:7 msgid "Your subscriptions" msgstr "" @@ -738,43 +715,47 @@ msgstr "" msgid "Your Profile" msgstr "" -#: ../templates/admin/dashboard.html:14 ../templates/profile.html:7 +#: ../templates/admin/dashboard.html:13 ../templates/profile.html:7 #: ../templates/profile_public.html:9 msgid "Member since" msgstr "" -#: ../templates/admin/dashboard.html:15 ../templates/profile.html:8 +#: ../templates/admin/dashboard.html:14 ../templates/profile.html:8 #: ../templates/profile_public.html:13 msgid "Last seen" msgstr "" -#: ../templates/profile.html:47 +#: ../templates/profile.html:44 #, python-format msgid "Your profile will be available here." msgstr "" -#: ../templates/profile.html:51 +#: ../templates/profile.html:48 msgid "Uncheck if you are using your own crawler." msgstr "" -#: ../templates/profile.html:64 +#: ../templates/profile.html:61 msgid "You are going to delete your account." msgstr "" -#: ../templates/profile.html:64 +#: ../templates/profile.html:61 msgid "Delete your account" msgstr "" -#: ../templates/recover.html:5 -msgid "Recover your account" +#: ../templates/signup.html:9 +msgid "Letters, numbers, dots and underscores only." msgstr "" -#: ../templates/recover.html:12 +#: ../templates/signup.html:12 msgid "Your email" msgstr "" -#: ../templates/signup.html:10 -msgid "Letters, numbers, dots and underscores only." +#: ../templates/signup.html:13 +msgid "Only for account activation. Your email won't be stored." +msgstr "" + +#: ../templates/signup.html:16 +msgid "Your password" msgstr "" #: ../templates/signup.html:17 @@ -785,34 +766,30 @@ msgstr "" msgid "Registered users" msgstr "" -#: ../templates/admin/dashboard.html:35 +#: ../templates/admin/dashboard.html:33 msgid "Edit this user" msgstr "" -#: ../templates/admin/dashboard.html:39 +#: ../templates/admin/dashboard.html:37 msgid "Disable this account" msgstr "" -#: ../templates/admin/dashboard.html:41 +#: ../templates/admin/dashboard.html:39 msgid "Enable this account" msgstr "" -#: ../templates/admin/dashboard.html:44 +#: ../templates/admin/dashboard.html:42 msgid "Delete this user" msgstr "" -#: ../templates/admin/dashboard.html:44 +#: ../templates/admin/dashboard.html:42 msgid "You are going to delete this account." msgstr "" -#: ../templates/admin/dashboard.html:51 ../views/admin.py:40 +#: ../templates/admin/dashboard.html:49 ../views/admin.py:40 msgid "Add a new user" msgstr "" -#: ../templates/admin/dashboard.html:52 -msgid "Send notification messages" -msgstr "" - #: ../views/admin.py:37 #, python-format msgid "Edit the user %(nick)s" @@ -822,31 +799,31 @@ msgstr "" msgid "Some errors were found" msgstr "" -#: ../views/admin.py:68 ../views/user.py:126 +#: ../views/admin.py:67 ../views/user.py:125 #, python-format msgid "User %(nick)s successfully updated" msgstr "" -#: ../views/admin.py:78 +#: ../views/admin.py:76 #, python-format msgid "User %(nick)s successfully created" msgstr "" -#: ../views/admin.py:92 +#: ../views/admin.py:90 #, python-format msgid "User %(nick)s successfully deleted" msgstr "" -#: ../views/admin.py:96 +#: ../views/admin.py:94 #, python-format msgid "An error occurred while trying to delete a user: %(error)s" msgstr "" -#: ../views/admin.py:114 +#: ../views/admin.py:112 msgid "This user does not exist." msgstr "" -#: ../views/admin.py:119 +#: ../views/admin.py:117 #, python-format msgid "User %(nickname)s successfully %(is_active)s" msgstr "" @@ -1013,12 +990,12 @@ msgstr "" msgid "Self-registration is disabled." msgstr "" -#: ../views/session_mgmt.py:105 +#: ../views/session_mgmt.py:104 #, python-format msgid "Problem while sending activation email: %(error)s" msgstr "" -#: ../views/session_mgmt.py:109 +#: ../views/session_mgmt.py:108 msgid "Your account has been created. Check your mail to confirm it." msgstr "" @@ -1046,32 +1023,23 @@ msgstr "" msgid "Impossible to import the account." msgstr "" -#: ../views/user.py:123 +#: ../views/user.py:122 #, python-format msgid "Problem while updating your profile: %(error)s" msgstr "" -#: ../views/user.py:144 +#: ../views/user.py:143 msgid "Your account has been deleted." msgstr "" -#: ../views/user.py:161 +#: ../views/user.py:160 msgid "Your account has been confirmed." msgstr "" -#: ../views/user.py:163 +#: ../views/user.py:162 msgid "Impossible to confirm this account." msgstr "" -#: ../views/user.py:188 -msgid "New password sent to your address." -msgstr "" - -#: ../views/user.py:190 -#, python-format -msgid "Problem while sending your new password: %(error)s" -msgstr "" - #: ../views/views.py:23 msgid "Authentication required." msgstr "" diff --git a/src/web/views/api/v3/article.py b/src/web/views/api/v3/article.py index e2f10979..4cf35648 100644 --- a/src/web/views/api/v3/article.py +++ b/src/web/views/api/v3/article.py @@ -4,7 +4,7 @@ # Newspipe - A Web based news aggregator. # Copyright (C) 2010-2018 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : http://github.com/Newspipe/Newspipe +# For more information : http://gitlab.com/newspipe/newspipe # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/web/views/api/v3/common.py b/src/web/views/api/v3/common.py index f6899b75..d5e94a3f 100644 --- a/src/web/views/api/v3/common.py +++ b/src/web/views/api/v3/common.py @@ -4,7 +4,7 @@ # Newspipe - A Web based news aggregator. # Copyright (C) 2010-2018 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : http://github.com/Newspipe/Newspipe +# For more information : http://gitlab.com/newspipe/newspipe # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/web/views/api/v3/feed.py b/src/web/views/api/v3/feed.py index 64a03e84..2cbbafd9 100644 --- a/src/web/views/api/v3/feed.py +++ b/src/web/views/api/v3/feed.py @@ -4,7 +4,7 @@ # Newspipe - A Web based news aggregator. # Copyright (C) 2010-2018 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : http://github.com/Newspipe/Newspipe +# For more information : http://gitlab.com/newspipe/newspipe # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/web/views/bookmark.py b/src/web/views/bookmark.py index 966ca4b2..21d832d2 100644 --- a/src/web/views/bookmark.py +++ b/src/web/views/bookmark.py @@ -4,7 +4,7 @@ # Newspipe - A Web based news aggregator. # Copyright (C) 2010-2017 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/newspipe/newspipe +# For more information : https://gitlab.com/newspipe/newspipe # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as -- cgit From e5b8e9161f3d2552749fd19355b6a621cce441c6 Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Wed, 24 Oct 2018 10:09:51 +0200 Subject: Fixed a bug when an administrator wanted to edit a user. --- src/web/views/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/web/views/admin.py b/src/web/views/admin.py index 07c4f974..2e97ff36 100644 --- a/src/web/views/admin.py +++ b/src/web/views/admin.py @@ -61,7 +61,7 @@ def process_user_form(user_id=None): # Edit a user user_contr.update({'id': user_id}, {'nickname': form.nickname.data, - 'password': form.password.data, + 'pwdhash': generate_password_hash(form.password.data), 'automatic_crawling': form.automatic_crawling.data}) user = user_contr.get(id=user_id) flash(gettext('User %(nick)s successfully updated', -- cgit