diff options
33 files changed, 103 insertions, 103 deletions
diff --git a/src/bootstrap.py b/src/bootstrap.py index 7b6a6c8c..912c35ae 100644 --- a/src/bootstrap.py +++ b/src/bootstrap.py @@ -25,7 +25,7 @@ from flask_sqlalchemy import SQLAlchemy # Create Flask application application = Flask('web') -if os.environ.get('JARR_TESTING', False) == 'true': +if os.environ.get('Newspipe_TESTING', False) == 'true': application.debug = logging.DEBUG application.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///:memory:' application.config['TESTING'] = True diff --git a/src/conf.py b/src/conf.py index a5b86608..7f276099 100644 --- a/src/conf.py +++ b/src/conf.py @@ -26,20 +26,20 @@ ON_HEROKU = int(os.environ.get('HEROKU', 0)) == 1 DEFAULTS = {"platform_url": "http://www.newspipe.org", "self_registration": "false", "cdn_address": "", - "admin_email": "root@jarr.localhost", + "admin_email": "root@newspipe.localhost", "postmark_api_key": "", "token_validity_period": "3600", "nb_worker": "100", "api_login": "", "api_passwd": "", "default_max_error": "3", - "log_path": "jarr.log", + "log_path": "newspipe.log", "log_level": "info", - "user_agent": "JARR (https://github.com/JARR)", + "user_agent": "Newspipe (https://github.com/Newspipe)", "secret_key": "", "security_password_salt": "", "enabled": "false", - "notification_email": "jarr@no-reply.com", + "notification_email": "newspipe@no-reply.com", "tls": "false", "ssl": "true", "host": "0.0.0.0", diff --git a/src/conf/conf.cfg-sample b/src/conf/conf.cfg-sample index a9e59936..8c8f04bf 100644 --- a/src/conf/conf.cfg-sample +++ b/src/conf/conf.cfg-sample @@ -9,7 +9,7 @@ platform_url = http://127.0.0.1:5000/ admin_email = security_password_salt = a secret to confirm user account token_validity_period = 3600 -log_path = ./src/web/var/jarr.log +log_path = ./src/web/var/newspipe.log nb_worker = 5 log_level = info [database] @@ -17,11 +17,11 @@ database_url = postgres://pgsqluser:pgsqlpwd@127.0.0.1:5432/aggregator [crawler] crawling_method = classic default_max_error = 6 -user_agent = JARR (https://github.com/JARR/JARR) +user_agent = Newspipe (https://github.com/Newspipe/Newspipe) api_login = api_passwd = [notification] -notification_email = JARR@no-reply.com +notification_email = Newspipe@no-reply.com host = smtp.googlemail.com port = 465 tls = false diff --git a/src/crawler/classic_crawler.py b/src/crawler/classic_crawler.py index c3cfb6a3..c124a667 100644 --- a/src/crawler/classic_crawler.py +++ b/src/crawler/classic_crawler.py @@ -1,10 +1,10 @@ #! /usr/bin/env python # -*- coding: utf-8 - -# jarr - A Web based news aggregator. +# newspipe - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/JARR/JARR +# For more information : https://github.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/manager.py b/src/manager.py index cd656226..155e7c3d 100755 --- a/src/manager.py +++ b/src/manager.py @@ -33,7 +33,7 @@ def db_create(): 'nickname': 'admin', 'pwdhash': generate_password_hash( os.environ.get("ADMIN_PASSWORD", "password")), - 'email': os.environ.get("ADMIN_EMAIL", "root@jarr.localhost")} + 'email': os.environ.get("ADMIN_EMAIL", "root@newspipe.localhost")} with application.app_context(): db.create_all() UserController(ignore_context=True).create(**admin) diff --git a/src/notifications/emails.py b/src/notifications/emails.py index fad9aa9d..479d43cf 100644 --- a/src/notifications/emails.py +++ b/src/notifications/emails.py @@ -1,10 +1,10 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- -# JARR - A Web based news aggregator. +# Newspipe - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/JARR/JARR +# For more information : https://github.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 004b5485..2f8fc0b8 100644 --- a/src/notifications/notifications.py +++ b/src/notifications/notifications.py @@ -1,10 +1,10 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- -# JARR - A Web based news aggregator. +# Newspipe - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/JARR/JARR +# For more information : https://github.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 @@ -54,7 +54,7 @@ def new_account_notification(user): expire_time=expire_time) emails.send(to=user.email, bcc=conf.NOTIFICATION_EMAIL, - subject="[JARR] Account creation", plaintext=plaintext) + subject="[Newspipe] Account creation", plaintext=plaintext) def new_password_notification(user, password): """ @@ -64,4 +64,4 @@ def new_password_notification(user, password): user=user, password=password) emails.send(to=user.email, bcc=conf.NOTIFICATION_EMAIL, - subject="[JARR] New password", plaintext=plaintext) + subject="[Newspipe] New password", plaintext=plaintext) diff --git a/src/runserver.py b/src/runserver.py index 92a03667..0768cea8 100755 --- a/src/runserver.py +++ b/src/runserver.py @@ -1,10 +1,10 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- -# JARR - A Web based news aggregator. +# Newspipe - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/JARR/JARR +# For more information : https://github.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/export.py b/src/web/export.py index 048dc064..98473c9e 100644 --- a/src/web/export.py +++ b/src/web/export.py @@ -1,10 +1,10 @@ #! /usr/bin/env python #-*- coding: utf-8 -*- -# JARR - A Web based news aggregator. +# Newspipe - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/JARR/JARR +# For more information : https://github.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 @@ -27,7 +27,7 @@ __copyright__ = "Copyright (c) Cedric Bonhomme" __license__ = "AGPLv3" # -# This file contains the export functions of jarr. +# This file contains the export functions of newspipe. # from flask import jsonify diff --git a/src/web/forms.py b/src/web/forms.py index a604897e..a1864175 100644 --- a/src/web/forms.py +++ b/src/web/forms.py @@ -1,10 +1,10 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- -# JARR - A Web based news aggregator. +# Newspipe - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : http://github.com/JARR/JARR +# For more information : http://github.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 @@ -41,7 +41,7 @@ from web.models import User class SignupForm(Form): """ - Sign up form (registration to jarr). + Sign up form (registration to newspipe). """ nickname = TextField(lazy_gettext("Nickname"), [validators.Required(lazy_gettext("Please enter your nickname."))]) @@ -86,7 +86,7 @@ class RedirectForm(Form): class SigninForm(RedirectForm): """ - Sign in form (connection to jarr). + Sign in form (connection to newspipe). """ email_or_nickmane = TextField("Email or nickname", [validators.Length(min=3, max=35), diff --git a/src/web/js/app.js b/src/web/js/app.js index 00156670..7837e6ae 100644 --- a/src/web/js/app.js +++ b/src/web/js/app.js @@ -14,5 +14,5 @@ var MainApp = require('./components/MainApp.react'); ReactDOM.render( <MainApp />, - document.getElementById('jarrapp') + document.getElementById('newspipeapp') ); diff --git a/src/web/js/components/MainApp.react.js b/src/web/js/components/MainApp.react.js index 6e695b49..8105d32f 100644 --- a/src/web/js/components/MainApp.react.js +++ b/src/web/js/components/MainApp.react.js @@ -10,7 +10,7 @@ var RightPanel = require('./RightPanel.react'); var MainApp = React.createClass({ render: function() { return (<div> - <Grid fluid id="jarr-container"> + <Grid fluid id="newspipe-container"> <Menu /> <Col id="middle-panel" mdOffset={3} lgOffset={2} xs={12} sm={4} md={4} lg={4}> diff --git a/src/web/js/components/Navbar.react.js b/src/web/js/components/Navbar.react.js index 67e9ed56..ca2ff27b 100644 --- a/src/web/js/components/Navbar.react.js +++ b/src/web/js/components/Navbar.react.js @@ -70,22 +70,22 @@ JarrNavBar = React.createClass({ this.setState({showModal: true, modalType: 'addCategory'}); }, render: function() { - return (<Navbar fixedTop inverse id="jarrnav" fluid staticTop={true}> + return (<Navbar fixedTop inverse id="newspipenav" fluid staticTop={true}> {this.getModal()} <Navbar.Header> <Navbar.Brand> - <a href="/">JARR</a> + <a href="/">Newspipe</a> </Navbar.Brand> <Navbar.Toggle /> </Navbar.Header> <Navbar.Collapse> <Nav pullRight> {this.buttonFetch()} - <NavItem className="jarrnavitem" + <NavItem className="newspipenavitem" onClick={this.openAddFeed} href="#"> <Glyphicon glyph="plus-sign" />Add a new feed </NavItem> - <NavItem className="jarrnavitem" + <NavItem className="newspipenavitem" onClick={this.openAddCategory} href="#"> <Glyphicon glyph="plus-sign" />Add a new category </NavItem> diff --git a/src/web/lib/misc_utils.py b/src/web/lib/misc_utils.py index 8166df29..22d52b70 100755 --- a/src/web/lib/misc_utils.py +++ b/src/web/lib/misc_utils.py @@ -1,10 +1,10 @@ #! /usr/bin/env python #-*- coding: utf-8 -*- -# JARR - A Web based news aggregator. +# Newspipe - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/JARR/JARR +# For more information : https://github.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 @@ -279,5 +279,5 @@ def tag_cloud(tags): for (word, count) in tags]) if __name__ == "__main__": - import_opml("root@jarr.localhost", "./var/feeds_test.opml") - #import_opml("root@jarr.localhost", "./var/JARR.opml") + import_opml("root@newspipe.localhost", "./var/feeds_test.opml") + #import_opml("root@newspipe.localhost", "./var/Newspipe.opml") diff --git a/src/web/models/__init__.py b/src/web/models/__init__.py index acec0a93..53b692e2 100644 --- a/src/web/models/__init__.py +++ b/src/web/models/__init__.py @@ -1,10 +1,10 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- -# jarr - A Web based news aggregator. +# newspipe - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/JARR/JARR +# For more information : https://github.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 46293f40..23708f6b 100644 --- a/src/web/models/article.py +++ b/src/web/models/article.py @@ -1,10 +1,10 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- -# JARR - A Web based news aggregator. +# Newspipe - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/JARR/JARR +# For more information : https://github.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 0e36bc79..362a0d67 100644 --- a/src/web/models/feed.py +++ b/src/web/models/feed.py @@ -1,10 +1,10 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- -# jarr - A Web based news aggregator. +# newspipe - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/JARR/JARR +# For more information : https://github.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 e8ea4ce9..1cdf7414 100644 --- a/src/web/models/role.py +++ b/src/web/models/role.py @@ -1,10 +1,10 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- -# jarr - A Web based news aggregator. +# newspipe - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/JARR/JARR +# For more information : https://github.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 67181560..37bc78fd 100644 --- a/src/web/models/user.py +++ b/src/web/models/user.py @@ -1,10 +1,10 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- -# jarr - A Web based news aggregator. +# newspipe - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/JARR/JARR +# For more information : https://github.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/static/css/customized-bootstrap.css b/src/web/static/css/customized-bootstrap.css index c58e0692..7760e90a 100644 --- a/src/web/static/css/customized-bootstrap.css +++ b/src/web/static/css/customized-bootstrap.css @@ -8,29 +8,29 @@ div.top { height: 0; } -#jarrnav { +#newspipenav { background-color: #205081; border: #205081; border-radius: 0; } -#jarrnav>div.container { +#newspipenav>div.container { width: 100%; } -#jarrnav span.glyphicon { +#newspipenav span.glyphicon { margin-right: 5px; } -#jarrnav button { +#newspipenav button { margin-left: 5px; } -#jarrnav a.navbar-brand, -#jarrnav .jarrnavitem a, -#jarrnav a.dropdown-toggle{ +#newspipenav a.navbar-brand, +#newspipenav .newspipenavitem a, +#newspipenav a.dropdown-toggle{ color: white; } -#jarrnav .navbar-nav > .open > a, -#jarrnav .navbar-nav > .open > a:hover, -#jarrnav .navbar-nav > li > a:hover { +#newspipenav .navbar-nav > .open > a, +#newspipenav .navbar-nav > .open > a:hover, +#newspipenav .navbar-nav > li > a:hover { background-color: #3572B0; } a { diff --git a/src/web/static/css/one-page-app.css b/src/web/static/css/one-page-app.css index db666236..f8c443c3 100644 --- a/src/web/static/css/one-page-app.css +++ b/src/web/static/css/one-page-app.css @@ -1,4 +1,4 @@ -#jarr-container { +#newspipe-container { padding-left: 0px; padding-right: 0px; } diff --git a/src/web/static/img/jarr.svg b/src/web/static/img/jarr.svg index c887de76..f3f5ffa7 100644 --- a/src/web/static/img/jarr.svg +++ b/src/web/static/img/jarr.svg @@ -15,7 +15,7 @@ inkscape:version="0.48.5 r10040" width="100%" height="100%" - sodipodi:docname="jarr.svg"><metadata + sodipodi:docname="newspipe.svg"><metadata id="metadata1831"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /><cc:license diff --git a/src/web/templates/about.html b/src/web/templates/about.html index 4d1b1e8b..1d51786e 100644 --- a/src/web/templates/about.html +++ b/src/web/templates/about.html @@ -4,20 +4,20 @@ <div class="well"> <h1>{{ _('About') }}</h1> <p> - {{ _('JARR is a news aggregator platform.') }} - {{ _('You can easily <a href="https://jarr.readthedocs.io/en/latest/deployment.html">install JARR on your server</a>.') }} + {{ _('Newspipe is a news aggregator platform.') }} + {{ _('You can easily <a href="https://newspipe.readthedocs.io/en/latest/deployment.html">install Newspipe on your server</a>.') }} {{ _('Alternatively, you can deploy your own copy using this button:') }}</p> - <a class="reference external image-reference" href="https://heroku.com/deploy?template=https://github.com/JARR/JARR.git"><img alt="https://www.herokucdn.com/deploy/button.png" src="https://www.herokucdn.com/deploy/button.png" /></a></p> + <a class="reference external image-reference" href="https://heroku.com/deploy?template=https://github.com/Newspipe/Newspipe.git"><img alt="https://www.herokucdn.com/deploy/button.png" src="https://www.herokucdn.com/deploy/button.png" /></a></p> <p>{{ _('This software is under AGPLv3 license. You are welcome to copy, modify or - redistribute the <a href="https://github.com/JARR/JARR">source code</a> + redistribute the <a href="https://github.com/Newspipe/Newspipe">source code</a> according to the <a href="https://www.gnu.org/licenses/agpl-3.0.html">Affero GPL</a> license.') }}</p> - <p>{{ _('Found a bug? Report it <a href="https://github.com/JARR/JARR/issues">here</a>.') }}</p> + <p>{{ _('Found a bug? Report it <a href="https://github.com/Newspipe/Newspipe/issues">here</a>.') }}</p> </div> <div class="well"> <h1>{{ _('Help') }}</h1> - <p>{{ _('The documentation of the API is <a href="https://jarr.readthedocs.io/en/latest/web-services-v3.html">here</a>.') }}</p> + <p>{{ _('The documentation of the API is <a href="https://newspipe.readthedocs.io/en/latest/web-services-v3.html">here</a>.') }}</p> <p>{{ _('You can subscribe to new feeds with a bookmarklet. Drag the following button to your browser bookmarks.') }}</p> - {{ _('<a class="btn btn-default" href="%(bookmarklet)s" rel="bookmark">Subscribe to this feed using JARR</a>', bookmarklet='javascript:window.location="%s?url="+encodeURIComponent(document.location)' % url_for('feed.bookmarklet', _external=True)) }} + {{ _('<a class="btn btn-default" href="%(bookmarklet)s" rel="bookmark">Subscribe to this feed using Newspipe</a>', bookmarklet='javascript:window.location="%s?url="+encodeURIComponent(document.location)' % url_for('feed.bookmarklet', _external=True)) }} </div> </div><!-- /.container --> {% endblock %} diff --git a/src/web/templates/emails/new_password.txt b/src/web/templates/emails/new_password.txt index 40bdc207..1a04a36d 100644 --- a/src/web/templates/emails/new_password.txt +++ b/src/web/templates/emails/new_password.txt @@ -3,6 +3,6 @@ Hello {{ user.nickname }}, A new password has been generated at your request: {{ password }} -It is advised to replace it as soon as connected to JARR. +It is advised to replace it as soon as connected to Newspipe. See you, diff --git a/src/web/templates/home.html b/src/web/templates/home.html index 64e8140d..fe68861a 100644 --- a/src/web/templates/home.html +++ b/src/web/templates/home.html @@ -4,6 +4,6 @@ <link href="{{ url_for("static", filename="css/one-page-app.css") }}" rel="stylesheet" media="screen" /> {% endblock %} {% block content %} - <section id="jarrapp" /> + <section id="newspipeapp" /> <script type="text/javascript" src="{% if cdn != '' %}{{ cdn }}bundle.min.js{% else %}{{ url_for('static', filename = 'js/bundle.min.js') }}{% endif %}"></script> {% endblock %} diff --git a/src/web/templates/layout.html b/src/web/templates/layout.html index 804ec5d6..3e44c4eb 100644 --- a/src/web/templates/layout.html +++ b/src/web/templates/layout.html @@ -4,9 +4,9 @@ {% block head %} <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="description" content="JARR is a web-based news aggregator." /> + <meta name="description" content="Newspipe is a web-based news aggregator." /> <meta name="author" content="" /> - <title>JARR{% if head_titles %} - {{ ' - '.join(head_titles) }}{% endif %}</title> + <title>Newspipe{% if head_titles %} - {{ ' - '.join(head_titles) }}{% endif %}</title> <link rel="shortcut icon" href="{{ url_for("static", filename="img/favicon.ico") }}" /> <!-- Bootstrap core CSS --> @@ -19,7 +19,7 @@ </head> <body> {% block menu %} - <nav id="jarrnav" class="navbar navbar-inverse navbar-fixed-top" role="navigation"> + <nav id="newspipenav" class="navbar navbar-inverse navbar-fixed-top" role="navigation"> <div class="container-fluid"> <div class="navbar-header"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse"> @@ -28,7 +28,7 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="navbar-brand" href="{{ url_for("home") }}">JARR</a> + <a class="navbar-brand" href="{{ url_for("home") }}">Newspipe</a> {% if head_titles %} <p class="navbar-text" style="max-height: 20px; overflow: hidden"> {{ " - ".join(head_titles) }} diff --git a/src/web/templates/opml.xml b/src/web/templates/opml.xml index 986ff165..5f65329e 100644 --- a/src/web/templates/opml.xml +++ b/src/web/templates/opml.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- OPML generated by JARR on {{ now | datetime }} --> +<!-- OPML generated by Newspipe on {{ now | datetime }} --> <opml version="1.1"> <head> <title>Feeds of {{ user.nickname }}</title> diff --git a/src/web/translations/fr/LC_MESSAGES/messages.mo b/src/web/translations/fr/LC_MESSAGES/messages.mo Binary files differindex 9850dd7f..435e9390 100644 --- a/src/web/translations/fr/LC_MESSAGES/messages.mo +++ b/src/web/translations/fr/LC_MESSAGES/messages.mo diff --git a/src/web/translations/fr/LC_MESSAGES/messages.po b/src/web/translations/fr/LC_MESSAGES/messages.po index 47d37237..6bb67ce4 100644 --- a/src/web/translations/fr/LC_MESSAGES/messages.po +++ b/src/web/translations/fr/LC_MESSAGES/messages.po @@ -160,16 +160,16 @@ msgid "About" msgstr "À propos" #: ../templates/about.html:7 -msgid "JARR is a news aggregator platform." -msgstr "JARR est un agrégateur de nouvelles Web." +msgid "Newspipe is a news aggregator platform." +msgstr "Newspipe est un agrégateur de nouvelles Web." #: ../templates/about.html:8 msgid "" -"You can easily <a href=\"https://jarr.readthedocs.io/en/latest/deployment." -"html\">install JARR on your server</a>." +"You can easily <a href=\"https://newspipe.readthedocs.io/en/latest/deployment." +"html\">install Newspipe on your server</a>." msgstr "" -"Vous pouvez facilement <a href=\"https://jarr.readthedocs.io/en/latest/" -"deployment.html\">installer JARR sur votre serveur</a>." +"Vous pouvez facilement <a href=\"https://newspipe.readthedocs.io/en/latest/" +"deployment.html\">installer Newspipe sur votre serveur</a>." #: ../templates/about.html:9 msgid "Alternatively, you can deploy your own copy using this button:" @@ -180,22 +180,22 @@ msgstr "" #: ../templates/about.html:11 msgid "" "This software is under AGPLv3 license. You are welcome to copy, modify or\n" -" redistribute the <a href=\"https://github.com/JARR/JARR\">source " +" redistribute the <a href=\"https://github.com/Newspipe/Newspipe\">source " "code</a>\n" " according to the <a href=\"https://www.gnu.org/licenses/agpl-3.0.html" "\">Affero GPL</a> license." msgstr "" "Ce logiciel est sous licence AGPLv3. Vous êtes invité à copier, modifier ou " -"redistribuer le <a href=\"https://github.com/JARR/JARR\">code source</a> " +"redistribuer le <a href=\"https://github.com/Newspipe/Newspipe\">code source</a> " "selon la licence <a href=\"https://www.gnu.org/licenses/agpl-3.0.html" "\">Affero GPL</a>." #: ../templates/about.html:14 msgid "" -"Found a bug? Report it <a href=\"https://github.com/JARR/JARR/issues\">here</" +"Found a bug? Report it <a href=\"https://github.com/Newspipe/Newspipe/issues\">here</" "a>." msgstr "" -"Vous avez trouvé un bug? Signalez-le <a href=\"https://github.com/JARR/JARR/" +"Vous avez trouvé un bug? Signalez-le <a href=\"https://github.com/Newspipe/Newspipe/" "issues\">ici</a>." #: ../templates/about.html:17 @@ -204,10 +204,10 @@ msgstr "Aide" #: ../templates/about.html:18 msgid "" -"The documentation of the API is <a href=\"https://jarr.readthedocs.io/en/" +"The documentation of the API is <a href=\"https://newspipe.readthedocs.io/en/" "latest/web-services-v3.html\">here</a>." msgstr "" -"La documentation de l'API est <a href=\"https://jarr.readthedocs.io/en/" +"La documentation de l'API est <a href=\"https://newspipe.readthedocs.io/en/" "latest/web-services-v3.html\">ici</a>." #: ../templates/about.html:19 @@ -222,10 +222,10 @@ msgstr "" #, python-format msgid "" "<a class=\"btn btn-default\" href=\"%(bookmarklet)s\" rel=\"bookmark" -"\">Subscribe to this feed using JARR</a>" +"\">Subscribe to this feed using Newspipe</a>" msgstr "" "<a class=\"btn btn-default\" href=\"%(bookmarklet)s\" rel=\"bookmark" -"\">Abonnez-vous à ce flux en utilisant JARR</a>" +"\">Abonnez-vous à ce flux en utilisant Newspipe</a>" #: ../templates/article.html:6 msgid "from" @@ -939,11 +939,11 @@ msgstr "Interdit." #~ msgstr "Don" #~ msgid "" -#~ "If you wish and if you like JARR, you can donate via bitcoin <a href=" +#~ "If you wish and if you like Newspipe, you can donate via bitcoin <a href=" #~ "\"https://blockexplorer.com/address/1GVmhR9fbBeEh7rP1qNq76jWArDdDQ3otZ" #~ "\">1GVmhR9fbBeEh7rP1qNq76jWArDdDQ3otZ</a>. Thank you!" #~ msgstr "" -#~ "Si vous le souhaitez et si vous aimez JARR, vous pouvez faire un don via " +#~ "Si vous le souhaitez et si vous aimez Newspipe, vous pouvez faire un don via " #~ "bitcoin <a href=\"https://blockexplorer.com/" #~ "address/1GVmhR9fbBeEh7rP1qNq76jWArDdDQ3otZ" #~ "\">1GVmhR9fbBeEh7rP1qNq76jWArDdDQ3otZ</a>. Merci!" @@ -1083,8 +1083,8 @@ msgstr "Interdit." #~ msgid "successfully disabled." #~ msgstr "désactivé avec succès." -#~ msgid "You can easily install JARR on your server." -#~ msgstr "Vous pouvez facilement installer JARR sur votre serveur." +#~ 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." diff --git a/src/web/translations/messages.pot b/src/web/translations/messages.pot index 35ee536a..f5e34c3c 100644 --- a/src/web/translations/messages.pot +++ b/src/web/translations/messages.pot @@ -156,14 +156,14 @@ msgid "About" msgstr "" #: ../templates/about.html:7 -msgid "JARR is a news aggregator platform." +msgid "Newspipe is a news aggregator platform." msgstr "" #: ../templates/about.html:8 msgid "" "You can easily <a " -"href=\"https://jarr.readthedocs.io/en/latest/deployment.html\">install " -"JARR on your server</a>." +"href=\"https://newspipe.readthedocs.io/en/latest/deployment.html\">install " +"Newspipe on your server</a>." msgstr "" #: ../templates/about.html:9 @@ -174,7 +174,7 @@ msgstr "" msgid "" "This software is under AGPLv3 license. You are welcome to copy, modify or" "\n" -" redistribute the <a href=\"https://github.com/JARR/JARR\">source " +" redistribute the <a href=\"https://github.com/Newspipe/Newspipe\">source " "code</a>\n" " according to the <a " "href=\"https://www.gnu.org/licenses/agpl-3.0.html\">Affero GPL</a> " @@ -184,7 +184,7 @@ msgstr "" #: ../templates/about.html:14 msgid "" "Found a bug? Report it <a " -"href=\"https://github.com/JARR/JARR/issues\">here</a>." +"href=\"https://github.com/Newspipe/Newspipe/issues\">here</a>." msgstr "" #: ../templates/about.html:17 @@ -194,7 +194,7 @@ msgstr "" #: ../templates/about.html:18 msgid "" "The documentation of the API is <a " -"href=\"https://jarr.readthedocs.io/en/latest/web-" +"href=\"https://newspipe.readthedocs.io/en/latest/web-" "services-v3.html\">here</a>." msgstr "" @@ -208,7 +208,7 @@ msgstr "" #, python-format msgid "" "<a class=\"btn btn-default\" href=\"%(bookmarklet)s\" " -"rel=\"bookmark\">Subscribe to this feed using JARR</a>" +"rel=\"bookmark\">Subscribe to this feed using Newspipe</a>" msgstr "" #: ../templates/article.html:6 diff --git a/src/web/views/api/v3/article.py b/src/web/views/api/v3/article.py index 9a4df1ce..0e53470e 100644 --- a/src/web/views/api/v3/article.py +++ b/src/web/views/api/v3/article.py @@ -1,10 +1,10 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- -# JARR - A Web based news aggregator. +# Newspipe - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : http://github.com/JARR/JARR +# For more information : http://github.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 84e3da0d..eb354482 100644 --- a/src/web/views/api/v3/common.py +++ b/src/web/views/api/v3/common.py @@ -1,10 +1,10 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- -# JARR - A Web based news aggregator. +# Newspipe - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : http://github.com/JARR/JARR +# For more information : http://github.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 cc9f5cad..111f75e9 100644 --- a/src/web/views/api/v3/feed.py +++ b/src/web/views/api/v3/feed.py @@ -1,10 +1,10 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- -# JARR - A Web based news aggregator. +# Newspipe - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : http://github.com/JARR/JARR +# For more information : http://github.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 |
